X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fdata_plane%2Fvpp_lite_topo%2Ftest_driver%2Frtr_single_iface.sh;h=692e9d4356264a330a2a94d618c0d10b7ab3e525;hb=5089c8126fe1d2c389ebc2e4b579612d6df15a69;hp=6331ab5e496ae093dfef4dc7620060127572038c;hpb=4bf6318c1de924c63e22479cc38549ce3af3e420;p=one.git 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 6331ab5..692e9d4 100644 --- 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,21 +18,18 @@ if [[ $(id -u) != 0 ]]; then fi function test_rtr_single_iface { - rtr_single_iface_setup + 3_node_star_topo_setup + + maybe_pause test_result=1 - ip netns exec vpp-ns1 ping -w 15 -c 1 "${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 }