Add map server fallback test

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

diff --git a/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh b/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh
index 1dc8ae0..ee24891 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/basic_multi_traffic.sh
@@ -1,13 +1,13 @@
 source config.sh
 source odl_utils.sh
-source topologies/basic_topo.sh
+source topologies/2_node_topo.sh
 
 ODL_CONFIG_FILE1="vpp1.json"
 ODL_CONFIG_FILE2="vpp2.json"
 ODL_CONFIG_FILE3="update_vpp2.json"
 
 if [ "$1" == "clean" ] ; then
-  basic_topo_clean
+  2_node_topo_clean
   exit 0
 fi
 
@@ -18,7 +18,7 @@ fi
 
 function test_basic_multi_traffic
 {
-  basic_topo_setup
+  2_node_topo_setup
 
   # additional setup
   ODL_CONFIG_DIR=`pwd`/../configs/odl/basic/4o4
@@ -27,23 +27,13 @@ function test_basic_multi_traffic
 
   test_result=1
 
-  if [ "$3" == "wait" ] ; then
-    read -p  "press any key to continue .." -n1
-  fi
+  maybe_pause
 
   ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
-  if [ $? -ne 0 ] ; then
-    echo "No response received!"
-    basic_topo_clean
-    exit $test_result
-  fi
+  assert_rc_ok $? 2_node_topo_clean "No response received!"
 
   ip netns exec vppns1 "${3}" -w 15 -c 1 "${4}"
-  if [ $? -ne 0 ] ; then
-    echo "No response received!"
-    basic_topo_clean
-    exit $test_result
-  fi
+  assert_rc_ok $? 2_node_topo_clean "No response received!"
 
   # change IP addresses of destination RLOC
   echo "set int ip address del host-intervpp2 6.0.3.2/24" | nc 0 5003
@@ -56,30 +46,19 @@ function test_basic_multi_traffic
   ODL_CONFIG_DIR=`pwd`/../configs/odl/basic/4o4
   post_curl "update-mapping" ${ODL_CONFIG_FILE3}
 
+  maybe_pause
+
   ip netns exec vppns1 "${1}" -w 15 -c 1 "${2}"
-  if [ $? -ne 0 ] ; then
-    echo "No response received!"
-    basic_topo_clean
-    exit $test_result
-  fi
+  assert_rc_ok $? 2_node_topo_clean "No response received!"
 
   ip netns exec vppns1 "${3}" -w 15 -c 1 "${4}"
   rc=$?
 
-  if [ "$3" == "wait" ] ; then
-    read -p  "press any key to continue .." -n1
-  fi
+  maybe_pause
 
   # test done
-
-  basic_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
+  2_node_topo_clean
+  print_status $rc "No ICMP response!"
 
   exit $test_result
 }
-