CSIT-1142 Change thread perf test TAGs

Due to automatization of SMT detection this change is suppose to
remove static thread/core tags in favor of dynamic one. Leaving the
static tags for number of physical cores to be able to select TCs.

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

2 files changed, 72 insertions, 72 deletions

diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot
index 9f3662ac31..7f5f8d29d3 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot
@@ -55,11 +55,11 @@
 | tc01-78B-1t1c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -85,11 +85,11 @@
 | tc02-78B-1t1c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -116,11 +116,11 @@
 | tc03-1460B-1t1c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 1460B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1460B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -146,11 +146,11 @@
 | tc04-1460B-1t1c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1460B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -177,11 +177,11 @@
 | tc05-9000B-1t1c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters 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 + 48}
@@ -206,11 +206,11 @@
 | tc06-9000B-1t1c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters 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 + 48}
@@ -236,11 +236,11 @@
 | tc07-78B-2t2c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -266,11 +266,11 @@
 | tc08-78B-2t2c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -297,11 +297,11 @@
 | tc09-1460B-2t2c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 1460B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -327,11 +327,11 @@
 | tc10-1460B-2t2c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1460B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -358,11 +358,11 @@
 | tc11-9000B-2t2c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters 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 + 48}
@@ -387,11 +387,11 @@
 | tc12-9000B-2t2c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters 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 + 48}
@@ -417,11 +417,11 @@
 | tc13-78B-4t4c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -447,11 +447,11 @@
 | tc14-78B-4t4c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -478,11 +478,11 @@
 | tc15-1460B-4t4c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 1460B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -508,11 +508,11 @@
 | tc16-1460B-4t4c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1460B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 48}
@@ -539,11 +539,11 @@
 | tc17-9000B-4t4c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters 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 + 48}
@@ -568,11 +568,11 @@
 | tc18-9000B-4t4c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters 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 + 48}
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot
index 8800f6b426..993b014dc2 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot
@@ -55,11 +55,11 @@
 | tc01-78B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 78B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -85,11 +85,11 @@
 | tc02-78B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -116,11 +116,11 @@
 | tc03-1460B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 1460B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 1460B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -146,11 +146,11 @@
 | tc04-1460B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters config with 1 phy core, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1460B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -177,11 +177,11 @@
 | tc05-9000B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters 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 + 8}
@@ -206,11 +206,11 @@
 | tc06-9000B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
+| | ... | filters 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 + 8}
@@ -236,11 +236,11 @@
 | tc07-78B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 2C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -266,11 +266,11 @@
 | tc08-78B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -297,11 +297,11 @@
 | tc09-1460B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 10kpps.
-| | [Tags] | 1460B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -327,11 +327,11 @@
 | tc10-1460B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters config with 2 phy cores, 1 receive queue per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1460B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -358,11 +358,11 @@
 | tc11-9000B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters 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 + 8}
@@ -387,11 +387,11 @@
 | tc12-9000B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
+| | ... | filters 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.
-| | [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 + 8}
@@ -417,11 +417,11 @@
 | tc13-78B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 78B | 4C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -447,11 +447,11 @@
 | tc14-78B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 78 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -478,11 +478,11 @@
 | tc15-1460B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find NDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps.
-| | [Tags] | 1460B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -508,11 +508,11 @@
 | tc16-1460B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters config with 4 phy cores, 2 receive queues per NIC\
 | | ... | port.
 | | ... | [Ver] Find PDR for 1460 Byte frames using binary search start\
 | | ... | at 10GE linerate, step 50kpps, LT=0.5%.
-| | [Tags] | 1460B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1460B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1460}
 | | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -539,11 +539,11 @@
 | tc17-9000B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters 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 + 8}
@@ -568,11 +568,11 @@
 | tc18-9000B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
-| | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
+| | ... | filters 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 + 8}