From: platania Date: Tue, 21 Feb 2017 22:31:41 +0000 (-0500) Subject: update demo scripts with LF paths X-Git-Tag: 1.0.0-Amsterdam~402 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=8df4a643ae0d43a71e6e86c6be148386d99990ff update demo scripts with LF paths Change-Id: I6c1983ab567359c157b05842a1ab2b613ee9de76 Signed-off-by: platania --- diff --git a/.DS_Store b/.DS_Store index 6262f82f..7d0d65f1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store index 9019f955..892df7cf 100644 Binary files a/vnfs/.DS_Store and b/vnfs/.DS_Store differ diff --git a/vnfs/vFW/.DS_Store b/vnfs/vFW/.DS_Store index 97cfa332..bd8024d5 100644 Binary files a/vnfs/vFW/.DS_Store and b/vnfs/vFW/.DS_Store differ diff --git a/vnfs/vFW/scripts/v_firewall_init.sh b/vnfs/vFW/scripts/v_firewall_init.sh index fe16cef5..54928072 100644 --- a/vnfs/vFW/scripts/v_firewall_init.sh +++ b/vnfs/vFW/scripts/v_firewall_init.sh @@ -37,9 +37,10 @@ ifconfig br1 up sleep 1 # Start HoneyComb +VERSION=$(cat /opt/config/artifacts_version.txt) echo "" > /var/lib/honeycomb/persist/context/data.json echo "" > /var/lib/honeycomb/persist/config/data.json -/opt/honeycomb/sample-distribution-1.0.0/honeycomb &>/dev/null &disown +/opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown sleep 1 # Start VES client diff --git a/vnfs/vFW/scripts/v_packetgen_init.sh b/vnfs/vFW/scripts/v_packetgen_init.sh index 68469663..3bbe02f2 100644 --- a/vnfs/vFW/scripts/v_packetgen_init.sh +++ b/vnfs/vFW/scripts/v_packetgen_init.sh @@ -50,9 +50,10 @@ vppctl exec /opt/pg_streams/stream_fw_udp10 sleep 1 # Start HoneyComb +VERSION=$(cat /opt/config/artifacts_version.txt) echo "" > /var/lib/honeycomb/persist/context/data.json echo "" > /var/lib/honeycomb/persist/config/data.json -/opt/honeycomb/sample-distribution-1.0.0/honeycomb &>/dev/null &disown +/opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown sleep 20 # Enable traffic flows diff --git a/vnfs/vLB/.DS_Store b/vnfs/vLB/.DS_Store index 17638039..7670c655 100644 Binary files a/vnfs/vLB/.DS_Store and b/vnfs/vLB/.DS_Store differ diff --git a/vnfs/vLB/scripts/dnsclient.sh b/vnfs/vLB/scripts/dnsclient.sh index 1de11ed8..11f575f6 100644 --- a/vnfs/vLB/scripts/dnsclient.sh +++ b/vnfs/vLB/scripts/dnsclient.sh @@ -2,5 +2,6 @@ LB_OAM_INT=$(cat /opt/config/lb_oam_int.txt) PID=$(cat /opt/config/local_private_ipaddr.txt) +VERSION=$(cat /opt/config/artifacts_version.txt) -java -jar dns-client-1.0.0.jar $PID $LB_OAM_INT 8888 10 0 +java -jar dns-client-$VERSION.jar $PID $LB_OAM_INT 8888 10 0 diff --git a/vnfs/vLB/scripts/dnsmembership.sh b/vnfs/vLB/scripts/dnsmembership.sh index 073216b3..9c8ccede 100644 --- a/vnfs/vLB/scripts/dnsmembership.sh +++ b/vnfs/vLB/scripts/dnsmembership.sh @@ -1,5 +1,6 @@ #!/bin/bash MY_PUBLIC_IP=$(cat /opt/config/local_public_ipaddr.txt) +VERSION=$(cat /opt/config/artifacts_version.txt) -java -jar dns-manager-1.0.0.jar $MY_PUBLIC_IP 8888 10 3 0 +java -jar dns-manager-$VERSION.jar $MY_PUBLIC_IP 8888 10 3 0 diff --git a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh index ba7f56ca..094f3222 100644 --- a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh +++ b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh @@ -85,9 +85,10 @@ vppctl exec /opt/dns_streams/stream_dns10 sleep 1 # Start HoneyComb +VERSION=$(cat /opt/config/artifacts_version.txt) echo "" > /var/lib/honeycomb/persist/context/data.json echo "" > /var/lib/honeycomb/persist/config/data.json -/opt/honeycomb/sample-distribution-1.0.0/honeycomb &>/dev/null &disown +/opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown sleep 20 # Enable traffic flows