aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot74
-rw-r--r--tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot74
-rw-r--r--tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot74
-rw-r--r--tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.robot74
-rw-r--r--tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot74
-rw-r--r--tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot74
-rw-r--r--tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot74
-rw-r--r--tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot74
-rw-r--r--tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot76
-rw-r--r--tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot76
-rw-r--r--tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot76
-rw-r--r--tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot76
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot74
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot74
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot74
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot74
-rw-r--r--tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot76
-rw-r--r--tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot76
-rw-r--r--tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot76
-rw-r--r--tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot76
-rw-r--r--tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot76
-rw-r--r--tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot75
-rw-r--r--tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot76
-rw-r--r--tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.robot76
-rw-r--r--tests/dpdk/perf/__init__.robot2
-rwxr-xr-xtests/dpdk/perf/regenerate_testcases.py19
26 files changed, 871 insertions, 949 deletions
diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
index 73ffdddf81..1814820346 100644
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-X520-DA2
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -51,7 +51,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -60,61 +60,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
-| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
+| tc01-64B-1c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
+| tc02-64B-2c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc03-64B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot
index fcc09f4fe6..dfccff98bb 100644
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-X520-DA2
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -53,7 +53,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -62,61 +62,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrpdr
+| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-ndrpdr
+| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
index 66757f0b5c..c6f1c83ab5 100644
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-X520-DA2
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -50,7 +50,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -59,61 +59,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
-| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.robot
index 23a33f1781..c3cd511cac 100644
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-X520-DA2
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -52,7 +52,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -61,61 +61,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
index daaa46dde4..fa5144ee78 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-X710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -51,7 +51,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -60,61 +60,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
-| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
+| tc01-64B-1c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
+| tc02-64B-2c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc03-64B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index ecbe0a33e6..b82e0ed879 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-X710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -53,7 +53,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -62,61 +62,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrpdr
+| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-ndrpdr
+| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
index 1835e00148..825be28681 100644
--- a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-X710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -50,7 +50,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -59,61 +59,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
-| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 09ec4ee750..ac833a994f 100644
--- a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-X710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -50,7 +50,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -59,61 +59,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot
index c06f140c72..dbe3d3aa86 100644
--- a/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-XXV710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -53,7 +53,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -62,63 +62,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | 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} | ${False} | ${True}
-| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
+| tc01-64B-1c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
+| tc02-64B-2c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc03-64B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot
index 8656a7adbe..cd229b654d 100644
--- a/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-XXV710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -55,7 +55,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -64,63 +64,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${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} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrpdr
+| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-ndrpdr
+| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot
index 2869776f22..26e4087ef4 100644
--- a/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-XXV710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -52,7 +52,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -61,63 +61,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | 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} | ${False} | ${True}
-| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 39334a10a9..cff6bfe67b 100644
--- a/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-XXV710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -54,7 +54,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -63,63 +63,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${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} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
index 4178b0969a..1b5766a1f0 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-X710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
@@ -51,7 +51,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -60,61 +60,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
-| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
+| tc01-64B-1c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
+| tc02-64B-2c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc03-64B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index a1476e802c..8dd8b26cac 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-X710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
@@ -53,7 +53,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -62,61 +62,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrpdr
+| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-ndrpdr
+| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
index cf9df30fa3..deea58c352 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-X710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 2-node circular topology\
@@ -50,7 +50,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -59,61 +59,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | Set Test Variable | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
-| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index f55de43e12..74f75315bd 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-X710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-TG 3-node circular topology\
@@ -50,7 +50,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -59,61 +59,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_limit} | ${framesize}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot
index d34efff420..0b173c1152 100644
--- a/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-XXV710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
@@ -53,7 +53,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -62,63 +62,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | 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} | ${False} | ${True}
-| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
+| tc01-64B-1c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
+| tc02-64B-2c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc03-64B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot
index 60a9e4a052..68d00ee36c 100644
--- a/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-XXV710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
@@ -55,7 +55,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -64,63 +64,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${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} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrpdr
+| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-ndrpdr
+| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot
index 42e4a0139d..aa7c131e01 100644
--- a/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-XXV710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
@@ -52,7 +52,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -61,63 +61,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | 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} | ${False} | ${True}
-| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot
index dda0a89a5e..396a7081ec 100644
--- a/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-XXV710
| Suite Teardown | Tear down DPDK 2-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
@@ -54,7 +54,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -63,63 +63,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${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} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
index da61f73ae8..9a1471dde4 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-XL710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -53,7 +53,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -62,63 +62,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | 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} | ${False} | ${True}
-| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
+| tc01-64B-1c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
+| tc02-64B-2c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc03-64B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot
index 41119c0d67..c863244f27 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L2 | Intel-XL710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results L2 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -55,7 +55,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L2 frame forwarding config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -64,62 +64,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${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} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrpdr
+| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-eth-l2xcbase-testpmd-ndrpdr
+| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-eth-l2xcbase-testpmd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot
index a04a4433d7..369e305e73 100644
--- a/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-XL710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -52,7 +52,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -61,63 +61,57 @@
| | ...
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
-| | 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} | ${False} | ${True}
-| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-mrr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.robot
index dfb6f629f9..d03707d856 100644
--- a/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -26,7 +26,7 @@
| ... | L3 | Intel-XL710
| Suite Teardown | Tear down DPDK 3-node performance topology
| ...
-| Test template | Local template
+| Test Template | Local Template
| ...
| Documentation | *Raw results IPv4 routing test cases*
| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -54,7 +54,7 @@
| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
*** Keywords ***
-| Local template
+| Local Template
| | [Documentation]
| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
@@ -63,63 +63,59 @@
| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
| | ...
| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
-| | ${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} | ${False} | ${True}
+| | Set Test Variable | ${min_rate} | ${10000}
| | ...
-| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo
+| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
+| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 1C
| | framesize=${64} | phy_cores=${1}
-| tc02-1518B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc03-9000B-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc05-64B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
+| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 2C
| | framesize=${64} | phy_cores=${2}
-| tc06-1518B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc09-64B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 64B | 4C
| | framesize=${64} | phy_cores=${4}
-| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 1C
+| | framesize=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 2C
+| | framesize=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 1518B | 4C
| | framesize=${1518} | phy_cores=${4}
-| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 1C
+| | framesize=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 2C
+| | framesize=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | 9000B | 4C
| | framesize=${9000} | phy_cores=${4}
-| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 1C
+| | framesize=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 2C
+| | framesize=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
| | [Tags] | IMIX | 4C
| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/__init__.robot b/tests/dpdk/perf/__init__.robot
index 36a58717d7..834fd48631 100644
--- a/tests/dpdk/perf/__init__.robot
+++ b/tests/dpdk/perf/__init__.robot
@@ -36,7 +36,5 @@
| | ... | - pkt_trace - Switch to enable packet trace for test
| | ... | - dut_stats - Switch to enable DUT statistics
| | ...
-| | Set Global Variable | ${perf_pdr_loss_acceptance} | 0.5
-| | Set Global Variable | ${perf_pdr_loss_acceptance_type} | percentage
| | Set Global Variable | ${pkt_trace} | ${False}
| | Set Global Variable | ${dut_stats} | ${False}
diff --git a/tests/dpdk/perf/regenerate_testcases.py b/tests/dpdk/perf/regenerate_testcases.py
new file mode 100755
index 0000000000..e9eea74551
--- /dev/null
+++ b/tests/dpdk/perf/regenerate_testcases.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+# 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.
+
+from resources.libraries.python.autogen.Regenerator import Regenerator
+
+# Do not match __init__.robot
+Regenerator().regenerate_glob("*r.robot")