From 8df4a643ae0d43a71e6e86c6be148386d99990ff Mon Sep 17 00:00:00 2001
From: platania <platania@research.att.com>
Date: Tue, 21 Feb 2017 17:31:41 -0500
Subject: [PATCH] update demo scripts with LF paths

Change-Id: I6c1983ab567359c157b05842a1ab2b613ee9de76
Signed-off-by: platania <platania@research.att.com>
---
 .DS_Store                                         | Bin 6148 -> 6148 bytes
 vnfs/.DS_Store                                    | Bin 10244 -> 10244 bytes
 vnfs/vFW/.DS_Store                                | Bin 8196 -> 8196 bytes
 vnfs/vFW/scripts/v_firewall_init.sh               |   3 ++-
 vnfs/vFW/scripts/v_packetgen_init.sh              |   3 ++-
 vnfs/vLB/.DS_Store                                | Bin 10244 -> 10244 bytes
 vnfs/vLB/scripts/dnsclient.sh                     |   3 ++-
 vnfs/vLB/scripts/dnsmembership.sh                 |   3 ++-
 vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh |   3 ++-
 9 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 6262f82f0159400a743696840ca4e6d5019433c2..7d0d65f17cf40a4b84fa1eae36c138ccb375eb1e 100644
GIT binary patch
delta 23
ecmZoMXffEp#>Qr(qhMlUIQc${(q=ujYk~kxh6bnr

delta 23
ecmZoMXffEp#>Qr;qhM%cI{7|}(q=ujYk~kx-3G1z

diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store
index 9019f9551fb96a372e7539340659a05ff48d4c43..892df7cf3504c41d4155a1dcfec54a4b1ad5e5e6 100644
GIT binary patch
delta 107
zcmZn(XbIR5Av(EQU>%#0j)IAa;p6~GrOAPU>YGEvJee@XRVPoE^ur>&`M#7Y>t=R^
MKvqmikXh>)0lHEj8UO$Q

delta 55
zcmZn(XbIR5Av)Pj=-1>uB66Dx#dMi~oIjIiOZtH5%}=D1SvRvNgs>thnZgJFWVRJF

diff --git a/vnfs/vFW/.DS_Store b/vnfs/vFW/.DS_Store
index 97cfa332b25b372fe2156f5d95761fbb9f8ebcca..bd8024d5704af933ecf8c8b0f5ddc7500bbc3494 100644
GIT binary patch
delta 51
zcmV-30L=e{K!iZBY!d<ZlQ0mf2^M>MGAtl8G%=In5F!G>!;=OP9|6R(W)z_VvjrIV
J1hfAX2LsIG5rF^z

delta 53
zcmV-50LuS_K!iZBY!d<blQ0mf3mAKQH90UWATc>IlOPl#0>j0V1`!_t#<OG;p#!rA
L81@9S`xFNQ)$|cK

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 17638039b8d170f8b3795b7ef2505b9d02dc4bd5..7670c6552c161379ef5768010e350a2a92b294a8 100644
GIT binary patch
delta 258
zcmZn(XbIS0D8TrA@@vsmoMP40Mmh>6CWe#eiYYN2JUscJm^|Z=$&A8MlRt}@ZY~$R
z$cSI1y@)G*1&JaOlP8OY<5%=h%zbjXV9De;;#reJh0-VIO7KlSC1kaEtAro>W_E>N
QER+9>7~pa&i8iDF0CtI94gdfE

delta 284
zcmZn(XbIS0D8Tq_@;lL09HQ0LCOQh1mXjBXDKQ;5G+9wZp7HQx9s#M%&Vp=AcojK{
zxZ;(s6V1mf|5VJKNlJ3Ep7<T<h|J{tyx`2L)OZ2@;*9)qParp-D77pzwS01+kUp2P
uLjVI9a88bsP-GOC+#n&!7`1ttL?Qdc2A0k23cpw;uM^P2;TxhIati?GR$ZL{

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
-- 
2.16.6