Minor cleanup of NSH test

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

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..098bbc8 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,7 +35,6 @@ 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

diff --git a/tests/data_plane/vpp_lite_topo/tests/test_nsh.sh b/tests/data_plane/vpp_lite_topo/tests/test_nsh.sh
index e770f0b..f3fb5a6 100755 (executable)
--- a/tests/data_plane/vpp_lite_topo/tests/test_nsh.sh
+++ b/tests/data_plane/vpp_lite_topo/tests/test_nsh.sh
@@ -5,5 +5,4 @@ ODL_CONFIG_DIR=`pwd`/../configs/odl/nsh
 
 source test_driver/nsh.sh
 
-# args: dest IP, service path ID, service index
-test_nsh "6.0.2.2" 10 200
+test_nsh