Merge "Update docker tags for R3"

diff --git a/boot/robot/demo.sh b/boot/robot/demo.sh
index b8df99e..56cfbab 100755 (executable)
--- a/boot/robot/demo.sh
+++ b/boot/robot/demo.sh
@@ -24,6 +24,9 @@ function usage
        echo " "
        echo "       demo.sh init_robot [ <etc_hosts_prefix> ]"
     echo "               - Initialize robot after all ONAP VMs have started"
+       echo " "
+       echo "       demo.sh cds"
+    echo "               - Instantiate vFW service with Controller Design Studio feature for the a demo customer (DemoCust<uuid>)"
        echo " "
        echo "       demo.sh instantiateVFW | instantiateVFWCL"
     echo "               - Instantiate vFW or vFWCL module for the a demo customer (DemoCust<uuid>)"
@@ -143,6 +146,10 @@ do
                        VARIABLES="$VARIABLES -v HB_IPV4_OAM_ADDRESS:$1"
             shift
                        ;;
+       cds)
+                       TAG="cds"
+                       shift
+                       ;;
        *)
                        usage
                        exit

diff --git a/vnfs/vLBMS/scripts/v_lb_init.sh b/vnfs/vLBMS/scripts/v_lb_init.sh
index bf86867..51e88a8 100644 (file)
--- a/vnfs/vLBMS/scripts/v_lb_init.sh
+++ b/vnfs/vLBMS/scripts/v_lb_init.sh
@@ -86,6 +86,6 @@ VDNS_IPADDR=$(cat /opt/config/vdns_ipaddr.txt)
 curl -X PUT http://localhost:8183/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances/vdns-instance/$VDNS_IPADDR -H 'Accept: application/json' -H 'Cache-Control: no-cache' -H 'Content-Type: application/json' -H 'Postman-Token: 8bfe8815-3efb-4c9b-8974-7b8d7b6da4c6' -H "Authorization: Basic YWRtaW46YWRtaW4=" -d '{"vdns-instance": [{ "ip-addr": "'$VDNS_IPADDR'", "oam-ip-addr": "'$OAM_VDNS_IP'", "enabled": true }]}'
 
 # Start VES agent
-#cd /opt/VES/evel/evel-library/code/VESreporting/
-#echo 0 > active_dns.txt
-#./go-client.sh &>/dev/null &disown
+cd /opt/VES/evel/evel-library/code/VESreporting/
+echo 0 > active_dns.txt
+./go-client.sh &>/dev/null &disown

diff --git a/vnfs/vLBMS/scripts/v_lb_install.sh b/vnfs/vLBMS/scripts/v_lb_install.sh
index c82368c..412b53a 100644 (file)
--- a/vnfs/vLBMS/scripts/v_lb_install.sh
+++ b/vnfs/vLBMS/scripts/v_lb_install.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt)
-#DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
-#if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
+if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
 NB_API_VERSION=$(cat /opt/config/nb_api_version.txt)
 INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
@@ -69,14 +69,14 @@ unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip add_dns.sh > /opt/add
 unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip remove_dns.sh > /opt/remove_dns.sh
 unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip properties.conf > /opt/config/properties.conf
 unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip run_health.sh > /opt/run_health.sh
-#wget -O ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION"
-#wget -O ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves_vlb_reporting&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION"
+wget -O ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION"
+wget -O ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves_vlb_reporting&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION"
 
-#tar -zmxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-#mv ves-$DEMO_ARTIFACTS_VERSION VES
-#tar -zmxvf ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-#mv ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vLB
-#mv VESreporting_vLB /opt/VES/evel/evel-library/code/VESreporting
+tar -zmxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+mv ves-$DEMO_ARTIFACTS_VERSION VES
+tar -zmxvf ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+mv ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vLB
+mv VESreporting_vLB /opt/VES/evel/evel-library/code/VESreporting
 
 # Clone Honeycomb interface for the VNF component
 mkdir honeycomb-api
@@ -201,12 +201,12 @@ mvn clean install
 
 sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' /opt/honeycomb-api/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/target/vlb-vnf-onap-distribution-$NB_API_VERSION-hc/vlb-vnf-onap-distribution-$NB_API_VERSION/config/honeycomb.json
 sed -i 's/"netconf-tcp-binding-address": "127.0.0.1",/"netconf-tcp-binding-address": "0.0.0.0",/g' /opt/honeycomb-api/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/target/vlb-vnf-onap-distribution-$NB_API_VERSION-hc/vlb-vnf-onap-distribution-$NB_API_VERSION/config/honeycomb.json
-#rm *.tar.gz
+rm *.tar.gz
 
 cd /opt
 chmod +x v_lb_init.sh
 chmod +x vlb.sh
-#chmod +x /opt/VES/evel/evel-library/code/VESreporting/go-client.sh
+chmod +x /opt/VES/evel/evel-library/code/VESreporting/go-client.sh
 chmod +x add_dns.sh
 chmod +x remove_dns.sh
 chmod +x run_health.sh
@@ -223,10 +223,10 @@ apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev
 sleep 1
 
 # Install VES
-#cd /opt/VES/evel/evel-library/bldjobs/
-#make clean
-#make
-#sleep 1
+cd /opt/VES/evel/evel-library/bldjobs/
+make clean
+make
+sleep 1
 
 # Run instantiation script
 cd /opt