aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-08-17 10:35:57 -0400
committerMarco Platania <platania@research.att.com>2017-08-17 10:35:57 -0400
commit8d74252fc15feb54fcacb6b0456fb29acdbd3faa (patch)
treedf2f8a12cfeaf182c33cb5c01d83bc93471b6d22
parent1e33b97479773c55fb60afc5eb572f0bfdf680c8 (diff)
Rename vPacketGen install scritps
- Use v_packetgen_install.sh, v_packetgen_init.sh and vpacketgen.sh Change-Id: Ic147b7257cfd735e6ba846e5a15c291786ec9407 Issue-ID: UCA-34 Signed-off-by: Marco Platania <platania@research.att.com>
-rw-r--r--vnfs/vLB/scripts/v_packetgen_init.sh (renamed from vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh)0
-rw-r--r--vnfs/vLB/scripts/v_packetgen_install.sh14
-rw-r--r--vnfs/vLB/scripts/vpacketgen.sh (renamed from vnfs/vLB/scripts/vpacketgenfordnsdemo.sh)2
3 files changed, 8 insertions, 8 deletions
diff --git a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh b/vnfs/vLB/scripts/v_packetgen_init.sh
index c38d2baf..c38d2baf 100644
--- a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
+++ b/vnfs/vLB/scripts/v_packetgen_init.sh
diff --git a/vnfs/vLB/scripts/v_packetgen_install.sh b/vnfs/vLB/scripts/v_packetgen_install.sh
index 05edac6d..74b84854 100644
--- a/vnfs/vLB/scripts/v_packetgen_install.sh
+++ b/vnfs/vLB/scripts/v_packetgen_install.sh
@@ -53,8 +53,8 @@ pip install jsonschema
# Download vFirewall demo code for packet generator
mkdir /opt/honeycomb
cd /opt
-wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_packetgen_for_dns_demo_init.sh
-wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vpacketgenfordnsdemo.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_packetgen_init.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vpacketgen.sh
wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/run_streams_dns.sh
wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdnspacketgen_change_streams_ports.sh
wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
@@ -67,8 +67,8 @@ sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "
tar -zxvf vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
mv vlb_dns_streams-$DEMO_ARTIFACTS_VERSION dns_streams
rm *.tar.gz
-chmod +x v_packetgen_for_dns_demo_init.sh
-chmod +x vpacketgenfordnsdemo.sh
+chmod +x v_packetgen_init.sh
+chmod +x vpacketgen.sh
chmod +x run_streams_dns.sh
chmod +x vdnspacketgen_change_streams_ports.sh
@@ -83,8 +83,8 @@ sleep 1
# Run instantiation script
cd /opt
-mv vpacketgenfordnsdemo.sh /etc/init.d
-update-rc.d vpacketgenfordnsdemo.sh defaults
+mv vpacketgen.sh /etc/init.d
+update-rc.d vpacketgen.sh defaults
# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes
if [[ $CLOUD_ENV != "rackspace" ]]
@@ -98,4 +98,4 @@ then
reboot
fi
-./v_packetgen_for_dns_demo_init.sh
+./v_packetgen_init.sh
diff --git a/vnfs/vLB/scripts/vpacketgenfordnsdemo.sh b/vnfs/vLB/scripts/vpacketgen.sh
index 427e5337..1d00fd9c 100644
--- a/vnfs/vLB/scripts/vpacketgenfordnsdemo.sh
+++ b/vnfs/vLB/scripts/vpacketgen.sh
@@ -10,7 +10,7 @@
### END INIT INFO
dir="/opt"
-cmd="./v_packetgen_for_dns_demo_init.sh"
+cmd="./v_packetgen_init.sh"
user="root"
name=`basename $0`