vFW packages and scripts version mismatch

vFW pakages are being picked from
nexus staging version 1.3.1 but
the scripts are from master.
Change to get all packages from nexus

Change-Id: I51829b8ceaf96b4634d58a34c48f8e953ec0a684
Issue-ID: MULTICLOUD-623
Signed-off-by: Ritu Sood <ritu.sood@intel.com>

diff --git a/kud/tests/vFW/firewall b/kud/tests/vFW/firewall
index 93d4f2a..c839c4d 100755 (executable)
--- a/kud/tests/vFW/firewall
+++ b/kud/tests/vFW/firewall
@@ -51,7 +51,8 @@ function install_vfw_scripts {
     local ves_reporting_path="${ves_path}/evel/evel-library"
 
     pushd /opt
-    wget -q https://git.onap.org/demo/plain/vnfs/vFW/scripts/{v_firewall_init,vfirewall}.sh
+    wget -q "https://nexus.onap.org/content/repositories/staging/org/onap/demo/vnf/vfw/vfw-scripts/${version}/vfw-scripts-${version}.zip"
+    unzip "vfw-scripts-${version}.zip"
     chmod +x *.sh
 
     _untar_url "sample-distribution/${version}/sample-distribution-${version}-hc.tar.gz"

diff --git a/kud/tests/vFW/packetgen b/kud/tests/vFW/packetgen
index 51d5c67..c51cd9f 100755 (executable)
--- a/kud/tests/vFW/packetgen
+++ b/kud/tests/vFW/packetgen
@@ -49,7 +49,8 @@ function install_vfw_scripts {
     local version=$(cat /opt/config/demo_artifacts_version.txt)
 
     pushd /opt
-    wget -q https://git.onap.org/demo/plain/vnfs/vFW/scripts/{v_packetgen_init,vpacketgen,run_traffic_fw_demo}.sh
+    wget -q "https://nexus.onap.org/content/repositories/staging/org/onap/demo/vnf/vfw/vfw-scripts/${version}/vfw-scripts-${version}.zip"
+    unzip "vfw-scripts-${version}.zip"
     chmod +x *.sh
 
     _untar_url "sample-distribution/${version}/sample-distribution-${version}-hc.tar.gz"

diff --git a/kud/tests/vFW/sink b/kud/tests/vFW/sink
index 5604198..ace3b38 100755 (executable)
--- a/kud/tests/vFW/sink
+++ b/kud/tests/vFW/sink
@@ -27,7 +27,8 @@ function install_dependencies {
 # install_vfw_scripts() -
 function install_vfw_scripts {
     pushd /opt
-    wget -q https://git.onap.org/demo/plain/vnfs/vFW/scripts/{v_sink_init,vsink}.sh
+    wget -q "https://nexus.onap.org/content/repositories/staging/org/onap/demo/vnf/vfw/vfw-scripts/${version}/vfw-scripts-${version}.zip"
+    unzip "vfw-scripts-${version}.zip"
     chmod +x *.sh
 
     mv vsink.sh /etc/init.d