From 75b2c58811687602c1dab5cf2a69b2e94599bcee Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Fri, 27 Jul 2018 06:08:48 -0700 Subject: [PATCH] vFW general improvements Change-Id: I670457bef90a893a13c8c579eba4d27ff33dfa54 Signed-off-by: Victor Morales Issue-ID: INT-603 --- vnfs/vFW/scripts/v_firewall_init.sh | 1 + vnfs/vFW/scripts/v_firewall_install.sh | 5 ++--- vnfs/vFW/scripts/v_packetgen_init.sh | 1 + vnfs/vFW/scripts/v_packetgen_install.sh | 0 vnfs/vFW/scripts/v_sink_init.sh | 0 vnfs/vFW/scripts/v_sink_install.sh | 0 vnfs/vFW/scripts/vfirewall.sh | 2 +- vnfs/vFW/scripts/vpacketgen.sh | 2 +- vnfs/vFW/scripts/vsink.sh | 2 +- 9 files changed, 7 insertions(+), 6 deletions(-) mode change 100644 => 100755 vnfs/vFW/scripts/v_firewall_init.sh mode change 100644 => 100755 vnfs/vFW/scripts/v_firewall_install.sh mode change 100644 => 100755 vnfs/vFW/scripts/v_packetgen_init.sh mode change 100644 => 100755 vnfs/vFW/scripts/v_packetgen_install.sh mode change 100644 => 100755 vnfs/vFW/scripts/v_sink_init.sh mode change 100644 => 100755 vnfs/vFW/scripts/v_sink_install.sh mode change 100644 => 100755 vnfs/vFW/scripts/vfirewall.sh mode change 100644 => 100755 vnfs/vFW/scripts/vpacketgen.sh mode change 100644 => 100755 vnfs/vFW/scripts/vsink.sh diff --git a/vnfs/vFW/scripts/v_firewall_init.sh b/vnfs/vFW/scripts/v_firewall_init.sh old mode 100644 new mode 100755 index df67a352..c937e9ab --- a/vnfs/vFW/scripts/v_firewall_init.sh +++ b/vnfs/vFW/scripts/v_firewall_init.sh @@ -64,6 +64,7 @@ sleep 1 # Start HoneyComb VERSION=$(cat /opt/config/demo_artifacts_version.txt) +mkdir -p /var/lib/honeycomb/persist/{config,context}/ 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 old mode 100644 new mode 100755 index 71ecad75..f5156ff0 --- a/vnfs/vFW/scripts/v_firewall_install.sh +++ b/vnfs/vFW/scripts/v_firewall_install.sh @@ -76,12 +76,11 @@ wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vfw_reporting/$DEMO_ARTIFACT tar -zmxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves-$DEMO_ARTIFACTS_VERSION VES tar -zmxvf ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -mv ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vFW +mv ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION /opt/VES/evel/evel-library/code/VESreporting tar -zmxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz mv sample-distribution-$DEMO_ARTIFACTS_VERSION honeycomb sed -i 's/"restconf-binding-address": "127.0.0.1",/"restconf-binding-address": "0.0.0.0",/g' honeycomb/sample-distribution-$DEMO_ARTIFACTS_VERSION/config/honeycomb.json -mv VESreporting_vFW /opt/VES/evel/evel-library/code/VESreporting rm *.tar.gz chmod +x v_firewall_init.sh @@ -107,4 +106,4 @@ sleep 1 cd /opt mv vfirewall.sh /etc/init.d update-rc.d vfirewall.sh defaults -./v_firewall_init.sh \ No newline at end of file +./v_firewall_init.sh diff --git a/vnfs/vFW/scripts/v_packetgen_init.sh b/vnfs/vFW/scripts/v_packetgen_init.sh old mode 100644 new mode 100755 index 3b8f51ff..a5bc1963 --- a/vnfs/vFW/scripts/v_packetgen_init.sh +++ b/vnfs/vFW/scripts/v_packetgen_init.sh @@ -75,6 +75,7 @@ sleep 1 # Start HoneyComb VERSION=$(cat /opt/config/demo_artifacts_version.txt) +mkdir -p /var/lib/honeycomb/persist/{config,context}/ 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 old mode 100644 new mode 100755 diff --git a/vnfs/vFW/scripts/v_sink_init.sh b/vnfs/vFW/scripts/v_sink_init.sh old mode 100644 new mode 100755 diff --git a/vnfs/vFW/scripts/v_sink_install.sh b/vnfs/vFW/scripts/v_sink_install.sh old mode 100644 new mode 100755 diff --git a/vnfs/vFW/scripts/vfirewall.sh b/vnfs/vFW/scripts/vfirewall.sh old mode 100644 new mode 100755 index 0c57d733..1b3c953a --- a/vnfs/vFW/scripts/vfirewall.sh +++ b/vnfs/vFW/scripts/vfirewall.sh @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: +# Provides: firewall # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 diff --git a/vnfs/vFW/scripts/vpacketgen.sh b/vnfs/vFW/scripts/vpacketgen.sh old mode 100644 new mode 100755 index bd1178a0..38770310 --- a/vnfs/vFW/scripts/vpacketgen.sh +++ b/vnfs/vFW/scripts/vpacketgen.sh @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: +# Provides: packetgen # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 diff --git a/vnfs/vFW/scripts/vsink.sh b/vnfs/vFW/scripts/vsink.sh old mode 100644 new mode 100755 index a6862b0d..047f1df8 --- a/vnfs/vFW/scripts/vsink.sh +++ b/vnfs/vFW/scripts/vsink.sh @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: +# Provides: sink # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 2 3 4 5 -- 2.16.6