aboutsummaryrefslogtreecommitdiffstats
path: root/tests/nsh_sfc
diff options
context:
space:
mode:
Diffstat (limited to 'tests/nsh_sfc')
-rw-r--r--tests/nsh_sfc/func/classifier/eth2p-ethip4-sfc-classifier-func.robot91
-rw-r--r--tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot12
-rw-r--r--tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot12
-rw-r--r--tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot12
-rwxr-xr-xtests/nsh_sfc/sfc_scripts/set_nsh_proxy_inbound.sh23
-rwxr-xr-xtests/nsh_sfc/sfc_scripts/set_nsh_proxy_outbound.sh23
-rwxr-xr-xtests/nsh_sfc/sfc_scripts/set_sfc_classifier.sh40
-rwxr-xr-xtests/nsh_sfc/sfc_scripts/set_sfc_sff.sh26
-rwxr-xr-xtests/nsh_sfc/sfc_scripts/start_tcpdump.sh16
9 files changed, 201 insertions, 54 deletions
diff --git a/tests/nsh_sfc/func/classifier/eth2p-ethip4-sfc-classifier-func.robot b/tests/nsh_sfc/func/classifier/eth2p-ethip4-sfc-classifier-func.robot
new file mode 100644
index 0000000000..5bf593488c
--- /dev/null
+++ b/tests/nsh_sfc/func/classifier/eth2p-ethip4-sfc-classifier-func.robot
@@ -0,0 +1,91 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.Trace
+| Resource | resources/libraries/robot/shared/default.robot
+| Resource | resources/libraries/robot/nsh_sfc/default.robot
+| Resource | resources/libraries/robot/shared/interfaces.robot
+| Resource | resources/libraries/robot/ip/ip4.robot
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | FUNCTEST
+| Suite Setup | Run Keywords
+| ... | Configure all DUTs before test | AND
+| ... | Configure all TGs for traffic script | AND
+| ... | Update All Interface Data On All Nodes | ${nodes} | AND
+| ... | Setup DUT nodes for 'Classifier' functional testing
+| Test Setup | Run Keywords | Save VPP PIDs | AND
+| ... | Reset VAT History On All DUTs | ${nodes} | AND
+| ... | Clear interface counters on all vpp nodes in topology | ${nodes}
+| Test Teardown | Run Keywords
+| ... | Show packet trace on all DUTs | ${nodes} | AND
+| ... | Show VAT History On All DUTs | ${nodes} | AND
+| ... | Verify VPP PID in Teardown
+| Documentation | *NSH SFC Classifier test cases*
+| ...
+| ... | Test the SFC Classifier functional. DUT run the VPP with NSH SFC Plugin
+| ... | TG send a TCP packet to the DUT, if the packet match the SFC Classifier
+| ... | rules, the SFC Classifier will encapsulate this packet to a VxLAN-GPE
+| ... | and NSH packet, then the DUT will loopback the packet to the TG.
+| ... | The TG will capture this encapsulation packet and check the packet
+| ... | field is correct.
+
+*** Test Cases ***
+| TC01: NSH SFC Classifier functional test with 72B frame size
+| | [Documentation]
+| | ... | Make TG send 72 Bytes TCP packet to DUT ingress interface. Make TG\
+| | ... | verify SFC Classifier encapsulation functional is correct.
+| | ${frame_size}= | Set Variable | ${72}
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Classifier" test
+
+| TC02: NSH SFC Classifier functional test with 128B frame size
+| | [Documentation]
+| | ... | Make TG send 128 Bytes TCP packet to DUT ingress interface. Make TG\
+| | ... | verify SFC Classifier encapsulation functional is correct.
+| | ${frame_size}= | Set Variable | ${128}
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Classifier" test
+
+| TC03: NSH SFC Classifier functional test with 256B frame size
+| | [Documentation]
+| | ... | Make TG send 256 Bytes TCP packet to DUT ingress interface. Make TG\
+| | ... | verify SFC Classifier encapsulation functional is correct.
+| | ${frame_size}= | Set Variable | ${256}
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Classifier" test
+
+| TC04: NSH SFC Classifier functional test with 512B frame size
+| | [Documentation]
+| | ... | Make TG send 512 Bytes TCP packet to DUT ingress interface. Make TG\
+| | ... | verify SFC Classifier encapsulation functional is correct.
+| | ${frame_size}= | Set Variable | ${512}
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Classifier" test
+
+| TC05: NSH SFC Classifier functional test with 1024B frame size
+| | [Documentation]
+| | ... | Make TG send 1024 Bytes TCP packet to DUT ingress interface. Make TG\
+| | ... | verify SFC Classifier encapsulation functional is correct.
+| | ${frame_size}= | Set Variable | ${1024}
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Classifier" test
+
+| TC06: NSH SFC Classifier functional test with 1280B frame size
+| | [Documentation]
+| | ... | Make TG send 1280 Bytes TCP packet to DUT ingress interface. Make TG\
+| | ... | verify SFC Classifier encapsulation functional is correct.
+| | ${frame_size}= | Set Variable | ${1280}
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Classifier" test
+
+| TC07: NSH SFC Classifier functional test with 1518B frame size
+| | [Documentation]
+| | ... | Make TG send 1518 Bytes TCP packet to DUT ingress interface. Make TG\
+| | ... | verify SFC Classifier encapsulation functional is correct.
+| | ${frame_size}= | Set Variable | ${1518}
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Classifier" test
diff --git a/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot b/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot
index a85b539a83..fd34690bba 100644
--- a/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot
+++ b/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot
@@ -47,39 +47,39 @@
| | ... | Make TG send 152 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${152}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC02: NSH SFC Proxy Inbound functional test with 256B frame size
| | [Documentation]
| | ... | Make TG send 256 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${256}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC03: NSH SFC Proxy Inbound functional test with 512B frame size
| | [Documentation]
| | ... | Make TG send 512 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${512}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC04: NSH SFC Proxy Inbound functional test with 1024B frame size
| | [Documentation]
| | ... | Make TG send 1024 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${1024}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC05: NSH SFC Proxy Inbound functional test with 1280B frame size
| | [Documentation]
| | ... | Make TG send 1280 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${1280}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
| TC06: NSH SFC Proxy Inbound functional test with 1518B frame size
| | [Documentation]
| | ... | Make TG send 1518 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Inbound functional is correct.
| | ${frame_size}= | Set Variable | ${1518}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Inbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Inbound" test
diff --git a/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot b/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot
index 005272b1f9..b5f167a0e0 100644
--- a/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot
+++ b/tests/nsh_sfc/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot
@@ -48,39 +48,39 @@
| | ... | Make TG send 128 Bytes VxLAN packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Outbound functional is correct.
| | ${frame_size}= | Set Variable | ${128}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Outbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Outbound" test
| TC02: NSH SFC Proxy Outbound functional test with 256B frame size
| | [Documentation]
| | ... | Make TG send 256 Bytes VxLAN packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Outbound functional is correct.
| | ${frame_size}= | Set Variable | ${256}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Outbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Outbound" test
| TC03: NSH SFC Proxy Outbound functional test with 512B frame size
| | [Documentation]
| | ... | Make TG send 512 Bytes VxLAN packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Outbound functional is correct.
| | ${frame_size}= | Set Variable | ${512}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Outbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Outbound" test
| TC04: NSH SFC Proxy Outbound functional test with 1024B frame size
| | [Documentation]
| | ... | Make TG send 1024 Bytes VxLAN packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Outbound functional is correct.
| | ${frame_size}= | Set Variable | ${1024}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Outbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Outbound" test
| TC05: NSH SFC Proxy Outbound functional test with 1280B frame size
| | [Documentation]
| | ... | Make TG send 1280 Bytes VxLAN packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Outbound functional is correct.
| | ${frame_size}= | Set Variable | ${1280}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Outbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Outbound" test
| TC06: NSH SFC Proxy Outbound functional test with 1518B frame size
| | [Documentation]
| | ... | Make TG send 1518 Bytes VxLAN packet to DUT ingress interface.\
| | ... | Make TG verify SFC Proxy Outbound functional is correct.
| | ${frame_size}= | Set Variable | ${1518}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "Proxy Outbound" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "Proxy Outbound" test
diff --git a/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot b/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot
index 1356c8c2da..77a1d0ec8c 100644
--- a/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot
+++ b/tests/nsh_sfc/func/sff/eth2p-ethip4-sfc-sff-func.robot
@@ -47,39 +47,39 @@
| | ... | Make TG send 152 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC SFF functional is correct.
| | ${frame_size}= | Set Variable | ${152}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
| TC02: NSH SFC SFF functional test with 256B frame size
| | [Documentation]
| | ... | Make TG send 256 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC SFF functional is correct.
| | ${frame_size}= | Set Variable | ${256}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
| TC03: NSH SFC SFF functional test with 512B frame size
| | [Documentation]
| | ... | Make TG send 512 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC SFF functional is correct.
| | ${frame_size}= | Set Variable | ${512}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
| TC04: NSH SFC SFF functional test with 1024B frame size
| | [Documentation]
| | ... | Make TG send 1024 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC SFF functional is correct.
| | ${frame_size}= | Set Variable | ${1024}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
| TC05: NSH SFC SFF functional test with 1280B frame size
| | [Documentation]
| | ... | Make TG send 1280 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC SFF functional is correct.
| | ${frame_size}= | Set Variable | ${1280}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
| TC06: NSH SFC SFF functional test with 1518B frame size
| | [Documentation]
| | ... | Make TG send 1518 Bytes VxLAN-GPE+NSH packet to DUT ingress interface.\
| | ... | Make TG verify SFC SFF functional is correct.
| | ${frame_size}= | Set Variable | ${1518}
-| | Node "${src_node}" interface "${src_port}" send "${frame_size}" Bytes packet to node "${dst_node}" interface "${dst_port}" for "SFF" test
+| | Node "${tg_node}" interface "${tg_to_dut_if1}" send "${frame_size}" Bytes packet to node "${dut_node}" interface "${dut_to_tg_if1}" for "SFF" test
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}