Fix multihoming tests

[one.git] / tests / data_plane / vpp_lite_topo / test_driver / multihoming_l2.sh

diff --git a/tests/data_plane/vpp_lite_topo/test_driver/multihoming_l2.sh b/tests/data_plane/vpp_lite_topo/test_driver/multihoming_l2.sh
index 64d3486..a5ef259 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/test_driver/multihoming_l2.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/multihoming_l2.sh
@@ -6,13 +6,6 @@ ODL_CONFIG_FILE1="vpp1.json"
 ODL_CONFIG_FILE2="vpp2.json"
 ODL_CONFIG_FILE3="update_vpp2.json"
 
-function maybe_pause
-{
-  if [ "$1" == "wait" ] ; then
-    read -p  "press any key to continue .." -n1
-  fi
-}
-
 if [ "$1" == "clean" ] ; then
   multihoming_topo_clean
   exit 0
@@ -46,10 +39,10 @@ function test_multihoming
   maybe_pause $3
 
   # do some port sweeping to see that load balancing works
-  ip netns exec vppns1 nc -n -z "${2}" 1-1000 > /dev/null 2>&1
+  ip netns exec vppns1 python scripts/port_flood.py "${2}" 1000
 
   # check that it works
-  pkts=$(echo "show int" | nc 0 5002 | grep host-intervpp11 | awk '{print $6}' | tr -d '\r')
+  pkts=$(echo "show int" | nc 0 5003 | grep host-intervpp12 | awk '{print $6}' | tr -d '\r')
 
   if [ $pkts -gt 450 ] && [ $pkts -lt 550 ] ; then
     rc=0
@@ -83,12 +76,6 @@ function test_multihoming
   maybe_pause $3
 
   multihoming_topo_clean
-  if [ $rc -ne 0 ] ; then
-    echo "Test failed: No ICMP response received within specified timeout limit!"
-  else
-    echo "Test passed."
-    test_result=0
-  fi
-
+  print_status $rc "No ICMP response!"
   exit $test_result
 }