Refactor DPDK testcases to new structure

+ RXQ refactor

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

1 files changed, 21 insertions, 119 deletions

diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
index 65e901bbb7..da61f73ae8 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,6 +26,8 @@
 | ... | L2 | Intel-XL710
 | Suite Teardown | Tear down DPDK 3-node performance topology
 | ...
+| Test template | Local template
+| ...
 | Documentation | *Raw results L2 routing test cases*
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
@@ -37,7 +39,7 @@
 | ... | at line rate and reports total received/sent packets over trial period.\
 | ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | (flow-group per direction, 254 flows per flow-group) with all packets\
 | ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
 | ... | payload. MAC addresses are matching MAC addresses of the TG node\
 | ... | interfaces.
@@ -51,172 +53,72 @@
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
-| Check RR for eth-l2xcbase-testpmd
+| Local template
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} phy core(s),\
-| | ... | ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | # Test Variables required for test teardown
 | | Set Test Variable | ${framesize}
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${get_framesize}
 | | ${max_rate}= | Set Variable If
 | | ... | ${max_rate} > ${s_18.75Mpps} | ${s_18.75Mpps} | ${max_rate}
 | | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | no | yes
+| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
 | | ...
-| | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=1 | rxq=1
+| | framesize=${64} | phy_cores=${1}
 
 | tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=1 | rxq=1
+| | framesize=${1518} | phy_cores=${1}
 
 | tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=1 | rxq=1
+| | framesize=${9000} | phy_cores=${1}
 
 | tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=1 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
 | tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=2 | rxq=1
+| | framesize=${64} | phy_cores=${2}
 
 | tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=2 | rxq=1
+| | framesize=${1518} | phy_cores=${2}
 
 | tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=2 | rxq=1
+| | framesize=${9000} | phy_cores=${2}
 
 | tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=2 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
 | tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=4 | rxq=2
+| | framesize=${64} | phy_cores=${4}
 
 | tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=4 | rxq=2
+| | framesize=${1518} | phy_cores=${4}
 
 | tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=4 | rxq=2
+| | framesize=${9000} | phy_cores=${4}
 
 | tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=4 | rxq=2
+| | framesize=IMIX_v4_1 | phy_cores=${4}