summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xvnfs/vLB/scripts/v_lb_init.sh45
-rw-r--r--vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh47
2 files changed, 47 insertions, 45 deletions
diff --git a/vnfs/vLB/scripts/v_lb_init.sh b/vnfs/vLB/scripts/v_lb_init.sh
index e41c4ef3..a0a193c3 100755
--- a/vnfs/vLB/scripts/v_lb_init.sh
+++ b/vnfs/vLB/scripts/v_lb_init.sh
@@ -5,28 +5,28 @@ 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"
-}
+#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)
+#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)
@@ -42,7 +42,8 @@ ifconfig eth0 hw ether $FAKE_HWADDR1
ip addr flush dev eth0
ifconfig eth0 up
vppctl tap connect tappub hwaddr $HWADDR1
-vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR
+vppctl set int ip address tap-0 $IPADDR1"/24"
+#$IPADDR1_CIDR
vppctl set int state tap-0 up
brctl addbr br0
brctl addif br0 tappub
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 9e7879bc..8ab56c14 100644
--- a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
+++ b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh
@@ -5,28 +5,28 @@ 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)
+#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)
@@ -40,7 +40,8 @@ ifconfig eth0 hw ether $FAKE_HWADDR1
ip addr flush dev eth0
ifconfig eth0 up
vppctl tap connect tap111 hwaddr $HWADDR1
-vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR
+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