summaryrefslogtreecommitdiffstats
path: root/vnfs/vFW/scripts
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-04-24 09:26:03 -0400
committerMarco Platania <platania@research.att.com>2017-04-24 09:26:03 -0400
commit7270048fdaa4409349b4ee0c4775dfecd544de1f (patch)
treec6d6b755aff32270e0c99cd47fadd988e95b4a55 /vnfs/vFW/scripts
parent366b7e2ea0e15889e3de08916c4406d98d6b509d (diff)
fix issue with artifacts version in vFW
Change-Id: I8bec217e5813924de4ce17dc19dcb5c704917471 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'vnfs/vFW/scripts')
-rw-r--r--vnfs/vFW/scripts/v_firewall_init.sh2
-rw-r--r--vnfs/vFW/scripts/v_firewall_install.sh4
-rw-r--r--vnfs/vFW/scripts/v_packetgen_init.sh2
-rw-r--r--vnfs/vFW/scripts/v_packetgen_install.sh5
-rw-r--r--vnfs/vFW/scripts/v_sink_init.sh2
-rw-r--r--vnfs/vFW/scripts/v_sink_install.sh2
6 files changed, 5 insertions, 12 deletions
diff --git a/vnfs/vFW/scripts/v_firewall_init.sh b/vnfs/vFW/scripts/v_firewall_init.sh
index 54928072..d277af04 100644
--- a/vnfs/vFW/scripts/v_firewall_init.sh
+++ b/vnfs/vFW/scripts/v_firewall_init.sh
@@ -37,7 +37,7 @@ ifconfig br1 up
sleep 1
# Start HoneyComb
-VERSION=$(cat /opt/config/artifacts_version.txt)
+VERSION=$(cat /opt/config/demo_artifacts_version.txt)
echo "" > /var/lib/honeycomb/persist/context/data.json
echo "" > /var/lib/honeycomb/persist/config/data.json
/opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown
diff --git a/vnfs/vFW/scripts/v_firewall_install.sh b/vnfs/vFW/scripts/v_firewall_install.sh
index 63ee38b0..d1d552b2 100644
--- a/vnfs/vFW/scripts/v_firewall_install.sh
+++ b/vnfs/vFW/scripts/v_firewall_install.sh
@@ -1,14 +1,12 @@
#!/bin/bash
-DCAE_COLLECTOR_IP=$(cat /opt/config/dcae_collector_ip.txt)
-DCAE_COLLECTOR_PORT=$(cat /opt/config/dcae_collector_port.txt)
REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
-# OpenStack network configuration
+# OpenStack network configuration
if [[ $CLOUD_ENV == "openstack" ]]
then
echo 127.0.0.1 $(hostname) >> /etc/hosts
diff --git a/vnfs/vFW/scripts/v_packetgen_init.sh b/vnfs/vFW/scripts/v_packetgen_init.sh
index 3bbe02f2..ca6571b7 100644
--- a/vnfs/vFW/scripts/v_packetgen_init.sh
+++ b/vnfs/vFW/scripts/v_packetgen_init.sh
@@ -50,7 +50,7 @@ vppctl exec /opt/pg_streams/stream_fw_udp10
sleep 1
# Start HoneyComb
-VERSION=$(cat /opt/config/artifacts_version.txt)
+VERSION=$(cat /opt/config/demo_artifacts_version.txt)
echo "" > /var/lib/honeycomb/persist/context/data.json
echo "" > /var/lib/honeycomb/persist/config/data.json
/opt/honeycomb/sample-distribution-$VERSION/honeycomb &>/dev/null &disown
diff --git a/vnfs/vFW/scripts/v_packetgen_install.sh b/vnfs/vFW/scripts/v_packetgen_install.sh
index 54a26a46..8f8537cd 100644
--- a/vnfs/vFW/scripts/v_packetgen_install.sh
+++ b/vnfs/vFW/scripts/v_packetgen_install.sh
@@ -1,15 +1,12 @@
#!/bin/bash
-FW_IPADDR=$(cat /opt/config/fw_ipaddr.txt)
-PROTECTED_NET_CIDR=$(cat /opt/config/protected_net_cidr.txt)
-SINK_IPADDR=$(cat /opt/config/sink_ipaddr.txt)
REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
-# Network configuration
+# OpenStack network configuration
if [[ $CLOUD_ENV == "openstack" ]]
then
echo 127.0.0.1 $(hostname) >> /etc/hosts
diff --git a/vnfs/vFW/scripts/v_sink_init.sh b/vnfs/vFW/scripts/v_sink_init.sh
index 16a67508..77f4296c 100644
--- a/vnfs/vFW/scripts/v_sink_init.sh
+++ b/vnfs/vFW/scripts/v_sink_init.sh
@@ -2,6 +2,6 @@
# Set the IP address of the protected network interface of the vFirewall as a default gateway to the unprotected network
PROTECTED_NET_GW=$(cat /opt/config/protected_net_gw.txt)
-UNPROTECTED_NET=$(cat /opt/config/unprotected_net.txt)
+UNPROTECTED_NET=$(cat /opt/config/unprotected_net.txt | cut -d'/' -f1)
route add -net $UNPROTECTED_NET netmask 255.255.255.0 gw $PROTECTED_NET_GW
diff --git a/vnfs/vFW/scripts/v_sink_install.sh b/vnfs/vFW/scripts/v_sink_install.sh
index 748545e3..686fd3ae 100644
--- a/vnfs/vFW/scripts/v_sink_install.sh
+++ b/vnfs/vFW/scripts/v_sink_install.sh
@@ -1,7 +1,5 @@
#!/bin/bash
-PROTECTED_NET_GW=$(cat /opt/config/protected_net_gw.txt)
-UNPROTECTED_NET=$(cat /opt/config/unprotected_net.txt | cut -d'/' -f1)
REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt)
INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
CLOUD_ENV=$(cat /opt/config/cloud_env.txt)