X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FvFW%2Fscripts%2Fv_firewall_init.sh;h=9b8be88efd15cc07cf141d8543a649bca3129980;hb=HEAD;hp=d277af04ab8878246c65e924803c5589b14d9f9b;hpb=7270048fdaa4409349b4ee0c4775dfecd544de1f;p=demo.git

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 d277af04..9b8be88e
--- a/vnfs/vFW/scripts/v_firewall_init.sh
+++ b/vnfs/vFW/scripts/v_firewall_init.sh
@@ -1,5 +1,26 @@
 #!/bin/bash
 
+# Convert Network CIDR to Netmask
+mask2cidr() {
+    nbits=0
+    IFS=.
+    for dec in $1 ; do
+        case $dec in
+            255) let nbits+=8;;
+            254) let nbits+=7;;
+            252) let nbits+=6;;
+            248) let nbits+=5;;
+            240) let nbits+=4;;
+            224) let nbits+=3;;
+            192) let nbits+=2;;
+            128) let nbits+=1;;
+            0);;
+            *) echo "Error: $dec is not recognized"; exit 1
+        esac
+    done
+    echo "$nbits"
+}
+
 # Start VPP
 start vpp
 sleep 1
@@ -12,6 +33,11 @@ HWADDR2=$(ifconfig eth2 | grep HWaddr | tr -s ' ' | cut -d' ' -f5)
 FAKE_HWADDR1=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null | hexdump -v -e '/1 ":%02X"')
 FAKE_HWADDR2=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null | hexdump -v -e '/1 ":%02X"')
 
+IPADDR1_MASK=$(ifconfig eth1 | grep "Mask" | awk '{print $4}' | awk -F ":" '{print $2}')
+IPADDR1_CIDR=$(mask2cidr $IPADDR1_MASK)
+IPADDR2_MASK=$(ifconfig eth2 | grep "Mask" | awk '{print $4}' | awk -F ":" '{print $2}')
+IPADDR2_CIDR=$(mask2cidr $IPADDR2_MASK)
+
 ifconfig eth1 down
 ifconfig eth2 down
 ifconfig eth1 hw ether $FAKE_HWADDR1
@@ -20,17 +46,17 @@ ip addr flush dev eth1
 ip addr flush dev eth2
 ifconfig eth1 up
 ifconfig eth2 up
-vppctl tap connect tap111 hwaddr $HWADDR1
-vppctl tap connect tap222 hwaddr $HWADDR2
-vppctl set int ip address tap-0 $IPADDR1"/24"
-vppctl set int ip address tap-1 $IPADDR2"/24"
-vppctl set int state tap-0 up
-vppctl set int state tap-1 up
+vppctl create tap hw-addr $HWADDR1
+vppctl create tap hw-addr $HWADDR2
+vppctl set int ip address tap0 $IPADDR1"/"$IPADDR1_CIDR
+vppctl set int ip address tap1 $IPADDR2"/"$IPADDR2_CIDR
+vppctl set int state tap0 up
+vppctl set int state tap1 up
 brctl addbr br0
-brctl addif br0 tap111
+brctl addif br0 tap0
 brctl addif br0 eth1
 brctl addbr br1
-brctl addif br1 tap222
+brctl addif br1 tap1
 brctl addif br1 eth2
 ifconfig br0 up
 ifconfig br1 up
@@ -38,11 +64,12 @@ 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
+/opt/honeycomb/honeycomb &>/dev/null &disown
 sleep 1
 
 # Start VES client
-cd /opt/VES/code/evel_training/VESreporting/
-./go-client.sh &>/dev/null &disown 
+cd /opt/VES/evel/evel-library/code/VESreporting/
+./go-client.sh &>/dev/null &disown 
\ No newline at end of file