From 7000eb00c39af12b3abc7d74d1f13f99f5b2b338 Mon Sep 17 00:00:00 2001
From: Filip Tehlar <ftehlar@cisco.com>
Date: Tue, 17 Oct 2017 07:32:18 -0700
Subject: Fix NSH test

Change-Id: Ia6b50dcf94680d65f13a2f7aebb7a53bfccfe492
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
---
 tests/data_plane/vpp_lite_topo/config.sh          | 2 +-
 tests/data_plane/vpp_lite_topo/run.sh             | 2 ++
 tests/data_plane/vpp_lite_topo/test_driver/nsh.sh | 8 ++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/data_plane/vpp_lite_topo/config.sh b/tests/data_plane/vpp_lite_topo/config.sh
index 0c5dfc4..eaf2f84 100644
--- a/tests/data_plane/vpp_lite_topo/config.sh
+++ b/tests/data_plane/vpp_lite_topo/config.sh
@@ -120,7 +120,7 @@ function start_vpp
            cli-listen localhost:$1 } \
     api-trace { on } api-segment { prefix "$2" } \
     plugins { plugin dpdk_plugin.so { disable } } \
-    plugin_path ${VPP_PLUGIN_DIR}
+    plugin_path ${VPP_PLUGIN_DIR} 2> /dev/null
 }
 
 function print_status
diff --git a/tests/data_plane/vpp_lite_topo/run.sh b/tests/data_plane/vpp_lite_topo/run.sh
index 2d712d2..7519ce5 100755
--- a/tests/data_plane/vpp_lite_topo/run.sh
+++ b/tests/data_plane/vpp_lite_topo/run.sh
@@ -88,6 +88,7 @@ do
   # run the test case
   base_name=`basename -a "$test_case"`
   printf "*** %2d/%d : %-48s" $count $test_num "$base_name"
+  logger "*** test start $base_name"
 
   if [ $verbose -ne 0 ] ; then
     "$test_case"
@@ -104,6 +105,7 @@ do
     printf "passed.\n"
     let "passed_num=$passed_num + 1"
   fi
+  logger "*** test end $base_name: result: $rc"
   sleep 1
 done
 
diff --git a/tests/data_plane/vpp_lite_topo/test_driver/nsh.sh b/tests/data_plane/vpp_lite_topo/test_driver/nsh.sh
index 098bbc8..6796942 100644
--- a/tests/data_plane/vpp_lite_topo/test_driver/nsh.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/nsh.sh
@@ -40,14 +40,18 @@ EOF
   echo "trace add af-packet-input 100" | nc 0 5002
   echo "trace add af-packet-input 100" | nc 0 5003
   echo "exec ${ONE_ROOT}/tests/data_plane/vpp_lite_topo/scripts/lisp_nsh" | nc 0 5002
-  echo "packet-generator enable-stream nsh1" | nc 0 5002
 
   # add dummy node to ETR
   echo "test one nsh add-dummy-decap-node" | nc 0 5003
 
+  echo "packet-generator enable-stream nsh1" | nc 0 5002
+
+  echo "enabling stream"
+  sleep 1
   # inject NSH packet to ITR
   echo "test one nsh pcap ${ONE_ROOT}/tests/data_plane/vpp_lite_topo/scripts/nsh.pcap" | nc 0 5002
 
+  sleep 1
   # check decap stats
   decap_stats="`echo "show errors" | nc 0 5003 | grep "lisp gpe dummy nsh decap" | awk '{print $1}'`"
 
@@ -58,5 +62,5 @@ EOF
   maybe_pause
   2_node_topo_clean
   print_status $rc "NSH test failed!"
-  exit $test_result
+  exit $rc
 }
-- 
cgit 1.2.3-korg