Add L2 ARP test

[one.git] / tests / data_plane / vpp_lite_topo / config.sh

diff --git a/tests/data_plane/vpp_lite_topo/config.sh b/tests/data_plane/vpp_lite_topo/config.sh
index 87cc041..c615707 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/config.sh
+++ b/tests/data_plane/vpp_lite_topo/config.sh
@@ -4,9 +4,9 @@ ODL_IP="127.0.0.1"
 ODL_PORT="8181"
 
 # path to vpp executable
-VPP_LITE_DIR=/vpp/build-root/install-vpp_lite_debug-native/vpp/bin
+VPP_LITE_DIR=/vpp/build-root/install-vpp_debug-native/vpp/bin
 VPP_LITE_BIN=${VPP_LITE_DIR}/vpp
-VPP_API_TEST=/vpp/build-root/install-vpp_lite_debug-native/vpp-api-test/bin/vpp_api_test
+VPP_API_TEST=/vpp/build-root/install-vpp_debug-native/vpp-api-test/bin/vpp_api_test
 
 # read user config file if exists
 if [ -f "${HOME}/.onerc" ] ; then
@@ -26,7 +26,7 @@ if [ ! -f "${VPP_API_TEST}" ] ; then
   echo "$ make build-vat"
   echo "VPP_API_TEST can be set in config.sh or in ~/.onerc."
   echo "Current value:"
-  echo "VPP_LITE_BIN=${VPP_API_TEST}"
+  echo "VPP_API_TEST=${VPP_API_TEST}"
   exit 1
 fi
 
@@ -116,7 +116,8 @@ function start_vpp
     unix { log /tmp/$2.log           \
            full-coredump             \
            cli-listen localhost:$1 } \
-    api-trace { on } api-segment { prefix "$2" }
+    api-trace { on } api-segment { prefix "$2" } \
+    plugins { plugin dpdk_plugin.so { disable } }
 }
 
 function print_status
@@ -135,7 +136,31 @@ function assert_rc_ok
   # assert_rc_ok rc cleanup_fcn error_msg
   if [ $1 -ne 0 ] ; then
     echo $3
+    maybe_pause
     $2
     exit $test_result
   fi
 }
+
+function assert_rc_not_ok
+{
+  if [ $1 -eq 0 ] ; then
+    echo $3
+    maybe_pause
+    $2
+    exit $test_result
+  fi
+}
+
+function start_map_resolver
+{
+  echo "starting dummy map resolver on interface $1"
+  python scripts/dummy_mr.py "$1" 4342 &
+  mr_id=$!
+}
+
+function check_counters
+{
+  python scripts/vat/check_counters.py ${VPP_API_TEST} ${VAT_TEMPLATES} "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8"
+}
+