Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: b3afda6)
Merge "Add handling for keystone url w/o version"
authorMarco Platania <platania@research.att.com>
Thu, 30 Nov 2017 15:25:36 +0000 (15:25 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 30 Nov 2017 15:25:36 +0000 (15:25 +0000)
18 files changed:
heat/ONAP/onap_openstack.env patch | blob | history
heat/ONAP/onap_openstack_template.env patch | blob | history
pom.xml patch | blob | history
version.properties patch | blob | history
vnfs/VES/pom.xml patch | blob | history
vnfs/VES5.0/pom.xml patch | blob | history
vnfs/VESreporting_vFW/pom.xml patch | blob | history
vnfs/VESreporting_vFW5.0/pom.xml patch | blob | history
vnfs/VESreporting_vLB/pom.xml patch | blob | history
vnfs/VESreporting_vLB5.0/pom.xml patch | blob | history
vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml patch | blob | history
vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml patch | blob | history
vnfs/vCPE/kea-sdnc-notify-mod/pom.xml patch | blob | history
vnfs/vCPE/scripts/v_gmux_install.sh patch | blob | history
vnfs/vFW/pg_streams/pom.xml patch | blob | history
vnfs/vLB/DNSClient/pom.xml patch | blob | history
vnfs/vLB/DNSManager/pom.xml patch | blob | history
vnfs/vLB/dns_streams/pom.xml patch | blob | history

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index ac088bc..56a8e62 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -119,7 +119,7 @@ parameters:
   appc_branch: master
   so_branch: master
   mr_branch: master
-  policy_branch: master
+  policy_branch: amsterdam
   portal_branch: release-1.3.0
   robot_branch: master
   sdc_branch: master
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 9962212..40cdb01 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -119,7 +119,7 @@ parameters:
   appc_branch: master
   so_branch: master
   mr_branch: master
-  policy_branch: master
+  policy_branch: amsterdam
   portal_branch: release-1.3.0
   robot_branch: master
   sdc_branch: master
diff --git a/pom.xml b/pom.xml
index 39b35ae..dc3d7d2 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>org.onap.demo.vnf</groupId>
   <artifactId>demo-aggregator</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <name>demo</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/version.properties b/version.properties
index 1c6eb43..6ef50aa 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -2,7 +2,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=1
-minor=1
+minor=2
 patch=0
 
 base_version=${major}.${minor}.${patch}
diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index b45b028..554786d 100644 (file)
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VES5.0/pom.xml b/vnfs/VES5.0/pom.xml
index fdd1241..cabebf6 100644 (file)
--- a/vnfs/VES5.0/pom.xml
+++ b/vnfs/VES5.0/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index 9963f9f..5afc23e 100644 (file)
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -28,7 +28,7 @@
 <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vFW5.0/pom.xml b/vnfs/VESreporting_vFW5.0/pom.xml
index 496ee25..2e0df62 100644 (file)
--- a/vnfs/VESreporting_vFW5.0/pom.xml
+++ b/vnfs/VESreporting_vFW5.0/pom.xml
@@ -28,7 +28,7 @@
 <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 8376752..9a52a67 100644 (file)
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vLB5.0/pom.xml b/vnfs/VESreporting_vLB5.0/pom.xml
index fa40923..70c906c 100644 (file)
--- a/vnfs/VESreporting_vLB5.0/pom.xml
+++ b/vnfs/VESreporting_vLB5.0/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index da9c568..f0656b7 100644 (file)
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -26,7 +26,7 @@
 <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../../../pom.xml</relativePath>
 </parent>
 
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index 3903843..ed3b2c0 100755 (executable)
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -10,7 +10,7 @@
 <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>hc-onap</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../parent-pom/pom.xml</relativePath>
 </parent>
 
diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
index f2f6279..8e0b3a4 100644 (file)
--- a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
+++ b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vCPE/scripts/v_gmux_install.sh b/vnfs/vCPE/scripts/v_gmux_install.sh
index 5e98fe1..e1702ee 100644 (file)
--- a/vnfs/vCPE/scripts/v_gmux_install.sh
+++ b/vnfs/vCPE/scripts/v_gmux_install.sh
@@ -397,6 +397,7 @@ After=vpp.service
 
 [Service]
 ExecStart=/opt/honeycomb/honeycomb
+ExecStop=/opt/reset_ves_mode.sh
 Restart=always
 RestartSec=10
 
@@ -405,6 +406,19 @@ WantedBy=multi-user.target
 EOF
     systemctl enable /etc/systemd/system/honeycomb.service
 
+    # Create script that is used to reset the ves mode configuration
+    # when the honeycomb service is stopped
+    cat > /opt/reset_ves_mode.sh << EOF
+#!/bin/bash
+mode_data=\$(curl -X GET -u admin:admin http://127.0.0.1:8183/restconf/config/vesagent:vesagent/mode 2>/dev/null | sed s/\"base-packet-loss\":[0-9]\*,/\"base-packet-loss\":0,/)
+if [[ "\${mode_data}" != "" ]]
+then
+    curl -X DELETE -u admin:admin http://127.0.0.1:8183/restconf/config/vesagent:vesagent/mode
+    curl -H "Content-Type:application/json" --data "\${mode_data}" -X POST -u admin:admin http://127.0.0.1:8183/restconf/config/vesagent:vesagent
+fi
+EOF
+    chmod a+x /opt/reset_ves_mode.sh
+
     #Create a systemd service for auto-save
     cat > /usr/bin/save_config << EOF
 #!/bin/bash
@@ -463,30 +477,6 @@ write_startup_scripts()
        fi
 }
 
-# Saves the VES agent configuration to the startup script.
-#
-# Get the current VES agent configuration from the bash command:
-# \$vppctl show ves agent
-#    Server Addr    Server Port Interval Enabled
-#    127.0.0.1        8080         10    True
-# Set the VES agent configuration with the bash command:
-# \$vppctl set ves agent server 127.0.0.1 port 8080 intval 10
-#
-save_ves_config()
-{
-       local server=""
-       local port=""
-       local intval=""
-
-       local ves_config=\`vppctl show ves agent | head -2 | tail -1\`
-       if [ "\${ves_config}" != "" ] ;then
-               server=\`echo \${ves_config} | awk '{ print \$1 }'\`
-               port=\`echo \${ves_config} | awk '{ print \$2 }'\`
-               intval=\`echo \${ves_config} | awk '{ print \$3 }'\`
-               write_startup_scripts add "set ves agent server \${server} port \${port} intval \${intval}"
-       fi
-}
-
 # Save the VxLAN Tunnel Configuration to the startup script.
 #
 # Get the current VxLAN tunnel configuration with bash command:
@@ -551,8 +541,6 @@ save_vxlan_xconnect()
 
 ################################# MAIN ###################################
 
-save_ves_config
-
 save_vxlan_tunnel
 
 save_vxlan_xconnect
diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index cea0a7c..fcbd871 100644 (file)
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index cd746b7..497922f 100644 (file)
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index 4d837b2..2b94858 100644 (file)
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index ca758f8..000736c 100644 (file)
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
Demo applications and templates for ONAP platform instantiation.