Specify plugin directory when VPP starts

[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 2c58007..f2f8502 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/config.sh
+++ b/tests/data_plane/vpp_lite_topo/config.sh
@@ -4,9 +4,11 @@ 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
+VPP_PLUGIN_DIR=${VPP_LITE_DIR}/../lib64/vpp_plugins
+ONE_ROOT=/vpp/one
 
 # read user config file if exists
 if [ -f "${HOME}/.onerc" ] ; then
@@ -26,7 +28,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 +118,9 @@ 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 } } \
+    plugin_path ${VPP_PLUGIN_DIR}
 }
 
 function print_status
@@ -157,3 +161,9 @@ function start_map_resolver
   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"
+}
+