Fix eth0 issues in vLB demo

[demo.git] / vnfs / vLB / scripts / v_packetgen_for_dns_demo_init.sh

diff --git a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
index 9078b7f..8ab56c1 100644 (file)
--- a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
+++ b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
@@ -4,12 +4,36 @@
 start vpp
 sleep 1
 
+# Compute the network CIDR from the 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"
+#}
+
+#IPADDR1_MASK=$(ifconfig eth0 | grep "Mask" | awk '{print $4}' | awk -F ":" '{print $2}')
+#IPADDR1_CIDR=$(mask2cidr $IPADDR1_MASK)
+
 # Configure VPP for vPacketGenerator
 IPADDR1=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
 HWADDR1=$(ifconfig eth0 | 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"')
 VLB_IPADDR=$(cat /opt/config/vlb_ipaddr.txt)
-GW=$(route | grep default | awk '{print $2}')
+GW=$(route -n | grep "^0.0.0.0" | awk '{print $2}')
 
 ifconfig eth0 down
 ifconfig eth0 hw ether $FAKE_HWADDR1
@@ -17,6 +41,7 @@ ip addr flush dev eth0
 ifconfig eth0 up
 vppctl tap connect tap111 hwaddr $HWADDR1
 vppctl set int ip address tap-0 $IPADDR1"/24"
+#$IPADDR1_CIDR
 vppctl set int state tap-0 up
 brctl addbr br0
 brctl addif br0 tap111
@@ -26,9 +51,9 @@ vppctl ip route add 0.0.0.0/0 via $GW
 sleep 1
 
 
-#Let's set br0 with public IP and valid MAC so that Linux will have public network access
+# Set br0 with public IP and valid MAC so that Linux will have public network access
 ifconfig br0 hw ether $HWADDR1
-ifconfig br0 $IPADDR1 netmask 255.255.255.0
+ifconfig br0 $IPADDR1 netmask $IPADDR1_MASK
 route add default gw $GW
 
 #Adding static arp entry for VPP so that it will be able to send packets to default GW
@@ -38,15 +63,15 @@ sleep 3
 GW_MAC=$(arp -n | grep -w $GW | tr -s ' ' | cut -d' ' -f3)
 VLB_MAC=$(arp -n | grep -w $VLB_IPADDR | tr -s ' ' | cut -d' ' -f3)
 
-#if VLB in our network, we will use its mac
-if [ ! -z "$VLB_MAC" ]; then
-vppctl set ip arp tap-0 $VLB_IPADDR $VLB_MAC
+# If VLB is in our network, we will use its MAC
+if [ ! -z "$VLB_MAC" ]
+then
+       vppctl set ip arp tap-0 $VLB_IPADDR $VLB_MAC
 fi
 
-# in any case let's add arp entry for default gw
+# Add arp entry for default GW
 vppctl set ip arp tap-0 $GW $GW_MAC
 
-
 # Install packet streams
 sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns1
 sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns2
@@ -59,8 +84,6 @@ sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/
 sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns9
 sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns10
 
-#sed -i -e "s/.*-> 53.*/    UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns*
-
 sed -i -e "s/.*-> 53.*/    UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns1
 sed -i -e "s/.*-> 53.*/    UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns2
 sed -i -e "s/.*-> 53.*/    UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns3
@@ -85,7 +108,7 @@ vppctl exec /opt/dns_streams/stream_dns10
 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