Add enable/disable test

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

diff --git a/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh b/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh
index 40979e6..692e9d4 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh
@@ -1,14 +1,14 @@
 
 source config.sh
 source odl_utils.sh
-source topologies/rtr_single_iface.sh
+source topologies/3_node_star.sh
 
 # set odl config json file names; they are common among all rtr tests
 ODL_CONFIG_FILE1="elp1.json"
 ODL_CONFIG_FILE2="elp2.json"
 
 if [ "$1" == "clean" ] ; then
-  rtr_single_iface_clean
+  3_node_star_topo_clean
   exit 0
 fi
 
@@ -18,25 +18,18 @@ if [[ $(id -u) != 0 ]]; then
 fi
 
 function test_rtr_single_iface {
-  rtr_single_iface_setup
+  3_node_star_topo_setup
 
-  if [ "$3" == "wait" ] ; then
-    read -p  "press any key to continue .." -n1
-  fi
+  maybe_pause
 
   test_result=1
 
   ip netns exec vpp-ns1 "${1}" -w 20 -c 1 "${2}"
   rc=$?
 
-  rtr_single_iface_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
+  maybe_pause
+  3_node_star_topo_clean
 
+  print_status $rc "No ICMP response!"
   exit $test_result
 }