From: Filip Tehlar <ftehlar@cisco.com>
Date: Thu, 7 Jul 2016 06:29:25 +0000 (+0200)
Subject: Add script which runs all VPP lite tests
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=05479d8750d11d46a939c31ca78e99ecc310dc7a;hp=12defda1182a88e98a20d63c32fe897359663ad7;p=one.git

Add script which runs all VPP lite tests

Change-Id: I13c8726ac60647201d40249434f3a81085a8f9ff
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
---

diff --git a/tests/data_plane/vpp_lite_topo/run.sh b/tests/data_plane/vpp_lite_topo/run.sh
new file mode 100755
index 0000000..59bae1c
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/run.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+TESTS_DIR=tests
+
+function help
+{
+  echo "Run all ONE tests"
+  echo
+  echo This must be run with superuser privileges.
+  echo "Usage:"
+  echo " ./run.sh [vh]"
+  echo
+  echo "  -v : verbose output"
+  echo "  -h : show help"
+}
+
+verbose=0
+
+while [ $# -gt 0 ] ; do
+  arg=$1
+  shift
+
+  if [ $arg == "-v" ]; then
+    verbose=1
+  elif [ $arg == "-h" ] ; then
+    help
+    exit 0
+  fi
+done
+
+### begin script
+
+failed_tcs=()
+count=0
+failed_num=0
+passed_num=0
+
+start_time=`date +%s`
+
+# count tests
+test_num=`ls -l $TESTS_DIR/test_* | wc -l`
+
+echo
+echo "Running VPP lite test suite."
+echo
+
+for test_case in $TESTS_DIR/test_*
+do
+  let "count=$count + 1"
+
+  # run the test case
+  base_name=`basename -a $test_case`
+  printf "*** %d/%d : %-45s" $count $test_num $base_name
+
+  if [ $verbose -ne 0 ] ; then
+    $test_case
+  else
+    $test_case &> /dev/null
+  fi
+  rc=$?
+
+  if [ $rc -ne 0 ] ; then
+    printf "failed!\n"
+    failed_tcs+=("$test_case")
+    let "failed_num=$failed_num + 1"
+  else
+    printf "passed.\n"
+    let "passed_num=$passed_num + 1"
+  fi
+  sleep 1
+done
+
+end_time=`date +%s`
+runtime=$((end_time-start_time))
+
+echo
+echo "------------------------------------------------------"
+echo "Runtime: " `date -u -d @${runtime} +"%M min %S sec"`
+echo
+
+if [ $failed_num -eq 0 ]; then
+  echo "All tests have passed."
+else
+  echo "List of failed test cases:"
+  for tc in "${failed_tcs[@]}"
+  do
+    echo "$tc"
+  done
+fi
+
+echo "------------------------------------------------------"
+
+### end script
diff --git a/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh b/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh
index 174a683..7ff2a1d 100644
--- a/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh
@@ -18,8 +18,6 @@ if [[ $(id -u) != 0 ]]; then
 fi
 
 function test_eid_virtualization {
-  two_customers_topo_clean
-  sleep 1
   two_customers_topo_setup
 
   # init to test failed
@@ -41,7 +39,7 @@ function test_eid_virtualization {
     echo "Error: customer 2 did not receive any response!"
   fi
 
-#  two_customers_topo_clean
+  two_customers_topo_clean
 
   if [ $rc -ne 0 ] ; then
     echo "Test failed!";
diff --git a/tests/data_plane/vpp_lite_topo/test_basic_4o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_basic_4o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_basic_4o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_basic_4o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_basic_4o4_and_6o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_basic_4o4_and_6o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_basic_4o4_and_6o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_basic_4o4_and_6o6.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_basic_4o4_no_odl.sh b/tests/data_plane/vpp_lite_topo/tests/test_basic_4o4_no_odl.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_basic_4o4_no_odl.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_basic_4o4_no_odl.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_basic_4o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_basic_4o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_basic_4o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_basic_4o6.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_basic_6o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_basic_6o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_basic_6o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_basic_6o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_basic_6o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_basic_6o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_basic_6o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_basic_6o6.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_basic_6o6_no_odl.sh b/tests/data_plane/vpp_lite_topo/tests/test_basic_6o6_no_odl.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_basic_6o6_no_odl.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_basic_6o6_no_odl.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_4o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_4o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_4o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_4o6.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_6o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_6o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_6o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_eid_virtualization_6o6.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_4o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_4o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_4o6.sh
similarity index 94%
rename from tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_4o6.sh
index fe1e3da..1bc2474 100755
--- a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o6.sh
+++ b/tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_4o6.sh
@@ -17,4 +17,4 @@ ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_single_iface/4o6"
 
 source test_driver/rtr_single_iface.sh
 
-test_rtr_single_iface "6.0.4.4"
+test_rtr_single_iface ping "6.0.4.4"
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_6o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_6o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_6o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_single_iface_6o6.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_4o4.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_4o4.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_rtr_two_iface_4o4.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_4o4.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_4o6.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_4o6.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_rtr_two_iface_4o6.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_4o6.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_6o46.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_6o46.sh
similarity index 93%
rename from tests/data_plane/vpp_lite_topo/test_rtr_two_iface_6o46.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_6o46.sh
index fd59664..1df6678 100755
--- a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_6o46.sh
+++ b/tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_6o46.sh
@@ -16,4 +16,4 @@ ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_two_iface/6o46"
 
 source test_driver/rtr_two_iface.sh
 
-test_rtr_two_iface "6:0:4::4" wait
+test_rtr_two_iface "6:0:4::4"
diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_two_customers_6o46.sh b/tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_two_customers_6o46.sh
similarity index 100%
rename from tests/data_plane/vpp_lite_topo/test_rtr_two_iface_two_customers_6o46.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_rtr_two_iface_two_customers_6o46.sh
diff --git a/tests/data_plane/vpp_lite_topo/test_smr_rtr_disjoint.sh b/tests/data_plane/vpp_lite_topo/tests/test_smr_rtr_disjoint.sh
similarity index 93%
rename from tests/data_plane/vpp_lite_topo/test_smr_rtr_disjoint.sh
rename to tests/data_plane/vpp_lite_topo/tests/test_smr_rtr_disjoint.sh
index 4d44ccb..0c49698 100755
--- a/tests/data_plane/vpp_lite_topo/test_smr_rtr_disjoint.sh
+++ b/tests/data_plane/vpp_lite_topo/tests/test_smr_rtr_disjoint.sh
@@ -17,4 +17,4 @@ ODL_CONFIG_DIR=`pwd`"/../configs/odl/smr_rtr_disjoint/"
 
 source test_driver/smr_rtr_disjoint.sh
 
-test_smr_rtr_disjoint "6:0:4::4" wait
+test_smr_rtr_disjoint "6:0:4::4"