From 6721e7f09aa95bff6622068332a3f56afad9c87b Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 20 Jun 2017 13:57:08 +0200 Subject: CSIT-687: Directory structure reorganization Change-Id: I772c9e214be2461adf58124998d272e7d795220f Signed-off-by: Tibor Frank Signed-off-by: Maciek Konstantynowicz --- nsh_sfc_tests/func/__init__.robot | 20 ----- .../eth2p-ethip4-nsh-proxy-inbound-func.robot | 85 --------------------- .../eth2p-ethip4-nsh-proxy-outbound-func.robot | 86 ---------------------- .../func/sff/eth2p-ethip4-sfc-sff-func.robot | 85 --------------------- 4 files changed, 276 deletions(-) delete mode 100644 nsh_sfc_tests/func/__init__.robot delete mode 100644 nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot delete mode 100644 nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot delete mode 100644 nsh_sfc_tests/func/sff/eth2p-ethip4-sfc-sff-func.robot (limited to 'nsh_sfc_tests/func') diff --git a/nsh_sfc_tests/func/__init__.robot b/nsh_sfc_tests/func/__init__.robot deleted file mode 100644 index efebac383e..0000000000 --- a/nsh_sfc_tests/func/__init__.robot +++ /dev/null @@ -1,20 +0,0 @@ -# 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 *** -| Resource | resources/libraries/robot/default.robot -| Resource | resources/libraries/robot/interfaces.robot -| Library | resources.libraries.python.SFC.SetupSFCTest -| Suite Setup | Run Keywords | Setup NSH SFC test | ${nodes} -| ... | AND | Setup All DUTs | ${nodes} -| ... | AND | Update All Interface Data On All Nodes | ${nodes} diff --git a/nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot b/nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot deleted file mode 100644 index 9aa3a8692d..0000000000 --- a/nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-inbound-func.robot +++ /dev/null @@ -1,85 +0,0 @@ -# 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/default.robot -| Resource | resources/libraries/robot/nsh_sfc/default.robot -| Resource | resources/libraries/robot/interfaces.robot -| Resource | resources/libraries/robot/ipv4.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 'Proxy Inbound' 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 Proxy Inbound test cases* -| ... -| ... | Test the SFC Proxy Inbound functional. DUT run the VPP with NSH -| ... | SFC Plugin, TG send a VxLAN-GPE+NSH packet to the DUT, -| ... | if the packet match the SFC Proxy inbound rules, the SFC Proxy will -| ... | pop the VxLAN-GPE and NSH protocol, then encapsulate with the -| ... | VxLAN protocol. DUT will loopback the packet to the TG. -| ... | The TG will capture this VxLAN packet and check the packet -| ... | field is correct. - -*** Test Cases *** -| TC01: NSH SFC Proxy Inbound functional test with 152B frame size -| | [Documentation] -| | ... | 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 - -| 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 - -| 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 - -| 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 - -| 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 - -| 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 diff --git a/nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot b/nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot deleted file mode 100644 index db9c08d1b4..0000000000 --- a/nsh_sfc_tests/func/proxy/eth2p-ethip4-nsh-proxy-outbound-func.robot +++ /dev/null @@ -1,86 +0,0 @@ -# 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/default.robot -| Resource | resources/libraries/robot/nsh_sfc/default.robot -| Resource | resources/libraries/robot/interfaces.robot -| Resource | resources/libraries/robot/ipv4.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 'Proxy Outbound' 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 Proxy Outbound test cases* -| ... -| ... | Test the SFC Proxy Outbound functional. DUT run the VPP with NSH -| ... | SFC Plugin, TG send a VxLAN packet to the DUT, -| ... | if the packet match the SFC Proxy outbound rules, the SFC Proxy will -| ... | push the NSH protocol, then encapsulate with the VxLAN-GPE protocol. -| ... | DUT will loopback the packet to the TG. -| ... | The TG will capture this VxLAN-GPE+NSH packet and check the packet -| ... | field is correct. - - -*** Test Cases *** -| TC01: NSH SFC Proxy Outbound functional test with 128B frame size -| | [Documentation] -| | ... | 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 - -| 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 - -| 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 - -| 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 - -| 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 - -| 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 diff --git a/nsh_sfc_tests/func/sff/eth2p-ethip4-sfc-sff-func.robot b/nsh_sfc_tests/func/sff/eth2p-ethip4-sfc-sff-func.robot deleted file mode 100644 index 28aa4cd4d5..0000000000 --- a/nsh_sfc_tests/func/sff/eth2p-ethip4-sfc-sff-func.robot +++ /dev/null @@ -1,85 +0,0 @@ -# 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/default.robot -| Resource | resources/libraries/robot/nsh_sfc/default.robot -| Resource | resources/libraries/robot/interfaces.robot -| Resource | resources/libraries/robot/ipv4.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 'SFF' 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 SFF test cases* -| ... -| ... | Test the SFC Service Function Forward functional. DUT run the VPP -| ... | with NSH SFC Plugin, TG send a VxLAN-GPE+NSH packet to the DUT, -| ... | if the packet match the SFC SFF rules, the SFC SFF will -| ... | swap the VxLAN-GPE and NSH protocol. -| ... | DUT will loopback the packet to the TG. -| ... | The TG will capture this VxLAN-GPE+NSH packet and check the packet -| ... | field is correct. - -*** Test Cases *** -| TC01: NSH SFC SFF functional test with 152B frame size -| | [Documentation] -| | ... | 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 - -| 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 - -| 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 - -| 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 - -| 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 - -| 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 -- cgit 1.2.3-korg