CSIT-1201 Create L2patch perf tests

[csit.git] / tests / vpp / perf / ip6 / 10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot

diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
index 6ee98fb..1558138 100644 (file)
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify.Classify
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
@@ -59,18 +58,18 @@
 | tc01-78B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps.
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 78B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -82,18 +81,18 @@
 | tc02-78B-1t1c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps, LT=0.5%.
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -106,18 +105,18 @@
 | tc03-1518B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps.
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -129,18 +128,18 @@
 | tc04-1518B-1t1c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -153,18 +152,18 @@
 | tc05-9000B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps.
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | ... | step 10kpps.
+| | [Tags] | 9000B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
 | | And Initialize IPv6 iAcl whitelist in 3-node circular topology
@@ -175,18 +174,18 @@
 | tc06-9000B-1t1c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 10kpps, LT=0.5%.
+| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
 | | And Initialize IPv6 iAcl whitelist in 3-node circular topology
@@ -198,18 +197,18 @@
 | tc07-78B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps.
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 78B | 2C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -221,18 +220,18 @@
 | tc08-78B-2t2c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps, LT=0.5%.
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -245,18 +244,18 @@
 | tc09-1518B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps.
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | step 50kpps.
+| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -268,18 +267,18 @@
 | tc10-1518B-2t2c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -292,18 +291,18 @@
 | tc11-9000B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps.
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | step 10kpps.
+| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
 | | And Initialize IPv6 iAcl whitelist in 3-node circular topology
@@ -314,18 +313,18 @@
 | tc12-9000B-2t2c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 10kpps, LT=0.5%.
+| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
 | | And Initialize IPv6 iAcl whitelist in 3-node circular topology
@@ -337,18 +336,18 @@
 | tc13-78B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps.
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 78B | 4C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -360,18 +359,18 @@
 | tc14-78B-4t4c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps, LT=0.5%.
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${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 Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -384,18 +383,18 @@
 | tc15-1518B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps.
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -407,18 +406,18 @@
 | tc16-1518B-4t4c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
 | | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
@@ -431,18 +430,18 @@
 | tc17-9000B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps.
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | step 10kpps.
+| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
 | | And Initialize IPv6 iAcl whitelist in 3-node circular topology
@@ -453,18 +452,18 @@
 | tc18-9000B-4t4c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 10kpps, LT=0.5%.
+| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize IPv6 forwarding in 3-node circular topology
 | | And Initialize IPv6 iAcl whitelist in 3-node circular topology