aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--heat/ONAP/onap_openstack.env2
-rw-r--r--heat/ONAP/onap_openstack_template.env2
-rwxr-xr-xpom.xml2
-rw-r--r--version.properties2
-rw-r--r--vnfs/VES/pom.xml2
-rw-r--r--vnfs/VES5.0/pom.xml2
-rw-r--r--vnfs/VESreporting_vFW/pom.xml2
-rw-r--r--vnfs/VESreporting_vFW5.0/pom.xml2
-rw-r--r--vnfs/VESreporting_vLB/pom.xml2
-rw-r--r--vnfs/VESreporting_vLB5.0/pom.xml2
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml2
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml2
-rw-r--r--vnfs/vCPE/kea-sdnc-notify-mod/pom.xml2
-rw-r--r--vnfs/vCPE/scripts/v_gmux_install.sh40
-rw-r--r--vnfs/vFW/pg_streams/pom.xml2
-rw-r--r--vnfs/vLB/DNSClient/pom.xml2
-rw-r--r--vnfs/vLB/DNSManager/pom.xml2
-rw-r--r--vnfs/vLB/dns_streams/pom.xml2
18 files changed, 31 insertions, 43 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index ac088bc3..56a8e623 100644
--- 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 99622120..40cdb01e 100644
--- 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 39b35aed..dc3d7d2a 100755
--- 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 1c6eb43a..6ef50aa7 100644
--- 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 b45b0285..554786de 100644
--- 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 fdd12411..cabebf64 100644
--- 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 9963f9fa..5afc23e2 100644
--- 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 496ee255..2e0df623 100644
--- 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 83767523..9a52a676 100644
--- 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 fa409235..70c906cf 100644
--- 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 da9c5680..f0656b7b 100644
--- 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 39038433..ed3b2c04 100755
--- 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 f2f62792..8e0b3a45 100644
--- 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 5e98fe1b..e1702ee4 100644
--- 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 cea0a7c5..fcbd8719 100644
--- 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 cd746b7b..497922f3 100644
--- 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 4d837b25..2b948586 100644
--- 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 ca758f8e..000736c4 100644
--- 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>