From a4cad14b7e0b7e94f9e80b1a45cd86b3bc09d0a0 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Wed, 30 Oct 2019 04:52:03 +0100 Subject: FIX: do not use ping in vpp-device tests Change-Id: Ic11f863e7ffad70d45e6e8dc39c70efc62cecc96 Signed-off-by: Jan Gelety --- .../eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot | 6 +- .../eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot | 4 +- .../l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot | 76 ---------------------- .../l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot | 76 ++++++++++++++++++++++ 4 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot create mode 100644 tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot (limited to 'tests/vpp/device/l2bd') diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot index 6fb6da40a7..9f9da32659 100644 --- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot @@ -55,9 +55,9 @@ *** Keywords *** | Local template | | [Documentation] -| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\ -| | ... | of its interfaces to be switched by DUT to and from docker; verify\ -| | ... | all packets are received. +| | ... | [Ver] Make TG send IPv4 packet in one direction between two\ +| | ... | of its interfaces to be switched by DUT to and from docker.\ +| | ... | Make TG verify IPv4 packet is correct. | | ... | | ... | *Arguments:* | | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1). diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot index 55e56ba932..5497412e39 100644 --- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot @@ -47,7 +47,7 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\ +| | ... | [Ver] Make TG send IPv4 packets in both directions between two\ | | ... | of its interfaces to be switched by DUT to and from docker; verify\ | | ... | all packets are received. | | ... @@ -68,7 +68,7 @@ | | And Initialize layer interface | | And Initialize layer dot1q | | And Initialize L2 bridge domain -| | Then Send ICMPv4 bidirectionally and verify received packets +| | Then Send IPv4 bidirectionally and verify received packets | | ... | ${tg} | ${tg_if1} | ${tg_if2} *** Test Cases *** diff --git a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot deleted file mode 100644 index 69430d2f85..0000000000 --- a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (c) 2019 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 -| ... -| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY -| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | ICMP | DRV_VFIO_PCI -| ... -| Suite Setup | Setup suite single link | scapy -| Test Setup | Setup test -| Test Teardown | Tear down test | packet_trace -| ... -| Test Template | Local Template -| ... -| Documentation | *L2 bridge-domain 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. Both apply to all links. -| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain \ -| ... | switching. -| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets \ -| ... | are sent in both directions by TG on links to DUT1; on receive TG \ -| ... | verifies packets for correctness and their IPv4 src-addr, \ -| ... | dst-addr and MAC addresses. -| ... | *[Ref] Applicable standard specifications:* RFC792 - -*** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so -| ${crypto_type}= | ${None} -| ${nic_name}= | virtual -| ${nic_driver}= | vfio-pci -| ${overhead}= | ${0} - -*** Keywords *** -| Local Template -| | [Documentation] -| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\ -| | ... | of its interfaces to be switched by DUT to and from docker; verify\ -| | ... | all packets are received. -| | ... -| | ... | *Arguments:* -| | ... | - frame_size - Framesize in Bytes in integer. Type: integer -| | ... | - phy_cores - Number of physical cores. Type: integer -| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer -| | ... -| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} -| | ... -| | Set Test Variable | \${frame_size} -| | ... -| | Given Set Max Rate And Jumbo -| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} -| | And Pre-initialize layer driver | ${nic_driver} -| | And Apply startup configuration on all VPP DUTs | with_trace=${True} -| | When Initialize layer driver | ${nic_driver} -| | And Initialize layer interface -| | And Initialize L2 bridge domain -| | Then Send ICMPv4 bidirectionally and verify received packets -| | ... | ${tg} | ${tg_if1} | ${tg_if2} - -*** Test Cases *** -| tc01-64B-ethicmpv4-l2bdbasemaclrn-dev -| | [Tags] | 64B -| | frame_size=${64} | phy_cores=${0} diff --git a/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot new file mode 100644 index 0000000000..afb33db29e --- /dev/null +++ b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot @@ -0,0 +1,76 @@ +# Copyright (c) 2019 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 +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY +| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | DRV_VFIO_PCI +| ... +| Suite Setup | Setup suite single link | scapy +| Test Setup | Setup test +| Test Teardown | Tear down test | packet_trace +| ... +| Test Template | Local Template +| ... +| Documentation | *L2 bridge-domain test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \ +| ... | with single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\ +| ... | Both apply to all links. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain \ +| ... | switching. +| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 \ +| ... | are sent in both directions by TG on links to DUT1; on receive TG \ +| ... | verifies packets for correctness and their IPv4 src-addr, \ +| ... | dst-addr and MAC addresses. +| ... | *[Ref] Applicable standard specifications:* RFC792 + +*** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${crypto_type}= | ${None} +| ${nic_name}= | virtual +| ${nic_driver}= | vfio-pci +| ${overhead}= | ${0} + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Ver] Make TG send IPv4 packets in both directions between two\ +| | ... | of its interfaces to be switched by DUT to and from docker; verify\ +| | ... | all packets are received. +| | ... +| | ... | *Arguments:* +| | ... | - frame_size - Framesize in Bytes in integer. Type: integer +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | \${frame_size} +| | ... +| | Given Set Max Rate And Jumbo +| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} +| | And Pre-initialize layer driver | ${nic_driver} +| | And Apply startup configuration on all VPP DUTs | with_trace=${True} +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface +| | And Initialize L2 bridge domain +| | Then Send IPv4 bidirectionally and verify received packets +| | ... | ${tg} | ${tg_if1} | ${tg_if2} + +*** Test Cases *** +| tc01-64B-ethipv4-l2bdbasemaclrn-dev +| | [Tags] | 64B +| | frame_size=${64} | phy_cores=${0} -- cgit 1.2.3-korg