3 files changed, 29 insertions, 22 deletions
diff --git a/vnfs/vCPE/scripts/v_bng_init.sh b/vnfs/vCPE/scripts/v_bng_init.sh
index 6fb2eadc..e4a59835 100644
--- a/vnfs/vCPE/scripts/v_bng_init.sh
+++ b/vnfs/vCPE/scripts/v_bng_init.sh
@@ -2,3 +2,5 @@
 
 systemctl start vpp
 
+ip route add 10.3.0.0/24 via 192.168.40.41 dev tap0
+
diff --git a/vnfs/vCPE/scripts/v_bng_install.sh b/vnfs/vCPE/scripts/v_bng_install.sh
index e20128c5..49bca161 100644
--- a/vnfs/vCPE/scripts/v_bng_install.sh
+++ b/vnfs/vCPE/scripts/v_bng_install.sh
@@ -16,6 +16,7 @@ BRGEMU_BNG_NET_CIDR=$(cat /opt/config/brgemu_bng_net_cidr.txt)
 BRGEMU_BNG_NET_IPADDR=$(cat /opt/config/brgemu_bng_net_ipaddr.txt)
 CPE_SIGNAL_NET_CIDR=$(cat /opt/config/cpe_signal_net_cidr.txt)
 CPE_SIGNAL_NET_IPADDR=$(cat /opt/config/cpe_signal_net_ipaddr.txt)
+SDNC_IP_ADDR=$(cat /opt/config/sdnc_ip_addr.txt)
 
 # Build states are:
 # 'build' - just build the code
@@ -64,6 +65,10 @@ fi  # endif BUILD_STATE != "build"
 
 if [[ $BUILD_STATE != "done" ]]
 then
+    # Enable IPV4 forwarding through kernel
+    sed -i 's/^.*\(net.ipv4.ip_forward\).*/\1=1/g' /etc/sysctl.conf
+    sysctl -p /etc/sysctl.conf
+
     # Download required dependencies
     echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
     echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
@@ -250,6 +255,11 @@ set interface ip address ${BNG_GMUX_NIC} ${BNG_GMUX_NET_IPADDR}/${BNG_GMUX_NET_C
 set vbng dhcp4 remote 10.4.0.1 local ${CPE_SIGNAL_NET_IPADDR}
 set vbng aaa config /etc/vpp/vbng-aaa.cfg nas-port 5060
 
+tap connect tap0 address 192.168.40.40/24
+set int state tap-0 up
+set int ip address tap-0 192.168.40.41/24
+ip route add ${SDNC_IP_ADDR}/32 via 192.168.40.40 tap-0
+
 EOF
 
     cat > /etc/vpp/vbng-aaa.cfg << EOF
diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh
index a0a16c76..0f2b06f5 100755
--- a/vnfs/vCPE/scripts/v_brgemu_install.sh
+++ b/vnfs/vCPE/scripts/v_brgemu_install.sh
@@ -188,7 +188,8 @@ EOF
     #Get list of network device PCI bus addresses
     get_nic_pci_list() {
         while read -r line ; do
-            if [ "$line" != "${line#*network device}" ]; then
+            if [ "$line" != "${line#*network device}" ];
+            then
                  echo -n "${line%% *} "
             fi
         done < <(lspci)
@@ -205,12 +206,6 @@ EOF
     cat > /etc/vpp/setup.gate << EOF
 set int state ${BRG_BNG_NIC} up
 set dhcp client intfc ${BRG_BNG_NIC} hostname brg-emulator
-
-tap connect lstack
-set int state tap-0 up
-
-set interface l2 bridge tap-0 10 0
-set bridge-domain arp term 10
 EOF
 
 echo "sdnc_ip: $(cat /opt/config/sdnc_ip.txt)" > /opt/config/ip.txt
@@ -233,34 +228,34 @@ done
 BRG_BNG_NIC=$(cat /opt/config/brg_nic.txt)
 sdnc_ip=$(cat /opt/config/sdnc_ip.txt)
 
-vppctl tap connect tap0
+lstack_tap=$(vppctl tap connect lstack)
+vppctl set int state $lstack_tap up
+
+vppctl set interface l2 bridge $lstack_tap 10 0
+vppctl set bridge-domain arp term 10
+
+tap0_tap=$(vppctl tap connect tap0)
 sleep 3
-vppctl set int state tap-1 up
-vppctl set int ip addr tap-1 20.0.0.40/24
+vppctl set int state $tap0_tap up
+vppctl set int ip addr $tap0_tap 20.0.0.40/24
 ifconfig tap0 192.168.4.20/24
 route add -host $sdnc_ip tap0
 route add -host 20.0.0.40 tap0
-vppctl ip route add 192.168.4.0/24 via tap-1
-vppctl set interface snat in tap-1 out ${BRG_BNG_NIC}
+vppctl ip route add 192.168.4.0/24 via $tap0_tap
+vppctl set interface snat in $tap0_tap out ${BRG_BNG_NIC}
 vppctl snat add interface address ${BRG_BNG_NIC}
 
-#Get vBNG ip addr
-output=$(vppctl show dhcp client)
-vbng_ip=${output##*gw }
-
-vppctl ip route add $vbng_ip/32 via $vbng_ip ${BRG_BNG_NIC}
-vppctl ip route add $sdnc_ip/32 via $vbng_ip ${BRG_BNG_NIC}
-
-#Get HW addr of tap-1
+#Get HW addr of $tap0_tap
 while read -r hw
 do
-    if [[ "$hw" = tap-1* ]];
+    if [[ "$hw" = $tap0_tap* ]];
     then
         read -r hw
         hw_addr=${hw##* }
         break
     fi
 done < <(vppctl show hardware)
+
 arp -s $sdnc_ip $hw_addr
 arp -s 20.0.0.40 $hw_addr
 
@@ -270,7 +265,7 @@ var=${var##*HWaddr}
 var=${var%inet*}
 tap0_addr=${var%inet*}
 
-vppctl set ip arp tap-1 192.168.4.20 $tap0_addr
+vppctl set ip arp $tap0_tap 192.168.4.20 $tap0_addr
 
 EOF
     chmod +x /opt/bind_nic.sh