From: Marco Platania <platania@research.att.com>
Date: Tue, 31 Oct 2017 02:06:33 +0000 (+0000)
Subject: Merge "Fixed bug in vbrg install script here document"
X-Git-Tag: 1.0.0-Amsterdam~66
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=25137730b55170e41e0304d5c9580487572f3275;hp=e287862e314ab28c532b9fbc7fcda554430ebec7;p=demo.git

Merge "Fixed bug in vbrg install script here document"
---

diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh
index 64621c0a..94ed76d2 100755
--- a/vnfs/vCPE/scripts/v_brgemu_install.sh
+++ b/vnfs/vCPE/scripts/v_brgemu_install.sh
@@ -199,7 +199,8 @@ EOF
     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
@@ -219,13 +220,15 @@ 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