Refactor DPDK testcases to new structure

+ RXQ refactor

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

21 files changed, 1557 insertions, 2154 deletions

diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
index ca4faac946..73ffdddf81 100644
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
@@ -26,6 +26,8 @@
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | Tear down DPDK 3-node performance topology
 | ...
+| Test template | Local template
+| ...
 | Documentation | *Raw results L2 routing test cases*
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
@@ -37,7 +39,7 @@
 | ... | at line rate and reports total received/sent packets over trial period.\
 | ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | (flow-group per direction, 254 flows per flow-group) with all packets\
 | ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
 | ... | payload. MAC addresses are matching MAC addresses of the TG node\
 | ... | interfaces.
@@ -49,170 +51,70 @@
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
-| Check RR for eth-l2xcbase-testpmd
+| Local template
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} phy core(s),\
-| | ... | ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | # Test Variables required for test teardown
 | | Set Test Variable | ${framesize}
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | no | yes
+| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
 | | ...
-| | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=1 | rxq=1
+| | framesize=${64} | phy_cores=${1}
 
 | tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=1 | rxq=1
+| | framesize=${1518} | phy_cores=${1}
 
 | tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=1 | rxq=1
+| | framesize=${9000} | phy_cores=${1}
 
 | tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=1 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
 | tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=2 | rxq=1
+| | framesize=${64} | phy_cores=${2}
 
 | tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=2 | rxq=1
+| | framesize=${1518} | phy_cores=${2}
 
 | tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=2 | rxq=1
+| | framesize=${9000} | phy_cores=${2}
 
 | tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=2 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
 | tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=4 | rxq=2
+| | framesize=${64} | phy_cores=${4}
 
 | tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=4 | rxq=2
+| | framesize=${1518} | phy_cores=${4}
 
 | tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=4 | rxq=2
+| | framesize=${9000} | phy_cores=${4}
 
 | tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=4 | rxq=2
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..fcc09f4fe6
--- /dev/null
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -0,0 +1,122 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
+| ... | NIC_Intel-X520-DA2 | DPDK | ETH | L2XCFWD | BASE
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results L2 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
+| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
+| ... | 2p10GE NIC X520 Niantic by Intel.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 254 flows per flow-group) with\
+| ... | all packets containing Ethernet header,IPv4 header with static payload.\
+| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
deleted file mode 100644
index 82365737c7..0000000000
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ /dev/null
@@ -1,410 +0,0 @@
-# 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.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.DPDK.DPDKTools
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDRDISC | 1NUMA
-| ... | NIC_Intel-X520-DA2 | DPDK | ETH | L2XCFWD | BASE
-| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | Tear down DPDK 3-node performance topology
-| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
-| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
-| ... | payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames\
-| | ... | using binary search start at 10GE linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames\
-| | ... | using binary search start at 10GE linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames\
-| | ... | using binary search start at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc04-1518B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames\
-| | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames\
-| | ... | using binary search start at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc06-9000B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames\
-| | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 100kpps,\
-| | ... | LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc10-1518B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 10kpps,\
-| | ... | LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc12-9000B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 10kpps,\
-| | ... | LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 4C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc14-64B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port. [Ver] Find PDR for 64 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 100kpps,\
-| | ... | LT=0.5%.
-| | ...
-| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc16-1518B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 10kpps,\
-| | ... | LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte\
-| | ... | frames using binary search start at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc18-9000B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte
-| | ... | frames using binary search start at 10GE linerate, step 5kpps,\
-| | ... | LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
index 1c16d9cc66..66757f0b5c 100644
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
@@ -26,6 +26,8 @@
 | ... | L3 | Intel-X520-DA2
 | Suite Teardown | Tear down DPDK 3-node performance topology
 | ...
+| Test template | Local template
+| ...
 | Documentation | *Raw results IPv4 routing test cases*
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
@@ -48,170 +50,70 @@
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
 
 *** Keywords ***
-| Check RR for ethip4-ip4base-l3fwd
+| Local template
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with ${wt} phy core(s),\
-| | ... | ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | # Test Variables required for test teardown
 | | Set Test Variable | ${framesize}
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | no | yes
+| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
 | | ...
-| | Given Start L3FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 1C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${64} | wt=1 | rxq=1
+| | framesize=${64} | phy_cores=${1}
 
 | tc02-1518B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 1C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${1518} | wt=1 | rxq=1
+| | framesize=${1518} | phy_cores=${1}
 
 | tc03-9000B-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 1C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${9000} | wt=1 | rxq=1
+| | framesize=${9000} | phy_cores=${1}
 
 | tc04-IMIX-1t1c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 1C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=IMIX_v4_1 | wt=1 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
 | tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 2C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${64} | wt=2 | rxq=1
+| | framesize=${64} | phy_cores=${2}
 
 | tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 2C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${1518} | wt=2 | rxq=1
+| | framesize=${1518} | phy_cores=${2}
 
 | tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 2C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${9000} | wt=2 | rxq=1
+| | framesize=${9000} | phy_cores=${2}
 
 | tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 2C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=IMIX_v4_1 | wt=2 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
 | tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 4C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${64} | wt=4 | rxq=2
+| | framesize=${64} | phy_cores=${4}
 
 | tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 4C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${1518} | wt=4 | rxq=2
+| | framesize=${1518} | phy_cores=${4}
 
 | tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 4C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=${9000} | wt=4 | rxq=2
+| | framesize=${9000} | phy_cores=${4}
 
 | tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 4C
-| | ...
-| | [Template] | Check RR for ethip4-ip4base-l3fwd
-| | framesize=IMIX_v4_1 | wt=4 | rxq=2
+| | 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
new file mode 100644
index 0000000000..23a33f1781
--- /dev/null
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -0,0 +1,121 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
+| ... | NIC_Intel-X520-DA2 | DPDK | IP4FWD | BASE | ETH
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L3 | Intel-X520-DA2
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results IPv4 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application\
+| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with\
+| ... | all packets containing Ethernet header,IPv4 header with static payload.\
+| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+
+*** Variables ***
+# X520-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
deleted file mode 100644
index fe6b5b261e..0000000000
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
+++ /dev/null
@@ -1,421 +0,0 @@
-# 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.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.DPDK.DPDKTools
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | 1NUMA
-| ... | NIC_Intel-X520-DA2 | DPDK | IP4FWD | BASE | ETH
-| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down DPDK 3-node performance topology
-| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using either binary search or linear search
-| ... | algorithms with configured starting rate and final step that determines
-| ... | throughput measurement resolution. Test packets are generated by TG on
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst253_l3fwd
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc02-64B-1t1c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc03-1518B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc04-1518B-1t1c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc05-9000B-1t1c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 5kpps.
-| | ...
-| | [Tags] | 9000B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 1 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc06-9000B-1t1c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 1 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc07-64B-2t2c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc08-64B-2t2c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc09-1518B-2t2c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc10-1518B-2t2c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc11-9000B-2t2c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 5kpps.
-| | ...
-| | [Tags] | 9000B | 2C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 2 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc12-9000B-2t2c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 2 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc13-64B-4t4c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 4C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc14-64B-4t4c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc15-1518B-4t4c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc16-1518B-4t4c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc17-9000B-4t4c-ethip4-ip4base-l3fwd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 5kpps.
-| | ...
-| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 4 | 2 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc18-9000B-4t4c-ethip4-ip4base-l3fwd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start\
-| | ... | at 10GE linerate, step 5kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD on all DUTs | 4 | 2 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
index 180c15ceb1..daaa46dde4 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,6 +26,8 @@
 | ... | L2 | Intel-X710
 | Suite Teardown | Tear down DPDK 3-node performance topology
 | ...
+| Test template | Local template
+| ...
 | Documentation | *Raw results L2 routing test cases*
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
@@ -37,7 +39,7 @@
 | ... | at line rate and reports total received/sent packets over trial period.\
 | ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | (flow-group per direction, 254 flows per flow-group) with all packets\
 | ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
 | ... | payload. MAC addresses are matching MAC addresses of the TG node\
 | ... | interfaces.
@@ -49,170 +51,70 @@
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
-| Check RR for eth-l2xcbase-testpmd
+| Local template
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} phy core(s),\
-| | ... | ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | # Test Variables required for test teardown
 | | Set Test Variable | ${framesize}
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | no | yes
+| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
 | | ...
-| | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=1 | rxq=1
+| | framesize=${64} | phy_cores=${1}
 
 | tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=1 | rxq=1
+| | framesize=${1518} | phy_cores=${1}
 
 | tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=1 | rxq=1
+| | framesize=${9000} | phy_cores=${1}
 
 | tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=1 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
 | tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=2 | rxq=1
+| | framesize=${64} | phy_cores=${2}
 
 | tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=2 | rxq=1
+| | framesize=${1518} | phy_cores=${2}
 
 | tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=2 | rxq=1
+| | framesize=${9000} | phy_cores=${2}
 
 | tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=2 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
 | tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=4 | rxq=2
+| | framesize=${64} | phy_cores=${4}
 
 | tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=4 | rxq=2
+| | framesize=${1518} | phy_cores=${4}
 
 | tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=4 | rxq=2
+| | framesize=${9000} | phy_cores=${4}
 
 | tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=4 | rxq=2
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..ecbe0a33e6
--- /dev/null
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -0,0 +1,122 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
+| ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-X710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results L2 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
+| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
+| ... | 2p10GE NIC X710 by Intel.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 254 flows per flow-group) with\
+| ... | all packets containing Ethernet header,IPv4 header with static payload.\
+| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+
+*** Variables ***
+# X710 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
deleted file mode 100644
index fb42ee531c..0000000000
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ /dev/null
@@ -1,422 +0,0 @@
-# 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.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.DPDK.DPDKTools
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDRDISC | 1NUMA
-| ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE
-| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| Suite Teardown | Tear down DPDK 3-node performance topology
-| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
-| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
-| ... | 2p10GE NIC X710 by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
-| ... | payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit} | ${10000000000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc04-1518B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc06-9000B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc10-1518B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc12-9000B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 4C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc14-64B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc16-1518B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc18-9000B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\
-| | ... | linerate, step 5kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
new file mode 100644
index 0000000000..1835e00148
--- /dev/null
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-mrr.robot
@@ -0,0 +1,119 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR | 1NUMA
+| ... | NIC_Intel-X710 | DPDK | IP4FWD | BASE | ETH
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L3 | Intel-X710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results IPv4 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application\
+| ... | DUT1 and DUT2 tested with 2p10GE NIC X710 Niantic by Intel.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
+| ... | at line rate and reports total received/sent packets over trial period.\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
+| ... | payload. MAC addresses are matching MAC addresses of the TG node\
+| ... | interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | trial throughput test.
+| | ...
+| | [Arguments] | ${framesize} | ${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}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1t1c-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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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
new file mode 100644
index 0000000000..09ec4ee750
--- /dev/null
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -0,0 +1,119 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
+| ... | NIC_Intel-X710 | DPDK | IP4FWD | BASE | ETH
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L3 | Intel-X710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results IPv4 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application\
+| ... | DUT1 and DUT2 tested with 2p10GE NIC X710 Niantic by Intel.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
+| ... | at line rate and reports total received/sent packets over trial period.\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
+| ... | payload. MAC addresses are matching MAC addresses of the TG node\
+| ... | interfaces.
+
+*** Variables ***
+# X710-DA2 bandwidth limit
+| ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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
new file mode 100644
index 0000000000..c06f140c72
--- /dev/null
+++ b/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-mrr.robot
@@ -0,0 +1,124 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | MRR | 1NUMA
+| ... | NIC_Intel-XXV710 | DPDK | ETH | L2XCFWD | BASE
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-XXV710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results L2 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
+| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
+| ... | 2p25GE NIC XXV710 by Intel.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
+| ... | at line rate and reports total received/sent packets over trial period.\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 254 flows per flow-group) with all packets\
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
+| ... | payload. MAC addresses are matching MAC addresses of the TG node\
+| ... | interfaces.
+
+*** Variables ***
+# XXV10-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G}= | ${24500000000}
+# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+| ${s_18.75Mpps}= | ${18750000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | trial throughput test.
+| | ...
+| | [Arguments] | ${framesize} | ${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}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1t1c-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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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
new file mode 100644
index 0000000000..8656a7adbe
--- /dev/null
+++ b/tests/dpdk/perf/25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -0,0 +1,126 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
+| ... | NIC_Intel-XXV710 | DPDK | ETH | L2XCFWD | BASE
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-XXV710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results L2 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
+| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
+| ... | 2p25GE NIC XXV710 by Intel.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 254 flows per flow-group) with\
+| ... | all packets containing Ethernet header,IPv4 header with static payload.\
+| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+
+*** Variables ***
+# XXV10-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G}= | ${24500000000}
+# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+| ${s_18.75Mpps}= | ${18750000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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
new file mode 100644
index 0000000000..2869776f22
--- /dev/null
+++ b/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.robot
@@ -0,0 +1,123 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR | 1NUMA
+| ... | NIC_Intel-XXV710 | DPDK | IP4FWD | BASE | ETH
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L3 | Intel-XXV710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results IPv4 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application\
+| ... | DUT1 and DUT2 tested with 2p25GE NIC XXV710 by Intel.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
+| ... | at line rate and reports total received/sent packets over trial period.\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
+| ... | payload. MAC addresses are matching MAC addresses of the TG node\
+| ... | interfaces.
+
+*** Variables ***
+# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G}= | ${24500000000}
+# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+| ${s_18.75Mpps}= | ${18750000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | trial throughput test.
+| | ...
+| | [Arguments] | ${framesize} | ${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}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1t1c-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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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
new file mode 100644
index 0000000000..39334a10a9
--- /dev/null
+++ b/tests/dpdk/perf/25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -0,0 +1,125 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
+| ... | NIC_Intel-XXV710 | DPDK | IP4FWD | BASE | ETH
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L3 | Intel-XXV710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results IPv4 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application\
+| ... | DUT1 and DUT2 tested with 2p25GE NIC XXV710 by Intel.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with\
+| ... | all packets containing Ethernet header,IPv4 header with static payload.\
+| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+
+*** Variables ***
+# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G}= | ${24500000000}
+# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+| ${s_18.75Mpps}= | ${18750000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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 65e901bbb7..da61f73ae8 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
@@ -26,6 +26,8 @@
 | ... | L2 | Intel-XL710
 | Suite Teardown | Tear down DPDK 3-node performance topology
 | ...
+| Test template | Local template
+| ...
 | Documentation | *Raw results L2 routing test cases*
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
@@ -37,7 +39,7 @@
 | ... | at line rate and reports total received/sent packets over trial period.\
 | ... | Test packets are generated by TG on\
 | ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | (flow-group per direction, 254 flows per flow-group) with all packets\
 | ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
 | ... | payload. MAC addresses are matching MAC addresses of the TG node\
 | ... | interfaces.
@@ -51,172 +53,72 @@
 | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
-| Check RR for eth-l2xcbase-testpmd
+| Local template
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} phy core(s),\
-| | ... | ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
+| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | # Test Variables required for test teardown
 | | Set Test Variable | ${framesize}
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${get_framesize}
 | | ${max_rate}= | Set Variable If
 | | ... | ${max_rate} > ${s_18.75Mpps} | ${s_18.75Mpps} | ${max_rate}
 | | ${jumbo_frames}= | Set Variable If
-| | ... | ${get_framesize} < ${1522} | no | yes
+| | ... | ${get_framesize} < ${1522} | ${False} | ${True}
 | | ...
-| | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=1 | rxq=1
+| | framesize=${64} | phy_cores=${1}
 
 | tc02-1518B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=1 | rxq=1
+| | framesize=${1518} | phy_cores=${1}
 
 | tc03-9000B-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=1 | rxq=1
+| | framesize=${9000} | phy_cores=${1}
 
 | tc04-IMIX-1t1c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 1C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=1 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${1}
 
 | tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=2 | rxq=1
+| | framesize=${64} | phy_cores=${2}
 
 | tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=2 | rxq=1
+| | framesize=${1518} | phy_cores=${2}
 
 | tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=2 | rxq=1
+| | framesize=${9000} | phy_cores=${2}
 
 | tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 2 phy cores, 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 2C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=2 | rxq=1
+| | framesize=IMIX_v4_1 | phy_cores=${2}
 
 | tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 64B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${64} | wt=4 | rxq=2
+| | framesize=${64} | phy_cores=${4}
 
 | tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 1518B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${1518} | wt=4 | rxq=2
+| | framesize=${1518} | phy_cores=${4}
 
 | tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
-| | ... | trial throughput test.
-| | ...
 | | [Tags] | 9000B | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=${9000} | wt=4 | rxq=2
+| | framesize=${9000} | phy_cores=${4}
 
 | tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with \
-| | ... | 4 phy cores, 2 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
-| | ... | trial throughput test.
-| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
-| | ...
 | | [Tags] | IMIX | 4C
-| | ...
-| | [Template] | Check RR for eth-l2xcbase-testpmd
-| | framesize=IMIX_v4_1 | wt=4 | rxq=2
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot
new file mode 100644
index 0000000000..41119c0d67
--- /dev/null
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -0,0 +1,125 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
+| ... | NIC_Intel-XL710 | DPDK | ETH | L2XCFWD | BASE
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L2 | Intel-XL710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results L2 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
+| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
+| ... | 2p40GE NIC XL710 by Intel.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with\
+| ... | all packets containing Ethernet header,IPv4 header with static payload.\
+| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+
+*** Variables ***
+# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G}= | ${24500000000}
+# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+| ${s_18.75Mpps}= | ${18750000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-eth-l2xcbase-testpmd-ndrpdr
+| | [Tags] | IMIX | 4C
+| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
deleted file mode 100644
index 0916d7d1c1..0000000000
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ /dev/null
@@ -1,424 +0,0 @@
-# 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.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.DPDK.DPDKTools
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDRDISC | 1NUMA
-| ... | NIC_Intel-XL710 | DPDK | ETH | L2XCFWD | BASE
-| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-XL710
-| Suite Teardown | Tear down DPDK 3-node performance topology
-| Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK testpmd\
-| ... | application and use the io forwarding mode. DUT1 and DUT2 tested with\
-| ... | 2p40GE NIC XL710 by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using either binary search or linear search\
-| ... | algorithms with configured starting rate and final step that determines\
-| ... | throughput measurement resolution. Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
-| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
-| ... | payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
-| ${s_24.5G} | ${24500000000}
-# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
-| ${s_18.75Mpps} | ${18750000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Set Variable | ${s_18.75Mpps}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Set Variable | ${s_18.75Mpps}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc04-1518B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 1C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc06-9000B-1t1c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 1 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 2C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Set Variable | ${s_18.75Mpps}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Set Variable | ${s_18.75Mpps}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc10-1518B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc12-9000B-2t2c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 2 | 1 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 100kpps.
-| | ...
-| | [Tags] | 64B | 4C | NDRDISC
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Set Variable | ${s_18.75Mpps}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc14-64B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 100kpps, LT=0.5%.
-| | ...
-| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${64}
-| | ${min_rate}= | Set Variable | ${100000}
-| | ${max_rate}= | Set Variable | ${s_18.75Mpps}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc16-1518B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps, LT=0.5%.
-| | ...
-| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | no
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
-
-| tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 10kpps.
-| | ...
-| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | yes
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold}
-
-| tc18-9000B-4t4c-eth-l2xcbase-testpmd-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 40GE\
-| | ... | linerate, step 5kpps, LT=0.5%.
-| | ...
-| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
-| | ...
-| | ${framesize}= | Set Variable | ${9000}
-| | ${min_rate}= | Set Variable | ${10000}
-| | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize}
-| | ${binary_min}= | Set Variable | ${min_rate}
-| | ${binary_max}= | Set Variable | ${max_rate}
-| | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD on all DUTs | 4 | 2 | yes
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | ${traffic_profile}
-| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot
new file mode 100644
index 0000000000..a04a4433d7
--- /dev/null
+++ b/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-mrr.robot
@@ -0,0 +1,123 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR | 1NUMA
+| ... | NIC_Intel-XL710 | DPDK | IP4FWD | BASE | ETH
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L3 | Intel-XL710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results IPv4 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application\
+| ... | DUT1 and DUT2 tested with 2p40GE NIC XL710 by Intel.
+| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
+| ... | at line rate and reports total received/sent packets over trial period.\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with all packets\
+| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\
+| ... | payload. MAC addresses are matching MAC addresses of the TG node\
+| ... | interfaces.
+
+*** Variables ***
+# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G}= | ${24500000000}
+# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+| ${s_18.75Mpps}= | ${18750000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | trial throughput test.
+| | ...
+| | [Arguments] | ${framesize} | ${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}
+| | Then Traffic should pass with maximum rate
+| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
+
+*** Test Cases ***
+| tc01-64B-1t1c-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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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
new file mode 100644
index 0000000000..dfb6f629f9
--- /dev/null
+++ b/tests/dpdk/perf/40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -0,0 +1,125 @@
+# 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.
+
+*** Settings ***
+| Resource | resources/libraries/robot/performance/performance_setup.robot
+| Resource | resources/libraries/robot/dpdk/default.robot
+| Library | resources.libraries.python.topology.Topology
+| Library | resources.libraries.python.NodePath
+| Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
+| ... | NIC_Intel-XL710 | DPDK | IP4FWD | BASE | ETH
+| ...
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
+| ... | L3 | Intel-XL710
+| Suite Teardown | Tear down DPDK 3-node performance topology
+| ...
+| Test template | Local template
+| ...
+| Documentation | *Raw results IPv4 routing test cases*
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L3 IPv4 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 run the DPDK l3fwd application\
+| ... | DUT1 and DUT2 tested with 2p40GE NIC XL710 by Intel.
+| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
+| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
+| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
+| ... | of packets transmitted. NDR and PDR are discovered for different\
+| ... | Ethernet L2 frame sizes using MLRsearch library\
+| ... | Test packets are generated by TG on\
+| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
+| ... | (flow-group per direction, 253 flows per flow-group) with\
+| ... | all packets containing Ethernet header,IPv4 header with static payload.\
+| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+
+*** Variables ***
+# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
+| ${s_24.5G}= | ${24500000000}
+# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
+| ${s_18.75Mpps}= | ${18750000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst253_l3fwd
+
+*** Keywords ***
+| Local template
+| | [Documentation]
+| | ... | [Cfg] DUT runs L3 IPv4 routing config.\
+| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ...
+| | [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}
+| | ...
+| | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo_frames}
+| | 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
+| | [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
+| | [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
+| | [Tags] | 64B | 4C
+| | framesize=${64} | phy_cores=${4}
+
+| tc10-1518B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 1518B | 4C
+| | framesize=${1518} | phy_cores=${4}
+
+| tc11-9000B-4t4c-ethip4-ip4base-l3fwd-ndrpdr
+| | [Tags] | 9000B | 4C
+| | framesize=${9000} | phy_cores=${4}
+
+| tc12-IMIX-4t4c-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 d818f94e25..36a58717d7 100644
--- a/tests/dpdk/perf/__init__.robot
+++ b/tests/dpdk/perf/__init__.robot
@@ -33,12 +33,10 @@
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - perf_pdr_loss_acceptance - Loss acceptance treshold
 | | ... | - perf_pdr_loss_acceptance_type - Loss acceptance treshold type
-| | ... | - perf_vm_image - Guest VM disk image
 | | ... | - 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 | ${perf_vm_image} | /var/lib/vm/csit-nested-1.7.img
 | | Set Global Variable | ${pkt_trace} | ${False}
 | | Set Global Variable | ${dut_stats} | ${False}