Fixed bug in v_brgemu_install.sh

[demo.git] / vnfs / vCPE / scripts / v_brgemu_install.sh

diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh
index 64621c0..e3a32fd 100755 (executable)
--- 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)
@@ -196,60 +197,75 @@ EOF
 
     NICS=$(get_nic_pci_list)
     NICS=`echo ${NICS} | sed 's/[0]\+\([0-9]\)/\1/g' | sed 's/[.:]/\//g'`
-    echo $NICS
 
     BRG_BNG_NIC=GigabitEthernet`echo ${NICS} | cut -d " " -f 2`  # second interface in list
- 
+    echo $BRG_BNG_NIC > /opt/config/brg_nic.txt
+
+
     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
 
-    cat >> /opt/config/ip.txt << EOF
-hcip: 192.168.4.20
-EOF
+echo "sdnc_ip: $(cat /opt/config/sdnc_ip.txt)" > /opt/config/ip.txt
+echo "hcip: 192.168.4.20" >> /opt/config/ip.txt
+
 
     cat > /opt/bind_nic.sh << 'EOF'
 #!/bin/bash
 while :
 do
-        if [[ ! $(ps -aux | grep [[:alnum:]]*/vpp/startup.conf | wc -l) = 2 ]]; then
+        if [[ ! $(ps -aux | grep [[:alnum:]]*/vpp/startup.conf | wc -l) = 2 ]];
+        then
                 echo "vpp not running"
         else
                 break
         fi
 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 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
+
+#Get HW addr of tap0
+var=$(ifconfig tap0)
+var=${var##*HWaddr}
+var=${var%inet*}
+tap0_addr=${var%inet*}
+
+vppctl set ip arp $tap0_tap 192.168.4.20 $tap0_addr
+
 EOF
     chmod +x /opt/bind_nic.sh
 
@@ -310,7 +326,20 @@ do
     sleep 1
 done
 EOF
+
     chmod +x /opt/set_nat.sh
+
+    #Create script to run bind_nic.sh and set_nat.sh
+    cat > /opt/nat_service.sh << 'EOF'
+#! /bin/bash
+
+sleep 15
+/opt/bind_nic.sh
+/opt/set_nat.sh
+
+EOF
+    chmod +x /opt/nat_service.sh
+
 fi  # endif BUILD_STATE != "build"
 
 if [[ $BUILD_STATE != "done" ]]
@@ -467,6 +496,24 @@ WantedBy=multi-user.target
 EOF
     systemctl enable /etc/systemd/system/honeycomb.service
 
+
+    # Create systemctl service for nat script
+    cat > /etc/systemd/system/nat.service << EOF
+[Unit]
+Description=Runs vbrg scripts for nat configuration
+Requires=vpp.service
+After=vpp.service
+
+[Service]
+RemainAfterExit=True
+ExecStart=/opt/nat_service.sh
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    systemctl enable /etc/systemd/system/nat.service
+
     # Download DHCP config files
     cd /opt
     wget $REPO_URL_BLOB/org.onap.demo/vnfs/vcpe/$INSTALL_SCRIPT_VERSION/v_brgemu_init.sh