vFW general improvements

Change-Id: I670457bef90a893a13c8c579eba4d27ff33dfa54
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-603

9 files changed, 7 insertions, 6 deletions

diff --git a/vnfs/vFW/scripts/v_firewall_init.sh b/vnfs/vFW/scripts/v_firewall_init.sh
index df67a352..c937e9ab 100644..100755
--- 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
index 71ecad75..f5156ff0 100644..100755
--- 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
index 3b8f51ff..a5bc1963 100644..100755
--- 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
index b2ae1c32..b2ae1c32 100644..100755
--- a/vnfs/vFW/scripts/v_packetgen_install.sh
+++ b/vnfs/vFW/scripts/v_packetgen_install.sh
diff --git a/vnfs/vFW/scripts/v_sink_init.sh b/vnfs/vFW/scripts/v_sink_init.sh
index 7975d435..7975d435 100644..100755
--- a/vnfs/vFW/scripts/v_sink_init.sh
+++ b/vnfs/vFW/scripts/v_sink_init.sh
diff --git a/vnfs/vFW/scripts/v_sink_install.sh b/vnfs/vFW/scripts/v_sink_install.sh
index ebe67751..ebe67751 100644..100755
--- a/vnfs/vFW/scripts/v_sink_install.sh
+++ b/vnfs/vFW/scripts/v_sink_install.sh
diff --git a/vnfs/vFW/scripts/vfirewall.sh b/vnfs/vFW/scripts/vfirewall.sh
index 0c57d733..1b3c953a 100644..100755
--- 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
index bd1178a0..38770310 100644..100755
--- 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
index a6862b0d..047f1df8 100644..100755
--- 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