X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4_tunnels%2F10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot;h=9598dd02949d82ee54572e6f0d3113cd0fdfa640;hb=ad71afc5baa8008bd5d4ea26f51a71eefe3fbe62;hp=df4dd980cace777ea47157c27f617786ccde17b6;hpb=cc85afad85339d2cc8f035ce63ff21220d8e6b96;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 df4dd980ca..9598dd0294 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
@@ -58,17 +58,17 @@
 *** 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}
 | | ${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
+| | 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
@@ -79,17 +79,17 @@
 
 | 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}
 | | ${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
+| | 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
@@ -101,17 +101,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -121,17 +121,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -142,17 +142,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -162,17 +162,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -183,17 +183,17 @@
 
 | 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}
 | | ${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
+| | 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
@@ -204,17 +204,17 @@
 
 | 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}
 | | ${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
+| | 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
@@ -226,17 +226,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -246,17 +246,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -267,17 +267,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -287,17 +287,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -308,17 +308,17 @@
 
 | 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}
 | | ${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
+| | 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
@@ -329,17 +329,17 @@
 
 | 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}
 | | ${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
+| | 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
@@ -351,17 +351,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -371,17 +371,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -392,17 +392,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology
@@ -412,17 +412,17 @@
 
 | 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}
 | | ${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
+| | 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 L2 xconnect with VXLANoIPv4 in 3-node circular topology