Add L3 RTR test with EIDs in non-default VNI

[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 d51b552..2d712d2 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,13 +10,17 @@ function help
   echo
   echo This must be run with superuser privileges.
   echo "Usage:"
-  echo " ./run.sh [vhc]"
+  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
@@ -32,6 +35,19 @@ while [ $# -gt 0 ] ; do
   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
 
@@ -56,10 +72,14 @@ check_odl_running
 
 # count tests
 test_num=`ls -l "$TESTS_DIR"/test_* | wc -l`
+disabled_num=`ls -l "$TESTS_DIR"/disabled_test_* | wc -l`
+manual_num=`ls -l "$TESTS_DIR"/manual_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
@@ -67,7 +87,7 @@ do
 
   # run the test case
   base_name=`basename -a "$test_case"`
-  printf "*** %2d/%d : %-45s" $count $test_num "$base_name"
+  printf "*** %2d/%d : %-48s" $count $test_num "$base_name"
 
   if [ $verbose -ne 0 ] ; then
     "$test_case"
@@ -105,6 +125,16 @@ else
   done
 fi
 
+echo
+if [ $disabled_num -ne 0 ] ; then
+  echo "Skipped tests: " $disabled_num
+fi
+
+if [ $manual_num -ne 0 ] ; then
+  echo "Manual tests: " $manual_num
+fi
+
+echo
 echo "------------------------------------------------------"
 
 ### end script