Update POM files for vLB manual scaling

- Change version number of HC artifacts to 1.2.0
- Create a deploy script template in POM file
- Change HC version number in install scripts

Change-Id: If437d5c719a8a5edfa54dc48abfbc34253c5728d
Issue-ID: INT-447
Signed-off-by: Marco Platania <platania@research.att.com>

5 files changed, 13 insertions, 13 deletions

diff --git a/vnfs/vLBMS/scripts/run_streams_dns.sh b/vnfs/vLBMS/scripts/run_streams_dns.sh
index 86f97b2e..c25c2b57 100644
--- a/vnfs/vLBMS/scripts/run_streams_dns.sh
+++ b/vnfs/vLBMS/scripts/run_streams_dns.sh
@@ -7,7 +7,7 @@ vppctl packet-gen disable
 vppctl packet-gen enable-stream dns1
 vppctl packet-gen enable-stream dns2
 
-sleep 180
+sleep 60
 
 #Rehash port numbers and re-run five streams every minute
 while true; do
diff --git a/vnfs/vLBMS/scripts/v_dns_init.sh b/vnfs/vLBMS/scripts/v_dns_init.sh
index f891eb6e..4ae98746 100644
--- a/vnfs/vLBMS/scripts/v_dns_init.sh
+++ b/vnfs/vLBMS/scripts/v_dns_init.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 cd /opt
-./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)-SNAPSHOT/honeycomb &>/var/log/honeycomb.log &disown
+./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)/honeycomb &>/var/log/honeycomb.log &disown
 ./set_gre_tunnel.sh
diff --git a/vnfs/vLBMS/scripts/v_lb_init.sh b/vnfs/vLBMS/scripts/v_lb_init.sh
index 26d88c08..4300c553 100644
--- a/vnfs/vLBMS/scripts/v_lb_init.sh
+++ b/vnfs/vLBMS/scripts/v_lb_init.sh
@@ -77,7 +77,7 @@ vppctl set ip arp tap-0 $PKTGEN_IPADDR $PKTGEN_MAC
 
 # Start Honeycomb and initialize the vLB with information about vDNS
 cd /opt
-./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)-SNAPSHOT/honeycomb &>/var/log/honeycomb.log &disown
+./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)/honeycomb &>/var/log/honeycomb.log &disown
 sleep 10
 
 OAM_VDNS_IP=$(cat /opt/config/oam_vdns_ip.txt)
@@ -85,6 +85,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 aafa56da..e8392e0a 100644
--- a/vnfs/vLBMS/scripts/v_lb_install.sh
+++ b/vnfs/vLBMS/scripts/v_lb_install.sh
@@ -68,8 +68,8 @@ wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/add_dns.sh
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/remove_dns.sh
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/properties.conf -O /opt/config/properties.conf
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlbms/$INSTALL_SCRIPT_VERSION/run_health.sh
-wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+#wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+#wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 
 tar -zmxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 mv ves-$DEMO_ARTIFACTS_VERSION VES
@@ -103,10 +103,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
diff --git a/vnfs/vLBMS/scripts/v_packetgen_init.sh b/vnfs/vLBMS/scripts/v_packetgen_init.sh
index 30707f0a..fe956efc 100644
--- a/vnfs/vLBMS/scripts/v_packetgen_init.sh
+++ b/vnfs/vLBMS/scripts/v_packetgen_init.sh
@@ -96,7 +96,7 @@ sleep 1
 
 # Start Honeycomb and enable traffic flows
 cd /opt
-./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)-SNAPSHOT/honeycomb &>/var/log/honeycomb.log &disown
+./vlb-vnf-onap-distribution-$(cat /opt/config/demo_artifacts_version.txt)/honeycomb &>/var/log/honeycomb.log &disown
 
 chmod +x run_streams_dns.sh
 ./run_streams_dns.sh &>/dev/null &disown