Change the bootstrap script file and test the CI-management.

	Debug the NSH SFC functional test.
	Change the test cases and not use the tcpdump.
	Delete the unused code.
	Change the directory structure.

Change-Id: I52486b9ba4b02e305f702ffc8cdb84e941cb18ff
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>

4 files changed, 109 insertions, 18 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