Upgrade vFW and vLB to VES 5.x

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

4 files changed, 8 insertions, 8 deletions

diff --git a/vnfs/vLB/scripts/add_dns.sh b/vnfs/vLB/scripts/add_dns.sh
index 3574e085..342679d0 100644
--- a/vnfs/vLB/scripts/add_dns.sh
+++ b/vnfs/vLB/scripts/add_dns.sh
@@ -17,7 +17,7 @@ vppctl set int ip address $GRE $GRE_IPADDR"/32"
 vppctl set int state $GRE up
 
 # Update the number of vDNSs currently active
-FD="/opt/VES/code/evel_training/VESreporting/active_dns.txt"
+FD="/opt/VES/evel/evel-library/code/VESreporting/active_dns.txt"
 CURR_DNS=$(cat $FD)
 let CURR_DNS=$CURR_DNS+1
 echo $CURR_DNS > $FD
\ No newline at end of file
diff --git a/vnfs/vLB/scripts/remove_dns.sh b/vnfs/vLB/scripts/remove_dns.sh
index f400aa0f..33d43a6b 100644
--- a/vnfs/vLB/scripts/remove_dns.sh
+++ b/vnfs/vLB/scripts/remove_dns.sh
@@ -14,7 +14,7 @@ vppctl lb as $IP_TO_PKTGEN_NET"/32" $DNS_IPADDR del
 vppctl create gre tunnel src $IP_TO_DNS_NET dst $DNS_IPADDR del
 
 # Update the number of vDNSs currently active
-FD="/opt/VES/code/evel_training/VESreporting/active_dns.txt"
+FD="/opt/VES/evel/evel-library/code/VESreporting/active_dns.txt"
 CURR_DNS=$(cat $FD)
 let CURR_DNS=$CURR_DNS-1
 if [[ $CURR_DNS -lt 0 ]]
diff --git a/vnfs/vLB/scripts/v_lb_init.sh b/vnfs/vLB/scripts/v_lb_init.sh
index 9223e043..1bad1722 100755
--- a/vnfs/vLB/scripts/v_lb_init.sh
+++ b/vnfs/vLB/scripts/v_lb_init.sh
@@ -79,6 +79,6 @@ cd /opt/FDserver
 ./dnsmembership.sh &>/dev/null &disown
 
 # Start VES client
-cd /opt/VES/code/evel_training/VESreporting/
+cd /opt/VES/evel/evel-library/code/VESreporting/
 echo 0 > active_dns.txt
 ./go-client.sh &>/dev/null &disown
\ No newline at end of file
diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh
index a6577c4a..052ebb6e 100644
--- a/vnfs/vLB/scripts/v_lb_install.sh
+++ b/vnfs/vLB/scripts/v_lb_install.sh
@@ -70,15 +70,15 @@ wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsmembership
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/add_dns.sh
 wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/remove_dns.sh
 wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/dns-manager/$DEMO_ARTIFACTS_VERSION/dns-manager-$DEMO_ARTIFACTS_VERSION.jar
-wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/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
 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/code/evel_training/VESreporting
+mv VESreporting_vLB /opt/VES/evel/evel-library/code/VESreporting
 mv dns-manager-$DEMO_ARTIFACTS_VERSION.jar /opt/FDserver/dns-manager-$DEMO_ARTIFACTS_VERSION.jar
 mv dnsmembership.sh /opt/FDserver/dnsmembership.sh
 mv add_dns.sh /opt/FDserver/add_dns.sh
@@ -87,7 +87,7 @@ rm *.tar.gz
 
 chmod +x v_lb_init.sh
 chmod +x vlb.sh
-chmod +x /opt/VES/code/evel_training/VESreporting/go-client.sh
+chmod +x /opt/VES/evel/evel-library/code/VESreporting/go-client.sh
 chmod +x /opt/FDserver/dnsmembership.sh
 chmod +x /opt/FDserver/add_dns.sh
 chmod +x /opt/FDserver/remove_dns.sh
@@ -102,7 +102,7 @@ apt-get install -y vpp vpp-dpdk-dkms vpp-lib vpp-dbg vpp-plugins vpp-dev
 sleep 1
 
 # Install VES
-cd /opt/VES/bldjobs/
+cd /opt/VES/evel/evel-library/bldjobs/
 make clean
 make
 sleep 1