update for fodexabgp-containerlab1/Dockerfile

inst/testing/fodexabgp-containerlab1/Dockerfile

@@ -17,7 +17,7 @@ COPY ./install-debian.sh /opt
 #RUN /opt/prep_fod_exabgp2_on_ubuntu.sh --systemd --systemd_only_install --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 172.17.0.2 172.17.0.2 1001 172.17.0.3 172.17.0.3 2001 
 #RUN /opt/prep_fod_exabgp2_on_ubuntu.sh --systemd --systemd_only_install --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001
 #RUN cd /opt && /opt/prep_fod_exabgp2_on_ubuntu.sh --supervisord --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001
-RUN cd /opt && /opt/install-debian.sh --git-checkout "" feature/exabgp_support2 /opt/FOD --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --ip-addr-set eth1 10.3.10.3 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001
+RUN cd /opt && /opt/install-debian.sh --git-checkout "" feature/exabgp_support2 /opt/FOD --here --supervisord --setup_admin_user --setup_admin_user5 admin adminpwd admin@localhost.local testpeer 0.0.0.0/0 --ip-addr-set eth1 10.3.10.3 1 --exabgp 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.10 2001
 
 # standalone re-setup of exabgp later (e.g., to exploit docker build cache for the action above)
 #RUN cd /opt/FOD/ && ./exabgp/run-exabgp-generic --init-conf 10.3.10.3 10.3.10.3 1001 10.3.10.10 10.3.10.12 3001 -- --systemd

install-centos.sh

@@ -86,6 +86,7 @@ setup_exabgp=0
 
 ifc_setup__name=""
 ifc_setup__ip_addr_and_subnetmask=""
+ifc_setup__wait_for_ifc__in_runfod=0
 
 ##############################################################################
 ##############################################################################
@@ -247,6 +248,8 @@ while [ $# -gt 0 ]; do
     shift 1
     ifc_setup__ip_addr_and_subnetmask="$1"
     shift 1
+    ifc_setup__wait_for_ifc__in_runfod="$1"
+    shift 1
     echo "$0: init of interface $ifc_setup__name with ip_addr_and_subnetmask=$ifc_setup__ip_addr_and_subnetmask" 1>&2
     ifconfig "$ifc_setup__name" "$ifc_setup__ip_addr_and_subnetmask" 
     ifconfig "$ifc_setup__name" 1>&2
@@ -779,6 +782,7 @@ EOF
     if [ -n "$ifc_setup__name" ]; then
       echo "ifc_setup__name=\"$ifc_setup__name\""
       echo "ifc_setup__ip_addr_and_subnetmask=\"$ifc_setup__ip_addr_and_subnetmask\""
+      echo "ifc_setup__wait_for_ifc__in_runfod=\"$ifc_setup__wait_for_ifc__in_runfod\""
     fi
   ) > "./runfod.conf"
 

install-debian.sh

@@ -97,6 +97,7 @@ setup_exabgp=0
 
 ifc_setup__name=""
 ifc_setup__ip_addr_and_subnetmask=""
+ifc_setup__wait_for_ifc__in_runfod=0
 
 ##############################################################################
 ##############################################################################
@@ -355,6 +356,8 @@ while [ $# -gt 0 ]; do
     shift 1
     ifc_setup__ip_addr_and_subnetmask="$1"
     shift 1
+    ifc_setup__wait_for_ifc__in_runfod="$1"
+    shift 1
     echo "$0: init of interface $ifc_setup__name with ip_addr_and_subnetmask=$ifc_setup__ip_addr_and_subnetmask" 1>&2
     ifconfig "$ifc_setup__name" "$ifc_setup__ip_addr_and_subnetmask" 
     ifconfig "$ifc_setup__name" 1>&2
@@ -906,6 +909,7 @@ EOF
     if [ -n "$ifc_setup__name" ]; then
       echo "ifc_setup__name=\"$ifc_setup__name\""
       echo "ifc_setup__ip_addr_and_subnetmask=\"$ifc_setup__ip_addr_and_subnetmask\""
+      echo "ifc_setup__wait_for_ifc__in_runfod=\"$ifc_setup__wait_for_ifc__in_runfod\""
     fi
   ) > "./runfod.conf"
 

runfod.sh

@@ -8,7 +8,16 @@ fi
 
 if [ -n "$ifc_setup__name" ]; then
   echo "$0: setting ip address of $ifc_setup__name to $ifc_setup__ip_addr_and_subnetmask" 1>&2
+
+  if [ "$ifc_setup__wait_for_ifc__in_runfod" = 1 ]; then
+    while ! ifconfig "$ifc_setup__name" 1>&2; do
+      echo "$0: interface $ifc_setup__name not available yet, waiting" 1>&2
+      sleep 1
+    done
+  fi
+
   ifconfig "$ifc_setup__name" "$ifc_setup__ip_addr_and_subnetmask"
+
 fi
 
 #