X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4_tunnels%2F10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot;h=615aa57e7edd8b691ef46d52b495102b534886aa;hb=e3bed8e21e3c8b60734ce95eb2bb2a2d371a9907;hp=86dc77ed926cd872ee7c34d02c50918950d307f6;hpb=cd9235056d6ec7ed21d46027964e945b21710886;p=csit.git

diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
index 86dc77ed92..615aa57e7e 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
@@ -58,10 +58,10 @@
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps.
-| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 64B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -69,7 +69,7 @@
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -79,10 +79,10 @@
 
 | tc02-64B-1t1c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -90,7 +90,7 @@
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -101,10 +101,10 @@
 
 | tc03-1518B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps.
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -112,7 +112,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -121,10 +121,10 @@
 
 | tc04-1518B-1t1c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -132,7 +132,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -142,10 +142,10 @@
 
 | tc05-9000B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 9000B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -153,7 +153,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -162,10 +162,10 @@
 
 | tc06-9000B-1t1c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -173,7 +173,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -183,10 +183,10 @@
 
 | tc07-64B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps.
-| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -194,7 +194,7 @@
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -204,10 +204,10 @@
 
 | tc08-64B-2t2c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -215,7 +215,7 @@
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -226,10 +226,10 @@
 
 | tc09-1518B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps.
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -237,7 +237,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -246,10 +246,10 @@
 
 | tc10-1518B-2t2c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -257,7 +257,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -267,10 +267,10 @@
 
 | tc11-9000B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -278,7 +278,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -287,10 +287,10 @@
 
 | tc12-9000B-2t2c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -298,7 +298,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -308,10 +308,10 @@
 
 | tc13-64B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps.
-| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 4C | NDRDISC
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -319,7 +319,7 @@
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -329,10 +329,10 @@
 
 | tc14-64B-4t4c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -340,7 +340,7 @@
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -351,10 +351,10 @@
 
 | tc15-1518B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps.
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -362,7 +362,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -371,10 +371,10 @@
 
 | tc16-1518B-4t4c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames
 | | ... | using binary search start at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -382,7 +382,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -392,10 +392,10 @@
 
 | tc17-9000B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -403,7 +403,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -412,10 +412,10 @@
 
 | tc18-9000B-4t4c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
+| | ... | [Cfg] DUT runs L2XC forwarding config with 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 50}
@@ -423,7 +423,7 @@
 | | ${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
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}