Fix several timing issues when using CLI as a config method

Change-Id: I9fd06b7bb491e10b1dc199a04627bd088172d050
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

diff --git a/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh b/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh
index 15ad7af..551f74d 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/basic_topo_l2.sh
@@ -97,12 +97,12 @@ function basic_topo_setup
 
   maybe_pause
 
+  sleep 2
   echo "* Selected configuration method: $CFG_METHOD"
   if [ "$CFG_METHOD" == "cli" ] ; then
     echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
     echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
   elif [ "$CFG_METHOD" == "vat" ] ; then
-    sleep 2
     ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
     ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
   else

diff --git a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh
index 9f06d82..1f41cdd 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo.sh
@@ -109,12 +109,12 @@ function multihoming_topo_setup
   start_vpp 5002 vpp1
   start_vpp 5003 vpp2
 
+  sleep 2
   echo "* Selected configuration method: $CFG_METHOD"
   if [ "$CFG_METHOD" == "cli" ] ; then
     echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
     echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
   elif [ "$CFG_METHOD" == "vat" ] ; then
-    sleep 2
     ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
     ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
   else

diff --git a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh
index b28c6d5..07a85b3 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/multihoming_topo_l2.sh
@@ -117,11 +117,11 @@ function multihoming_topo_setup
   start_vpp 5003 vpp2
 
   echo "* Selected configuration method: $CFG_METHOD"
+  sleep 2
   if [ "$CFG_METHOD" == "cli" ] ; then
     echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
     echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
   elif [ "$CFG_METHOD" == "vat" ] ; then
-    sleep 2
     ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
     ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
   else

diff --git a/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh
index e46354d..c836e64 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface.sh
@@ -133,13 +133,13 @@ function rtr_two_iface_setup {
   start_vpp 5003 vpp2
   start_vpp 5004 vpp3
 
+  sleep 2
   echo "* Selected configuration method: $CFG_METHOD"
   if [ "$CFG_METHOD" == "cli" ] ; then
     echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
     echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
     echo "exec ${VPP_LITE_CONF}/vpp3.cli" | nc 0 5004
   elif [ "$CFG_METHOD" == "vat" ] ; then
-    sleep 2
     ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
     ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
     ${VPP_API_TEST} chroot prefix vpp3 script in ${VPP_LITE_CONF}/vpp3.vat

diff --git a/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh b/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh
index e18d229..ea3ee1e 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh
@@ -123,12 +123,12 @@ function smr_rtr_disjoint_setup {
   start_vpp 5004 vpp3
 
   echo "* Selected configuration method: $CFG_METHOD"
+  sleep 2
   if [ "$CFG_METHOD" == "cli" ] ; then
     echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
     echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
     echo "exec ${VPP_LITE_CONF}/vpp3.cli" | nc 0 5004
   elif [ "$CFG_METHOD" == "vat" ] ; then
-    sleep 2
     ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
     ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
     ${VPP_API_TEST} chroot prefix vpp3 script in ${VPP_LITE_CONF}/vpp3.vat

diff --git a/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh b/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh
index f594d45..99a48e9 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh
@@ -117,11 +117,11 @@ function two_customers_topo_setup {
   start_vpp 5003 vpp2
 
   echo "* Selected configuration method: $CFG_METHOD"
+  sleep 2
   if [ "$CFG_METHOD" == "cli" ] ; then
     echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002
     echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003
   elif [ "$CFG_METHOD" == "vat" ] ; then
-    sleep 2
     ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat
     ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat
   else