5 files changed, 92 insertions, 36 deletions
diff --git a/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_inbound.sh b/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_inbound.sh
index 453de3f8de..9d7ee72690 100755
--- a/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_inbound.sh
+++ b/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_inbound.sh
@@ -2,18 +2,23 @@
 
 set -x
 
+vpp_interface1=$1
+vpp_interface2=$2
+vpp_intf1_adj_mac=$3
+vpp_intf2_adj_mac=$4
+
 sudo service vpp restart
 sleep 5
 
-sudo vppctl set int state $1 up
+sudo vppctl set int state ${vpp_interface1} up
 sleep 10
-sudo vppctl set int ip table $1 0
-sudo vppctl set int ip address $1 192.168.50.76/24
+sudo vppctl set int ip table ${vpp_interface1} 0
+sudo vppctl set int ip address ${vpp_interface1} 192.168.50.76/24
 
 sudo vppctl create vxlan-gpe tunnel local 192.168.50.76 remote 192.168.50.72 vni 9 next-nsh encap-vrf-id 0 decap-vrf-id 0
 sudo vppctl set int l2 bridge vxlan_gpe_tunnel0 1 1
 
-sudo vppctl create vxlan tunnel src 192.168.50.76 dst 192.168.50.71 vni 1 encap-vrf-id 0 decap-next node nsh-proxy
+sudo vppctl create vxlan tunnel src 192.168.60.76 dst 192.168.60.71 vni 1 encap-vrf-id 0 decap-next node nsh-proxy
 sudo vppctl set int l2 bridge vxlan_tunnel0 1 1
 
 sudo vppctl create nsh entry nsp 185 nsi 255 md-type 1 c1 3232248395 c2 9 c3 3232248392 c4 50336437 next-ethernet
@@ -26,7 +31,13 @@ sudo vppctl create nsh map nsp 185 nsi 255 mapped-nsp 185 mapped-nsi 255 nsh_act
 sudo vppctl create nsh map nsp 185 nsi 254 mapped-nsp 185 mapped-nsi 254 nsh_action push encap-vxlan-gpe-intf ${vxlan_gpe_index}
 
 sudo vppctl ip route add 192.168.50.72/24 via 192.168.50.76
-sudo vppctl set ip arp $1 192.168.50.71 $2
-sudo vppctl set ip arp $1 192.168.50.72 $2
+
+sudo vppctl set int state ${vpp_interface2} up
+sleep 10
+sudo vppctl set int ip table ${vpp_interface2} 0
+sudo vppctl set int ip address ${vpp_interface2} 192.168.60.76/24
+
+sudo vppctl ip route add 192.168.60.71/24 via 192.168.60.76
+sudo vppctl set ip arp ${vpp_interface2} 192.168.60.71 ${vpp_intf2_adj_mac}
 
 sudo vppctl trace add dpdk-input 100
diff --git a/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_outbound.sh b/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_outbound.sh
index 304ed30cda..3aaf0e9853 100755
--- a/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_outbound.sh
+++ b/tests/nsh_sfc/sfc_scripts/set_nsh_proxy_outbound.sh
@@ -2,15 +2,20 @@
 
 set -x
 
+vpp_interface1=$1
+vpp_interface2=$2
+vpp_intf1_adj_mac=$3
+vpp_intf2_adj_mac=$4
+
 sudo service vpp restart
 sleep 5
 
-sudo vppctl set int state $1 up
+sudo vppctl set int state ${vpp_interface1} up
 sleep 10
-sudo vppctl set int ip table $1 0
-sudo vppctl set int ip address $1 192.168.50.76/24
+sudo vppctl set int ip table ${vpp_interface1} 0
+sudo vppctl set int ip address ${vpp_interface1} 192.168.50.76/24
 
-sudo vppctl create vxlan-gpe tunnel local 192.168.50.76 remote 192.168.50.71 vni 9 next-nsh encap-vrf-id 0 decap-vrf-id 0
+sudo vppctl create vxlan-gpe tunnel local 192.168.60.76 remote 192.168.60.71 vni 9 next-nsh encap-vrf-id 0 decap-vrf-id 0
 sudo vppctl set int l2 bridge vxlan_gpe_tunnel0 1 1
 
 sudo vppctl create vxlan tunnel src 192.168.50.76 dst 192.168.50.72 vni 1 encap-vrf-id 0 decap-next node nsh-proxy
@@ -26,7 +31,13 @@ sudo vppctl create nsh map nsp 185 nsi 255 mapped-nsp 185 mapped-nsi 255 nsh_act
 sudo vppctl create nsh map nsp 185 nsi 254 mapped-nsp 185 mapped-nsi 254 nsh_action push encap-vxlan-gpe-intf ${vxlan_gpe_index}
 
 sudo vppctl ip route add 192.168.50.72/24 via 192.168.50.76
-sudo vppctl set ip arp $1 192.168.50.71 $2
-sudo vppctl set ip arp $1 192.168.50.72 $2
+
+sudo vppctl set int state ${vpp_interface2} up
+sleep 10
+sudo vppctl set int ip table ${vpp_interface2} 0
+sudo vppctl set int ip address ${vpp_interface2} 192.168.60.76/24
+
+sudo vppctl ip route add 192.168.60.71/24 via 192.168.60.76
+sudo vppctl set ip arp ${vpp_interface2} 192.168.60.71 ${vpp_intf2_adj_mac}
 
 sudo vppctl trace add dpdk-input 100
diff --git a/tests/nsh_sfc/sfc_scripts/set_sfc_classifier.sh b/tests/nsh_sfc/sfc_scripts/set_sfc_classifier.sh
new file mode 100755
index 0000000000..ae5f54bbb6
--- /dev/null
+++ b/tests/nsh_sfc/sfc_scripts/set_sfc_classifier.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -x
+
+vpp_interface1=$1
+vpp_interface2=$2
+vpp_intf1_adj_mac=$3
+vpp_intf2_adj_mac=$4
+
+sudo service vpp restart
+sleep 5
+
+sudo vppctl set int state ${vpp_interface1} up
+sleep 10
+sudo vppctl set int ip table ${vpp_interface1} 0
+sudo vppctl set int ip address ${vpp_interface1} 192.168.50.76/24
+
+sudo vppctl classify table mask l3 ip4 proto
+sudo vppctl classify session l2-input-hit-next input-node nsh-classifier table-index 0 match l3 ip4 proto 6 opaque-index 47615
+sudo vppctl set int l2 bridge ${vpp_interface1} 1 1
+sudo vppctl set interface l2 input classify intfc ${vpp_interface1} ip4-table 0
+
+sudo vppctl create vxlan-gpe tunnel local 192.168.60.76 remote 192.168.60.71 vni 9 next-nsh encap-vrf-id 0 decap-vrf-id 0
+sudo vppctl set int l2 bridge vxlan_gpe_tunnel0 1 1
+sleep 2
+sw_index0=`sudo vppctl sh int | grep "vxlan_gpe_tunnel0" | awk '{print $2}'`
+sudo vppctl create nsh entry nsp 185 nsi 255 md-type 1 c1 3232248395 c2 9 c3 3232248392 c4 50336437 next-ethernet
+sudo vppctl create nsh map nsp 185 nsi 255 mapped-nsp 185 mapped-nsi 255 nsh_action push encap-vxlan-gpe-intf ${sw_index0}
+
+sudo vppctl ip route add 10.10.12.00/24 via 192.168.50.76
+
+sudo vppctl set int state ${vpp_interface2} up
+sleep 10
+sudo vppctl set int ip table ${vpp_interface2} 0
+sudo vppctl set int ip address ${vpp_interface2} 192.168.60.76/24
+
+sudo vppctl ip route add 192.168.60.71/24 via 192.168.60.76
+sudo vppctl set ip arp ${vpp_interface2} 192.168.60.71 ${vpp_intf2_adj_mac}
+
+sudo vppctl trace add dpdk-input 100
diff --git a/tests/nsh_sfc/sfc_scripts/set_sfc_sff.sh b/tests/nsh_sfc/sfc_scripts/set_sfc_sff.sh
index 03e2f0ade7..183267623f 100755
--- a/tests/nsh_sfc/sfc_scripts/set_sfc_sff.sh
+++ b/tests/nsh_sfc/sfc_scripts/set_sfc_sff.sh
@@ -2,15 +2,20 @@
 
 set -x
 
+vpp_interface1=$1
+vpp_interface2=$2
+vpp_intf1_adj_mac=$3
+vpp_intf2_adj_mac=$4
+
 sudo service vpp restart
 sleep 5
 
-sudo vppctl set int state $1 up
+sudo vppctl set int state ${vpp_interface1} up
 sleep 10
-sudo vppctl set int ip table $1 7
-sudo vppctl set int ip address $1 192.168.50.76/24
+sudo vppctl set int ip table ${vpp_interface1} 7
+sudo vppctl set int ip address ${vpp_interface1} 192.168.50.76/24
 
-sudo vppctl create vxlan-gpe tunnel local 192.168.50.76 remote 192.168.50.71 vni 9 next-nsh encap-vrf-id 7 decap-vrf-id 7
+sudo vppctl create vxlan-gpe tunnel local 192.168.60.76 remote 192.168.60.71 vni 9 next-nsh encap-vrf-id 7 decap-vrf-id 7
 sudo vppctl set int l2 bridge vxlan_gpe_tunnel0 1 1
 
 sudo vppctl create vxlan-gpe tunnel local 192.168.50.76 remote 192.168.50.72 vni 10 next-nsh encap-vrf-id 7 decap-vrf-id 7
@@ -24,9 +29,14 @@ vxlan_gpe_index0=`sudo vppctl sh int | grep "vxlan_gpe_tunnel0" | awk '{print $2
 vxlan_gpe_index1=`sudo vppctl sh int | grep "vxlan_gpe_tunnel1" | awk '{print $2}'`
 sudo vppctl create nsh map nsp 185 nsi 255 mapped-nsp 185 mapped-nsi 254 nsh_action swap encap-vxlan-gpe-intf ${vxlan_gpe_index0}
 
-sudo vppctl ip route add 192.168.50.71/32 via 192.168.50.76 $1
-sudo vppctl ip route add 192.168.50.72/32 via 192.168.50.76 $1
-sudo vppctl set ip arp fib-id 7 $1 192.168.50.71 $2
-sudo vppctl set ip arp fib-id 7 $1 192.168.50.72 $2
+sudo vppctl ip route add 192.168.50.72/32 via 192.168.50.76 ${vpp_interface1}
+
+sudo vppctl set int state ${vpp_interface2} up
+sleep 10
+sudo vppctl set int ip table ${vpp_interface2} 7
+sudo vppctl set int ip address ${vpp_interface2} 192.168.60.76/24
+
+sudo vppctl ip route add 192.168.60.71/32 via 192.168.60.76 ${vpp_interface2}
+sudo vppctl set ip arp fib-id 7 ${vpp_interface2} 192.168.60.71 ${vpp_intf2_adj_mac}
 
 sudo vppctl trace add dpdk-input 100
diff --git a/tests/nsh_sfc/sfc_scripts/start_tcpdump.sh b/tests/nsh_sfc/sfc_scripts/start_tcpdump.sh
deleted file mode 100755
index 46f8217e26..0000000000
--- a/tests/nsh_sfc/sfc_scripts/start_tcpdump.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-ROOTDIR=/tmp/openvpp-testing
-PWDDIR=$(pwd)
-
-cd ${ROOTDIR}/nsh_sfc_tests/sfc_scripts/
-sudo rm -f temp_packet.pcap
-
-sudo /usr/sbin/tcpdump -i $1 -c 1 -w temp_packet.pcap dst host $2 &
-
-if [ ! $? -eq 0 ]; then
-    echo "Start the tcpdump failed!!!"
-    exit 1
-fi
-
-cd ${PWDDIR}