From 533fcfe3d177447aee7a3dca5f0d7a5f06d70377 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 25 Jun 2019 12:44:32 +0000 Subject: CSIT-1539 Aligning FUNC/PERF keywords - Phase III Change-Id: Ibd3e99390bf004173d3d126946b95ffe9ba8f196 Signed-off-by: Peter Mikus --- .../eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot | 68 +++++-------- .../eth2p-ethip4-ip4base-eth-1tap-dev.robot | 106 ++++++++++----------- 2 files changed, 72 insertions(+), 102 deletions(-) (limited to 'tests/vpp/device/interfaces') diff --git a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot index 6cf2b324d4..3e7fd03e89 100644 --- a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot @@ -13,25 +13,16 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/ip/ip4.robot -| Resource | resources/libraries/robot/ip/ip6.robot -| Resource | resources/libraries/robot/shared/interfaces.robot -| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/shared/testing_path.robot -| Resource | resources/libraries/robot/shared/traffic.robot -| Library | resources.libraries.python.Trace -| Library | resources.libraries.python.Tap -| Library | resources.libraries.python.Namespaces -| Library | resources.libraries.python.IPUtil | ... -| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV -| ... | FUNCTEST | L2BD | BASE | ETH | TAP +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY +| ... | NIC_Virtual | ETH | L2BD | BASE | TAP | ... -| Suite Setup | Setup suite single link +| Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | linux_bridge | ... | Documentation | *Tap Interface Traffic Tests* +| ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links | ... | between nodes. | ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of @@ -48,44 +39,33 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual -| ${bid_from_TG}= | 19 -| ${bid_to_TG}= | 20 +| ${overhead}= | ${0} | ${bid_TAP}= | tapBr -| ${tap_int1}= | tap0 -| ${tap_int2}= | tap1 *** Test Cases *** -| tc01-eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-device_tap-simple-bd +| tc01-eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev_tap-simple-bd | | [Documentation] -| | ... | [Cfg] On DUT1 configure two L2BD with two if's for each L2BD with MAC\ -| | ... | learning and one L2BD joining two linux-TAP interfaces created by VPP\ -| | ... | located in namespace. | | ... | [Ver] Packet sent from TG is passed through all L2BD and received\ | | ... | back on TG. Then src_ip, dst_ip and MAC are checked. | | ... +| | Set Test Variable | ${frame_size} | ${42} +| | Set Test Variable | ${rxq_count_int} | ${1} +| | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} -| | When Configure path in 2-node circular topology | ${nodes['TG']} -| | ... | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set interfaces in 2-node circular topology up -| | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} -| | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} -| | And Set Interface State | ${dut_node} | ${int1} | up -| | And Set Interface State | ${dut_node} | ${int2} | up -| | And Create bridge domain | ${dut_node} -| | ... | ${bid_from_TG} | learn=${TRUE} -| | And Create bridge domain | ${dut_node} -| | ... | ${bid_to_TG} | learn=${TRUE} -| | And Linux Add Bridge | ${dut_node} -| | ... | ${bid_TAP} | ${tap_int1} | ${tap_int2} -| | And Add interface to bridge domain | ${dut_node} -| | ... | ${int1} | ${bid_to_TG} | 0 -| | And Add interface to bridge domain | ${dut_node} -| | ... | ${dut_to_tg_if1} | ${bid_to_TG} | 0 -| | And Add interface to bridge domain | ${dut_node} -| | ... | ${int2} | ${bid_from_TG} | 0 -| | And Add interface to bridge domain | ${dut_node} -| | ... | ${dut_to_tg_if2} | ${bid_from_TG} | 0 -| | Then Send ICMP packet and verify received packet | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} +| | When Set interfaces in path up +| | ${int1}= | And Add Tap Interface | ${dut1} | tap0 +| | ${int2}= | And Add Tap Interface | ${dut1} | tap1 +| | And Set Interface State | ${dut1} | ${int1} | up +| | And Set Interface State | ${dut1} | ${int2} | up +| | And Create bridge domain | ${dut1} | 19 | learn=${TRUE} +| | And Create bridge domain | ${dut1} | 20 | learn=${TRUE} +| | And Linux Add Bridge | ${dut1} | ${bid_TAP} | tap0 | tap1 +| | And Add interface to bridge domain | ${dut1} | ${int1} | 20 | 0 +| | And Add interface to bridge domain | ${dut1} | ${dut1_if1} | 20 | 0 +| | And Add interface to bridge domain | ${dut1} | ${int2} | 19 | 0 +| | And Add interface to bridge domain | ${dut1} | ${dut1_if2} | 19 | 0 +| | Then Send ICMP packet and verify received packet +| | ... | ${tg} | ${tg_if1} | ${tg_if2} diff --git a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot index 7568f03765..4d7f189da4 100644 --- a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot @@ -12,23 +12,12 @@ # limitations under the License. *** Settings *** -| Library | resources.libraries.python.IPUtil -| Library | resources.libraries.python.Namespaces -| Library | resources.libraries.python.Tap -| Library | resources.libraries.python.Trace -| ... | Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/ip/ip4.robot -| Resource | resources/libraries/robot/ip/ip6.robot -| Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/shared/interfaces.robot -| Resource | resources/libraries/robot/shared/testing_path.robot -| Resource | resources/libraries/robot/shared/traffic.robot | ... -| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV -| ... | FUNCTEST | IP4FWD | BASE | ETH | IP4BASE | TAP +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY +| ... | NIC_Virtual | ETH | IP4FWD | BASE | IP4BASE | TAP | ... -| Suite Setup | Setup suite single link +| Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | ... @@ -49,50 +38,50 @@ *** Variables *** | @{plugins_to_enable}= | dpdk_plugin.so | ${nic_name}= | virtual +| ${overhead}= | ${0} | ${tap1_VPP_ip}= | 16.0.10.1 | ${tap1_NM_ip}= | 16.0.10.2 | ${tap1_NM_mac}= | 02:00:00:00:00:02 -| ${tap_int1}= | tap0 -| ${namespace1}= | nmspace1 | ${dut_ip_address}= | 192.168.0.1 | ${tg_ip_address}= | 192.168.0.2 | ${tg_ip_address_GW}= | 192.168.0.0 | ${prefix}= | 24 *** Test Cases *** -| tc01-eth2p-ethicmpv4-ip4base-device_tap-no-namespace +| tc01-eth2p-ethicmpv4-ip4base-dev_tap-no-namespace | | [Documentation] | | ... | [Cfg] On DUT1 configure two interface addresses with IPv4 of which\ | | ... | one is TAP interface (dut_to_tg_if and TAP) and one is linux-TAP. | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is\ | | ... | received on TG. | | ... +| | Set Test Variable | ${frame_size} | ${42} +| | Set Test Variable | ${rxq_count_int} | ${1} +| | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} -| | When Configure path in 2-node circular topology | ${nodes['TG']} -| | ... | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set interfaces in 2-node circular topology up -| | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | +| | When Set interfaces in path up +| | ${int1}= | And Add Tap Interface | ${dut1} | tap0 | | And VPP Interface Set IP Address -| | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} +| | ... | ${dut1} | ${int1} | ${tap1_VPP_ip} | ${prefix} | | And VPP Interface Set IP Address -| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip_address} | ${prefix} -| | And Set Interface State | ${dut_node} | ${int1} | up -| | And Set Linux Interface MAC | ${dut_node} | ${tap_int1} | ${tap1_NM_mac} -| | And Set Linux Interface IP | ${dut_node} -| | ... | ${tap_int1} | ${tap1_NM_ip} | ${prefix} -| | And Add Linux Route | ${dut_node} -| | ... | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} -| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} -| | ... | ${tg_ip_address} | ${tg_to_dut_if1_mac} -| | And VPP Add IP Neighbor | ${dut_node} | ${int1} -| | ... | ${tap1_NM_ip} | ${tap1_NM_mac} -| | Then Send ICMP echo request and verify answer | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} +| | ... | ${dut1} | ${dut1_if1} | ${dut_ip_address} | ${prefix} +| | And Set Interface State | ${dut1} | ${int1} | up +| | And Set Linux Interface MAC | ${dut1} | tap0 | ${tap1_NM_mac} +| | And Set Linux Interface IP | ${dut1} | tap0 | ${tap1_NM_ip} | ${prefix} +| | And Add Linux Route +| | ... | ${dut1} | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} +| | And VPP Add IP Neighbor +| | ... | ${dut1} | ${dut1_if1} | ${tg_ip_address} | ${tg_if1_mac} +| | And VPP Add IP Neighbor +| | ... | ${dut1} | ${int1} | ${tap1_NM_ip} | ${tap1_NM_mac} +| | Then Send ICMP echo request and verify answer +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | ${tg_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} -| tc02-eth2p-ethicmpv4-ip4base-device_tap-namespace +| tc02-eth2p-ethicmpv4-ip4base-dev_tap-namespace | | [Documentation] | | ... | [Cfg] On DUT1 configure two interface addresses with IPv4 of which\ | | ... | one is TAP interface (dut_to_tg_if and TAP) and one is linux-TAP in\ @@ -100,31 +89,32 @@ | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is\ | | ... | received on TG. | | ... +| | Set Test Variable | ${frame_size} | ${42} +| | Set Test Variable | ${rxq_count_int} | ${1} +| | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} -| | When Configure path in 2-node circular topology | ${nodes['TG']} -| | ... | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set interfaces in 2-node circular topology up -| | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | +| | When Set interfaces in path up +| | ${int1}= | And Add Tap Interface | ${dut1} | tap0 | | And VPP Interface Set IP Address -| | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} +| | ... | ${dut1} | ${int1} | ${tap1_VPP_ip} | ${prefix} | | And VPP Interface Set IP Address -| | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip_address} | ${prefix} -| | And Set Interface State | ${dut_node} | ${int1} | up -| | When Create Namespace | ${dut_node} | ${namespace1} -| | And Attach Interface To Namespace | ${dut_node} -| | ... | ${namespace1} | ${tap_int1} -| | And Set Linux Interface MAC | ${dut_node} -| | ... | ${tap_int1} | ${tap1_NM_mac} | ${namespace1} -| | And Set Linux Interface IP | ${dut_node} -| | ... | ${tap_int1} | ${tap1_NM_ip} | ${prefix} | ${namespace1} -| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} -| | ... | ${tg_ip_address} | ${tg_to_dut_if1_mac} -| | And VPP Add IP Neighbor | ${dut_node} | ${int1} -| | ... | ${tap1_NM_ip} | ${tap1_NM_mac} -| | And Add Linux Route | ${dut_node} -| | ... | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | ${namespace1} -| | Then Send ICMP echo request and verify answer | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} +| | ... | ${dut1} | ${dut1_if1} | ${dut_ip_address} | ${prefix} +| | And Set Interface State | ${dut1} | ${int1} | up +| | And Create Namespace | ${dut1} | nmspace1 +| | And Attach Interface To Namespace | ${dut1} | nmspace1 | tap0 +| | And Set Linux Interface MAC +| | ... | ${dut1} | tap0 | ${tap1_NM_mac} | nmspace1 +| | And Set Linux Interface IP +| | ... | ${dut1} | tap0 | ${tap1_NM_ip} | ${prefix} | nmspace1 +| | And VPP Add IP Neighbor +| | ... | ${dut1} | ${dut1_if1} | ${tg_ip_address} | ${tg_if1_mac} +| | And VPP Add IP Neighbor +| | ... | ${dut1} | ${int1} | ${tap1_NM_ip} | ${tap1_NM_mac} +| | And Add Linux Route +| | ... | ${dut1} | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | nmspace1 +| | Then Send ICMP echo request and verify answer +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | ${tg_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} -- cgit 1.2.3-korg