1 files changed, 40 insertions, 40 deletions
diff --git a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
index c2ac8e4839..6fab3c9397 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x520-eth-l2xcbase-eth-1memif-1dcr-ndrpdrdisc.robot
@@ -116,166 +116,166 @@
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching 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=${64} | wt=1 | rxq=1 | search_type=NDR
 
 | tc02-64B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching 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
+| | [Tags] | 64B | 1C | PDRDISC
 | | framesize=${64} | wt=1 | rxq=1 | search_type=PDR
 
 | tc03-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching 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=${1518} | wt=1 | rxq=1 | search_type=NDR
 
 | tc04-1518B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching 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
+| | [Tags] | 1518B | 1C | PDRDISC
 | | framesize=${1518} | wt=1 | rxq=1 | search_type=PDR
 
 | tc05-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching 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 50kpps.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | [Tags] | 9000B | 1C | NDRDISC
 | | framesize=${9000} | wt=1 | rxq=1 | search_type=NDR
 
 | tc06-9000B-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching 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 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC
+| | [Tags] | 9000B | 1C | PDRDISC
 | | framesize=${9000} | wt=1 | rxq=1 | search_type=PDR
 
 | tc07-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1 | search_type=NDR
 
 | tc08-IMIX-1t1c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 1 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC
+| | [Tags] | IMIX | 1C | PDRDISC
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1 | search_type=PDR
 
 | tc09-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 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 | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 64B | 2C | NDRDISC
 | | framesize=${64} | wt=2 | rxq=1 | search_type=NDR
 
 | tc10-64B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 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 | MTHREAD | PDRDISC
+| | [Tags] | 64B | 1C | PDRDISC
 | | framesize=${64} | wt=2 | rxq=1 | search_type=PDR
 
 | tc11-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 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 | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 2C | NDRDISC
 | | framesize=${1518} | wt=2 | rxq=1 | search_type=NDR
 
 | tc12-1518B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 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 | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 1518B | 2C | PDRDISC
 | | framesize=${1518} | wt=2 | rxq=1 | search_type=PDR
 
 | tc13-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | 9000B | 2C | NDRDISC
 | | framesize=${9000} | wt=2 | rxq=1 | search_type=NDR
 
 | tc14-9000B-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | 9000B | 2C | PDRDISC
 | | framesize=${9000} | wt=2 | rxq=1 | search_type=PDR
 
 | tc15-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find NDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | IMIX | 2C | NDRDISC
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1 | search_type=NDR
 
 | tc16-IMIX-2t2c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 phy core,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Find PDR for IMIX_v4_1 frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC
+| | [Tags] | IMIX | 2C | PDRDISC
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1 | search_type=PDR
 
 | tc17-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
@@ -285,7 +285,7 @@
 | | ... | [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=${64} |  wt=4 | rxq=2 | search_type=NDR
 
 | tc18-64B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
@@ -295,7 +295,7 @@
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC
+| | [Tags] | 64B | 4C | PDRDISC
 | | framesize=${64} |  wt=4 | rxq=2 | search_type=PDR
 
 | tc19-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
@@ -305,7 +305,7 @@
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 1518B | 4C | NDRDISC
 | | framesize=${1518} |  wt=4 | rxq=2| search_type=NDR
 
 | tc20-1518B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
@@ -315,7 +315,7 @@
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC
+| | [Tags] | 1518B | 4C | PDRDISC
 | | framesize=${1518} |  wt=4 | rxq=2 | search_type=PDR
 
 | tc21-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
@@ -325,7 +325,7 @@
 | | ... | [Ver] Find NDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | 9000B | 4C | NDRDISC
 | | framesize=${9000} |  wt=4 | rxq=2 | search_type=NDR
 
 | tc22-9000B-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
@@ -335,7 +335,7 @@
 | | ... | [Ver] Find PDR for 9000 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC
+| | [Tags] | 9000B | 4C | PDRDISC
 | | framesize=${9000} |  wt=4 | rxq=2 | search_type=PDR
 
 | tc23-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-ndrdisc
@@ -346,7 +346,7 @@
 | | ... | linerate, step 50kpps.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | IMIX | 4C | NDRDISC
 | | framesize=IMIX_v4_1 |  wt=4 | rxq=2 | search_type=NDR
 
 | tc24-IMIX-4t4c-eth-l2xcbase-eth-1memif-1dcr-pdrdisc
@@ -357,5 +357,5 @@
 | | ... | linerate, step 50kpps, LT=0.5%.
 | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD | PDRDISC
+| | [Tags] | IMIX | 4C | PDRDISC
 | | framesize=IMIX_v4_1 | wt=4 | rxq=2 | search_type=PDR