CSIT-1539 Aligning FUNC/PERF keywords - Phase III

Change-Id: Ibd3e99390bf004173d3d126946b95ffe9ba8f196
Signed-off-by: Peter Mikus <pmikus@cisco.com>

1 files changed, 28 insertions, 44 deletions

diff --git a/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot
index 12896b335e..7596f96ff2 100644
--- a/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot
@@ -13,14 +13,11 @@
 
 *** 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
-| ... | FUNCTEST | L2XCFWD | BASE | ETH | MEMIF | DOCKER
+| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
+| ... | NIC_Virtual | ETH | L2XCFWD | BASE | MEMIF | DOCKER
 | ...
-| Suite Setup | Setup suite single link
+| Suite Setup | Setup suite single link | scapy
 | Test Setup | Setup test
 | Test Teardown | Tear down test | packet_trace | container
 | ...
@@ -42,57 +39,44 @@
 *** Variables ***
 | @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
 | ${nic_name}= | virtual
-# Memif
-| ${sock_base}= | memif-DUT1_CNF
+| ${overhead}= | ${0}
 # Container
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain_functional
 
 *** Test Cases ***
-| tc01-eth2p-ethip4-l2xcbase-eth-2memif-1dcr-device
+| tc01-eth2p-ethip4-l2xcbase-eth-2memif-1dcr-dev
 | | [Documentation]
-| | ... | [Top] TG=DUT=DCR. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT configure \
-| | ... | two L2 cross-connects (L2XC), each with one untagged interface \
-| | ... | to TG and untagged i/f to docker over memif. [Ver] Make \
-| | ... | TG send ICMPv4 Echo Reqs in both directions between two of its \
-| | ... | i/fs to be switched by DUT to and from docker; verify all packets \
-| | ... | are received. [Ref]
+| | ... | [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.
+| | ...
+| | 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 Start containers for device test
-| | And Configure interfaces in path up
-| | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base}
-| | ... | ${sock_base} | dcr_uuid=${dcr_uuid}
-| | ... | memif_if1=memif_if1 | memif_if2=memif_if2 | rxq=${0} | txq=${0}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${memif_if1}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${memif_if2}
-| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | And Initialize L2 xconnect with memif pairs
+| | Then Send ICMPv4 bidirectionally and verify received packets
+| | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
-| tc02-eth2p-ethip6-l2xcbase-eth-2memif-1dcr-device
+| tc02-eth2p-ethip6-l2xcbase-eth-2memif-1dcr-dev
 | | [Documentation]
-| | ... | [Top] TG=DUT=DCR. [Enc] Eth-IPv6-ICMPv6. [Cfg] On DUT configure\
-| | ... | two L2 cross-connects (L2XC), each with one untagged i/f to TG\
-| | ... | and untagged i/f to docker over memif. [Ver] Make TG send\
-| | ... | ICMPv6 Echo Reqs in both directions between two of its i/fs to\
-| | ... | be switched by DUT to and from docker; verify all packets are\
-| | ... | received. [Ref]
+| | ... | [Ver] Make TG send ICMPv6 Echo Reqs in both directions between two\
+| | ... | of its interfaces to be switched by DUT to and from docker; verify\
+| | ... | all packets are received.
+| | ...
+| | Set Test Variable | ${frame_size} | ${62}
+| | 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 Start containers for device test
-| | And Configure interfaces in path up
-| | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base}
-| | ... | ${sock_base} | dcr_uuid=${dcr_uuid}
-| | ... | memif_if1=memif_if1 | memif_if2=memif_if2 | rxq=${0} | txq=${0}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${memif_if1}
-| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${memif_if2}
-| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | When Start containers for test | auto_scale=${False} | pinning=${False}
+| | And Initialize L2 xconnect with memif pairs
+| | Then Send ICMPv6 bidirectionally and verify received packets
+| | ... | ${tg} | ${tg_if1} | ${tg_if2}