CSIT-1097: Edit dpdk suites for new rate and jumbo

Change-Id: If2fceb47639dc1add32184271c1e911f7920a51a
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

1 files changed, 36 insertions, 39 deletions

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}