CSIT-518: Add testpmd numa awareness

Change-Id: I982834de1fbe71cf5303808ea58d4b58e530ffcb
Signed-off-by: Tibor Frank <tifrank@cisco.com>

6 files changed, 85 insertions, 1766 deletions

diff --git a/dpdk-tests/perf/10ge2p1vic1227-eth-l2xcbase-ndrdisc.robot b/dpdk-tests/perf/10ge2p1vic1227-eth-l2xcbase-ndrdisc.robot
deleted file mode 100644
index fa0c87e6d2..0000000000
--- a/dpdk-tests/perf/10ge2p1vic1227-eth-l2xcbase-ndrdisc.robot
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright (c) 2016 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.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_Cisco-VIC-1227 | DPDK | ETH | L2XCFWD | BASE
-| Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model
-| ... | L2 | Cisco-VIC-1227
-| Suite Teardown | DPDK 3-node Performance Suite Teardown
-| 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 Cisco VIC-1227.
-| ... | *[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 ***
-# Cisco-VIC-1227 bandwidth limit
-| ${s_limit} | ${10000000000}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc02-64B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc04-1518B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc05-9000B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc06-9000B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc07-64B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc08-64B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc10-1518B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc11-9000B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc12-9000B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc13-64B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc14-64B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc16-1518B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc17-9000B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc18-9000B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
diff --git a/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot b/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot
deleted file mode 100644
index 7fd1c9e5e1..0000000000
--- a/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-ndrdisc.robot
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright (c) 2016 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.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 | DPDK 3-node Performance Suite Setup with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | DPDK 3-node Performance Suite Teardown
-| 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}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding  config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc02-64B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc04-1518B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc05-9000B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc06-9000B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc07-64B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc08-64B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc10-1518B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc11-9000B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc12-9000B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc13-64B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc14-64B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc16-1518B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
-
-| tc17-9000B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-
-| tc18-9000B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
diff --git a/dpdk-tests/perf/10ge2p1x710-eth-l2xcbase-ndrdisc.robot b/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrdisc.robot
index 8fb1b0fa6e..2dc09f9d9a 100644
--- a/dpdk-tests/perf/10ge2p1x710-eth-l2xcbase-ndrdisc.robot
+++ b/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrdisc.robot
@@ -19,9 +19,9 @@
 | 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
+| ... | NIC_Intel-X520-DA2 | DPDK | ETH | L2XCFWD | BASE
 | Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model
-| ... | L2 | Intel-X710
+| ... | L2 | Intel-X520-DA2
 | Suite Teardown | DPDK 3-node Performance Suite Teardown
 | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
 | ...
@@ -30,7 +30,7 @@
 | ... | *[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 Niantic by Intel.
+| ... | 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\
@@ -50,15 +50,12 @@
 | ${s_limit} | ${10000000000}
 
 *** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-ndrdisc
+| tc01-64B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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.
-| | ...
+| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames\
+| | ... | using binary search start at 10GE linerate, step 100kpps.
 | | [Tags] | 1T1C | STHREAD | NDRDISC
-| | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -67,18 +64,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc02-64B-1t1c-eth-l2xcbase-pdrdisc
+| tc02-64B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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%.
-| | ...
+| | ... | 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] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -87,18 +81,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
+| tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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.
-| | ...
+| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames\
+| | ... | using binary search start at 10GE linerate, step 10kpps.
 | | [Tags] | 1T1C | STHREAD | NDRDISC
-| | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -107,18 +98,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc04-1518B-1t1c-eth-l2xcbase-pdrdisc
+| tc04-1518B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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%.
-| | ...
+| | ... | 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] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -127,18 +115,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc05-9000B-1t1c-eth-l2xcbase-ndrdisc
+| tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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.
-| | ...
+| | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames\
+| | ... | using binary search start at 10GE linerate, step 10kpps.
 | | [Tags] | 1T1C | STHREAD | NDRDISC
-| | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -147,18 +132,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc06-9000B-1t1c-eth-l2xcbase-pdrdisc
+| tc06-9000B-1t1c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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%.
-| | ...
+| | ... | 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] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -167,18 +149,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc07-64B-2t2c-eth-l2xcbase-ndrdisc
+| tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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.
-| | ...
+| | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte\
+| | ... | frames using binary search start at 10GE linerate, step 100kpps.
 | | [Tags] | 2T2C | MTHREAD | NDRDISC
-| | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -187,18 +166,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc08-64B-2t2c-eth-l2xcbase-pdrdisc
+| tc08-64B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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%.
-| | ...
+| | ... | 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] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -207,18 +184,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
+| tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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.
-| | ...
+| | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte\
+| | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -227,18 +201,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc10-1518B-2t2c-eth-l2xcbase-pdrdisc
+| tc10-1518B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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%.
-| | ...
+| | ... | 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] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -247,18 +219,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc11-9000B-2t2c-eth-l2xcbase-ndrdisc
+| tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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.
-| | ...
+| | ... | cores, 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte\
+| | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -267,18 +236,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc12-9000B-2t2c-eth-l2xcbase-pdrdisc
+| tc12-9000B-2t2c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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%.
-| | ...
+| | ... | 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] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -287,18 +254,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc13-64B-4t4c-eth-l2xcbase-ndrdisc
+| tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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.
-| | ...
+| | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte\
+| | ... | frames using binary search start at 10GE linerate, step 100kpps.
 | | [Tags] | 4T4C | MTHREAD | NDRDISC
-| | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -307,18 +271,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge| ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc14-64B-4t4c-eth-l2xcbase-pdrdisc
+| tc14-64B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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%.
-| | ...
+| | ... | 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] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -327,18 +289,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
+| tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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.
-| | ...
+| | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte\
+| | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -347,18 +306,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc16-1518B-4t4c-eth-l2xcbase-pdrdisc
+| tc16-1518B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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%.
-| | ...
+| | ... | 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] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -367,18 +324,15 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
 
-| tc17-9000B-4t4c-eth-l2xcbase-ndrdisc
+| tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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.
-| | ...
+| | ... | cores, 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte\
+| | ... | frames using binary search start at 10GE linerate, step 10kpps.
 | | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -387,18 +341,16 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes'
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
 
-| tc18-9000B-4t4c-eth-l2xcbase-pdrdisc
+| tc18-9000B-4t4c-eth-l2xcbase-testpmd-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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%.
-| | ...
+| | ... | 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] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
-| | ...
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -407,5 +359,5 @@
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes'
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
+| | ... | ${binary_max} | 3-node-xconnect | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
diff --git a/dpdk-tests/perf/40ge2p1vic1385-eth-l2xcbase-ndrdisc.robot b/dpdk-tests/perf/40ge2p1vic1385-eth-l2xcbase-ndrdisc.robot
deleted file mode 100644
index 9171b0b877..0000000000
--- a/dpdk-tests/perf/40ge2p1vic1385-eth-l2xcbase-ndrdisc.robot
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright (c) 2016 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.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_Cisco-VIC-1385 | DPDK | ETH | L2XCFWD | BASE
-| Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model
-| ... | L2 | Cisco-VIC-1385
-| Suite Teardown | DPDK 3-node Performance Suite Teardown
-| 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 Cisco VIC-1385.
-| ... | *[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 ***
-# Cisco VIC1385 bandwidth limit ~49Gbps/2=24.5Gbps
-| ${s_24.5G} | ${24500000000}
-# Cisco VIC1385 Mpps limit 37.5Mpps/2=18.75Mpps
-| ${s_18.75Mpps} | ${18750000}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc02-64B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc04-1518B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc05-9000B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc06-9000B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc07-64B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc08-64B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc10-1518B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc11-9000B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc12-9000B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc13-64B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc14-64B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc16-1518B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc17-9000B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc18-9000B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
diff --git a/dpdk-tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot b/dpdk-tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot
deleted file mode 100644
index 80aaf08c5a..0000000000
--- a/dpdk-tests/perf/40ge2p1xl710-eth-l2xcbase-ndrdisc.robot
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright (c) 2016 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.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 | DPDK 3-node Performance Suite Setup with DUT's NIC model
-| ... | L2 | Intel-XL710
-| Suite Teardown | DPDK 3-node Performance Suite Teardown
-| 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 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 ***
-# 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}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc02-64B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc04-1518B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc05-9000B-1t1c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc06-9000B-1t1c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 1 thread, 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] | 1T1C | STHREAD | 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 '1' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc07-64B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc08-64B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc10-1518B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc11-9000B-2t2c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc12-9000B-2t2c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads, 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] | 2T2C | MTHREAD | 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 '2' worker threads and rxqueues '1' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc13-64B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc14-64B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc16-1518B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'no'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
-
-| tc17-9000B-4t4c-eth-l2xcbase-ndrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
-
-| tc18-9000B-4t4c-eth-l2xcbase-pdrdisc
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads, 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] | 4T4C | MTHREAD | 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 '4' worker threads and rxqueues '2' with jumbo frames 'yes'
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${glob_loss_acceptance} | ${glob_loss_acceptance_type}
diff --git a/dpdk-tests/perf/__init__.robot b/dpdk-tests/perf/__init__.robot
index 6358151fcb..153fe354ac 100644
--- a/dpdk-tests/perf/__init__.robot
+++ b/dpdk-tests/perf/__init__.robot
@@ -15,4 +15,7 @@
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/interfaces.robot
 | Library | resources.libraries.python.DPDK.SetupDPDKTest
-| Suite Setup | Run Keyword | Setup DPDK Test | ${nodes}
+| Suite Setup | Run Keywords | Setup DPDK Test | ${nodes}
+| ...         | AND          | Get CPU Layout from all nodes | ${nodes}
+| ...         | AND          | Update All Numa Nodes
+| ...                        | ${nodes} | skip_tg=${True}