Introduce an option for testing binary API

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

diff --git a/tests/data_plane/vpp_lite_topo/run.sh b/tests/data_plane/vpp_lite_topo/run.sh
index aa0a298..f57e4a2 100755 (executable)
--- a/tests/data_plane/vpp_lite_topo/run.sh
+++ b/tests/data_plane/vpp_lite_topo/run.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-source config.sh
 source odl_utils.sh
 
 TESTS_DIR=tests
@@ -11,12 +10,17 @@ function help
   echo
   echo This must be run with superuser privileges.
   echo "Usage:"
-  echo " ./run.sh [vh]"
+  echo " ./run.sh [vhc] [--config-method vat|cli]"
   echo
   echo "  -v : verbose output"
+  echo "  -c : clean"
   echo "  -h : show help"
+  echo "  --config-method : select configuration method. Default is VAT."
 }
 
+export CFG_METHOD=vat
+source config.sh
+
 verbose=0
 
 while [ $# -gt 0 ] ; do
@@ -28,6 +32,22 @@ while [ $# -gt 0 ] ; do
   elif [ $arg == "-h" ] ; then
     help
     exit 0
+  elif [ $arg == "-c" ] ; then
+    clean_all
+    exit 0
+  elif [ $arg == "--config-method" ] ; then
+    type=$1
+    shift
+    if [ $type != "vat" -a $type != "cli"  ] ; then
+      echo "ERROR: expected one of 'cli' or 'vat' "
+      help
+      exit 1
+    fi
+    export CFG_METHOD=$type
+  else
+    echo "parse error"
+    help
+    exit 1
   fi
 done
 
@@ -40,26 +60,24 @@ passed_num=0
 
 start_time=`date +%s`
 
-# check whether ODL is running
-if [ "`curl -X DELETE \
-  "http://${ODL_IP}:${ODL_PORT}/restconf/config/odl-mappingservice:mapping-database" \
-   -u ${ODL_USER}:${ODL_PASSWD} -s -o /dev/null -w "%{http_code}"`" != 200 ] ; then
-  echo "ODL is not running!"
-  exit 1
-fi
-
 # sudo?
 if [[ $(id -u) != 0 ]]; then
   echo "Superuser privileges needed!"
   exit 1
 fi
 
+# check whether ODL is running
+check_odl_running
+
+
 # count tests
 test_num=`ls -l "$TESTS_DIR"/test_* | wc -l`
 
 echo
 echo "Running VPP lite test suite."
 echo
+echo "Config method: $CFG_METHOD"
+echo
 
 for test_case in "$TESTS_DIR"/test_*
 do