diff options
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 17 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 22 | ||||
| -rw-r--r-- | tests/vpp/device/__init__.robot | 51 | ||||
| -rw-r--r-- | tests/vpp/device/eth2p-ethicmp-l2xcbase-device.robot | 75 |
4 files changed, 159 insertions, 6 deletions
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index c0f37f38de..cff2c9f695 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -520,7 +520,7 @@ class InterfaceUtil(object): InterfaceUtil.update_nic_interface_names(node) @staticmethod - def update_tg_interface_data_on_node(node): + def update_tg_interface_data_on_node(node, skip_tg_udev=False): """Update interface name for TG/linux node in DICT__nodes. .. note:: @@ -531,10 +531,10 @@ class InterfaceUtil(object): "52:54:00:e1:8a:0f": "eth2" "00:00:00:00:00:00": "lo" - .. note:: TODO: parse lshw -json instead - :param node: Node selected from DICT__nodes. + :param skip_tg_udev: Skip udev rename on TG node. :type node: dict + :type skip_tg_udev: bool :raises RuntimeError: If getting of interface name and MAC fails. """ # First setup interface driver specified in yaml file @@ -559,7 +559,8 @@ class InterfaceUtil(object): interface['name'] = name # Set udev rules for interfaces - InterfaceUtil.tg_set_interfaces_udev_rules(node) + if not skip_tg_udev: + InterfaceUtil.tg_set_interfaces_udev_rules(node) @staticmethod def iface_update_numa_node(node): @@ -617,6 +618,7 @@ class InterfaceUtil(object): @staticmethod def update_all_interface_data_on_all_nodes(nodes, skip_tg=False, + skip_tg_udev=False, numa_node=False): """Update interface names on all nodes in DICT__nodes. @@ -624,17 +626,20 @@ class InterfaceUtil(object): of all nodes mentioned in the topology dictionary. :param nodes: Nodes in the topology. - :param skip_tg: Skip TG node + :param skip_tg: Skip TG node. + :param skip_tg_udev: Skip udev rename on TG node. :param numa_node: Retrieve numa_node location. :type nodes: dict :type skip_tg: bool + :type skip_tg_udev: bool :type numa_node: bool """ for node_data in nodes.values(): if node_data['type'] == NodeType.DUT: InterfaceUtil.update_vpp_interface_data_on_node(node_data) elif node_data['type'] == NodeType.TG and not skip_tg: - InterfaceUtil.update_tg_interface_data_on_node(node_data) + InterfaceUtil.update_tg_interface_data_on_node( + node_data, skip_tg_udev) if numa_node: if node_data['type'] == NodeType.DUT: diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index f734516005..614c873709 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -472,6 +472,28 @@ | | Vpp Show Errors On All DUTs | ${nodes} | | Verify VPP PID in Teardown +| Set up VPP device test +# TODO: Generalize this KW if it will not diverge from Functional derivate too +# much +| | [Documentation] | Common test setup for vpp-device tests. +| | ... +| | Configure all DUTs before test +| | Save VPP PIDs +| | Configure all TGs for traffic script +| | Update All Interface Data On All Nodes | ${nodes} | skip_tg_udev=${True} +| | Reset VAT History On All DUTs | ${nodes} + +| Tear down VPP device test +# TODO: Generalize this KW if it will not diverge from Functional derivate too +# much +| | [Documentation] | Common test teardown for vpp-device tests. +| | ... +| | Remove All Added Ports On All DUTs From Topology | ${nodes} +| | Show Packet Trace on All DUTs | ${nodes} +| | Show VAT History On All DUTs | ${nodes} +| | Vpp Show Errors On All DUTs | ${nodes} +| | Verify VPP PID in Teardown + | Tear down LISP functional test | | [Documentation] | Common test teardown for functional tests with LISP. | | ... diff --git a/tests/vpp/device/__init__.robot b/tests/vpp/device/__init__.robot new file mode 100644 index 0000000000..93b43f53ae --- /dev/null +++ b/tests/vpp/device/__init__.robot @@ -0,0 +1,51 @@ +# Copyright (c) 2018 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/shared/default.robot +| Resource | resources/libraries/robot/shared/interfaces.robot +| Library | resources.libraries.python.SetupFramework +| Library | resources.libraries.python.SetupFramework.CleanupFramework +| Library | resources.libraries.python.CpuUtils +| Suite Setup | Run Keywords | Setup Global Variables +| ... | AND | Setup Framework | ${nodes} +| ... | AND | Install Vpp On All Duts | ${nodes} | ${packages_dir} +| ... | ${vpp_rpm_pkgs} | ${vpp_deb_pkgs} +| ... | AND | Verify Vpp On All Duts | ${nodes} +| ... | AND | Get CPU Layout from all nodes | ${nodes} +| ... | AND | Update All Interface Data On All Nodes | ${nodes} +| ... | skip_tg_udev=${True} +| Suite Teardown | Cleanup Framework | ${nodes} + +*** Keywords *** +| Setup Global Variables +| | [Documentation] +| | ... | Setup suite Variables. Variables are used across device testing. +| | ... +| | ... | _NOTE:_ This KW sets following suite variables: +| | ... | - pkt_trace - Switch to enable packet trace for test +| | ... | - dut_stats - Switch to enable DUT statistics +| | ... | - vm_image - Guest VM disk image. +| | ... | - packages_dir - Path to directory where VPP packages are stored. +| | ... | - vpp_rpm_pkgs - Package list for CentOS based system. +| | ... | - vpp_deb_pkgs - Package list for Debian based system. +| | ... +| | Set Global Variable | ${pkt_trace} | ${False} +| | Set Global Variable | ${dut_stats} | ${True} +| | Set Global Variable | ${vm_image} | /var/lib/vm/csit-nested-1.7.img +| | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/ +| | @{vpp_rpm_pkgs}= | Create List | vpp | vpp-devel | vpp-lib | vpp-plugins +| | Set Global Variable | ${vpp_rpm_pkgs} +| | @{vpp_deb_pkgs}= | Create List | vpp | vpp-dbg | vpp-dev | vpp-lib +| | ... | vpp-plugins +| | Set Global Variable | ${vpp_deb_pkgs}
\ No newline at end of file diff --git a/tests/vpp/device/eth2p-ethicmp-l2xcbase-device.robot b/tests/vpp/device/eth2p-ethicmp-l2xcbase-device.robot new file mode 100644 index 0000000000..b18ce7bb77 --- /dev/null +++ b/tests/vpp/device/eth2p-ethicmp-l2xcbase-device.robot @@ -0,0 +1,75 @@ +# Copyright (c) 2018 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/shared/default.robot +| Resource | resources/libraries/robot/l2/l2_xconnect.robot +| Resource | resources/libraries/robot/l2/l2_traffic.robot +| Resource | resources/libraries/robot/shared/testing_path.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV +| ... | L2XCFWD | ICMP +| ... +| Test Setup | Set up VPP device test +| ... +| Test Teardown | Tear down VPP device test +| ... +| Documentation | *L2 cross-connect test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\ +| ... | with single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of\ +| ... | IPv4; Eth-IPv6-ICMPv6 for L2 switching of IPv6 use. Both apply to all\ +| ... | links. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect\ +| ... | switching. +| ... | *[Ver] TG verification:* Test ICMPv4 (or ICMPv6) Echo Request packets\ +| ... | are sent in both directions by TG on links to DUT1; on receive TG\ +| ... | verifies packets for correctness and their IPv4 (IPv6) src-addr,\ +| ... | dst-addr and MAC addresses. +| ... | *[Ref] Applicable standard specifications: rfc792* + +*** Test Cases *** +| tc01-eth2p-ethicmpv4-l2xcbase-device +| | [Documentation] +| | ... | [Top] TG-DUT1-TG. [Enc] Eth-IPv4-ICMPv4. +| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC), with both interfaces\ +| | ... | to TG. +| | ... | [Ver] Make TG send ICMPv4 Echo Req in both directions between two of\ +| | ... | its interfaces to be switched by DUT1; verify all packets are +| | ... | received. +| | ... +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set Interfaces In 2-node Circular Topology Up +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} +| | When All Vpp Interfaces Ready Wait | ${nodes} +| | Then Send ICMPv4 bidirectionally and verify received packets +| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} + +| tc02-eth2p-ethicmpv6-l2xcbase-device +| | [Documentation] +| | ... | [Top] TG-DUT1-TG. [Enc] Eth-IPv4-ICMPv6. +| | ... | [Cfg] On DUT1 configure L2 cross-connect (L2XC), with both interfaces\ +| | ... | to TG. +| | ... | [Ver] Make TG send ICMPv4 Echo Req in both directions between two of\ +| | ... | its interfaces to be switched by DUT1; verify all packets are +| | ... | received. +| | ... +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set Interfaces In 2-node Circular Topology Up +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} +| | When All Vpp Interfaces Ready Wait | ${nodes} +| | Then Send ICMPv6 bidirectionally and verify received packets +| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} |