Fix NSH test

[one.git] / tests / data_plane / vpp_lite_topo / test_driver / nsh.sh

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 47f9b68..6796942 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/test_driver/nsh.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/nsh.sh
@@ -15,30 +15,11 @@ if [[ $(id -u) != 0 ]]; then
   exit 1
 fi
 
-function send_nsh_packet_from_namespace
-{
-  ns=$1
-  dst=$2
-  spi=$3
-  si=$4
-  itr_mac=$5
-  src_mac=$6
-
-  ip netns exec $ns python scripts/send_nsh_packet.py $dst $itr_mac $spi $si $src_mac
-}
-
 function test_nsh
 {
-  dst=$1
-  spi=$2
-  si=$3
-
   2_node_topo_setup
   rc=1
 
-  src_mac=`ip netns exec vppns1 ip a show dev veth_vpp1  | grep "link/ether" | awk '{print $2}'`
-  itr_mac=`echo "sh hard host-vpp1" | nc 0 5002 | grep 'Ethernet address' | awk '{print $3}'`
-
   maybe_pause
 
   cat << EOF > scripts/lisp_nsh
@@ -54,20 +35,23 @@ packet-generator new {
   interface pg0
   pcap ${ONE_ROOT}/tests/data_plane/vpp_lite_topo/scripts/nsh.pcap
 }
-
 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}'`"
 
@@ -78,5 +62,5 @@ EOF
   maybe_pause
   2_node_topo_clean
   print_status $rc "NSH test failed!"
-  exit $test_result
+  exit $rc
 }