diff options
25 files changed, 56 insertions, 59 deletions
diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh index 570cb704..b071dffd 100755 --- a/boot/dcae2_vm_init.sh +++ b/boot/dcae2_vm_init.sh @@ -450,6 +450,15 @@ register_dns_zone_designate() TENANT_ID="$(cat /opt/config/tenant_id.txt)" KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)" + if [[ "$KEYSTONE_URL" == */v3 ]]; then + echo "$KEYSTONE_URL" + elif [[ "$KEYSTONE_URL" == */v2.0 ]]; then + echo "$KEYSTONE_URL" + else + KEYSTONE_URL="${KEYSTONE_URL}/v2.0" + echo "$KEYSTONE_URL" + fi + USERNAME="$(cat /opt/config/openstack_user.txt)" PASSWORD="$(cat /opt/config/openstack_password.txt)" diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 56a8e623..5ae6515c 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.1.0-SNAPSHOT + artifacts_version: 1.2.0-SNAPSHOT openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -119,8 +119,8 @@ parameters: appc_branch: master so_branch: master mr_branch: master - policy_branch: amsterdam - portal_branch: release-1.3.0 + policy_branch: master + portal_branch: master robot_branch: master sdc_branch: master sdnc_branch: master diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 40cdb01e..982eabca 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.1.0-SNAPSHOT + artifacts_version: 1.2.0-SNAPSHOT openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE @@ -119,8 +119,8 @@ parameters: appc_branch: master so_branch: master mr_branch: master - policy_branch: amsterdam - portal_branch: release-1.3.0 + policy_branch: master + portal_branch: master robot_branch: master sdc_branch: master sdnc_branch: master diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env index 1d820705..7a49e9b3 100644 --- a/heat/vCPE/infra/base_vcpe_infra.env +++ b/heat/vCPE/infra/base_vcpe_infra.env @@ -30,8 +30,8 @@ parameters: dcae_collector_port: 8080 repo_url_blob: https://nexus.onap.org/content/sites/raw repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.1.0 - install_script_version: 1.1.0-SNAPSHOT + demo_artifacts_version: 1.2.0 + install_script_version: 1.2.0-SNAPSHOT key_name: vaaa_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env index 9790d0e8..e6ae1b51 100644 --- a/heat/vFW/base_vfw.env +++ b/heat/vFW/base_vfw.env @@ -25,8 +25,8 @@ parameters: dcae_collector_port: 8080
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0 - install_script_version: 1.1.0-SNAPSHOT
+ demo_artifacts_version: 1.2.0 + install_script_version: 1.2.0-SNAPSHOT
key_name: vfw_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
cloud_env: PUT openstack OR rackspace HERE
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env index 84ed850f..4d34b585 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFWCL/vFWSNK/base_vfw.env @@ -25,8 +25,8 @@ parameters: dcae_collector_port: 8080 repo_url_blob: https://nexus.onap.org/content/sites/raw repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.1.0 - install_script_version: 1.1.0-SNAPSHOT + demo_artifacts_version: 1.2.0 + install_script_version: 1.2.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index a7a30e32..57662eee 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -18,8 +18,8 @@ parameters: vf_module_id: vTrafficPNG repo_url_blob: https://nexus.onap.org/content/sites/raw repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.1.0 - install_script_version: 1.1.0-SNAPSHOT + demo_artifacts_version: 1.2.0 + install_script_version: 1.2.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env index 50da384f..a9658886 100644 --- a/heat/vLB/base_vlb.env +++ b/heat/vLB/base_vlb.env @@ -28,8 +28,8 @@ parameters: dcae_collector_port: 8080 repo_url_blob: https://nexus.onap.org/content/sites/raw repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.1.0 - install_script_version: 1.1.0-SNAPSHOT + demo_artifacts_version: 1.2.0 + install_script_version: 1.2.0-SNAPSHOT key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env index 5a7839b8..94058f6d 100644 --- a/heat/vLB/dnsscaling.env +++ b/heat/vLB/dnsscaling.env @@ -16,8 +16,8 @@ parameters: vf_module_id: vLoadBalancer repo_url_blob: https://nexus.onap.org/content/sites/raw repo_url_artifacts: https://nexus.onap.org/content/groups/staging - demo_artifacts_version: 1.1.0 - install_script_version: 1.1.0-SNAPSHOT + demo_artifacts_version: 1.2.0 + install_script_version: 1.2.0-SNAPSHOT key_name: vlb_key_scaling pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE
\ No newline at end of file @@ -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> |