1 files changed, 36 insertions, 36 deletions

diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-ndrpdrdisc.robot
index 0377018dae..6724507f7d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-nat44-ndrpdrdisc.robot
@@ -91,234 +91,234 @@
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 1 phy core,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [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
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
 
 | tc02-64B-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 1 phy core,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
 
 | tc03-1518B-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 1 phy core,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [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
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
 
 | tc04-1518B-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 1 phy core,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
 
 | tc05-IMIX-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 1 phy core,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
 
 | tc06-IMIX-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 1 phy core,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR
 
 | tc07-64B-2t2c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [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
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=NDR
 
 | tc08-64B-2t2c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=${64} | min_rate=${50000} | search_type=PDR
 
 | tc09-1518B-2t2c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [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
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=NDR
 
 | tc10-1518B-2t2c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=${1518} | min_rate=${50000} | search_type=PDR
 
 | tc11-IMIX-2t2c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC
+| | [Tags] | IMIX | 2C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
 
 | tc12-IMIX-2t2c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 2 phy cores,\
 | | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 2C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR
 
 | tc13-64B-4t4c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [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
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=${64} | min_rate=${50000} | search_type=NDR
 
 | tc14-64B-4t4c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 64B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=${64} | min_rate=${50000} | search_type=PDR
 
 | tc15-1518B-4t4c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [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
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=NDR
 
 | tc16-1518B-4t4c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=${1518} | min_rate=${50000} | search_type=PDR
 
 | tc17-IMIX-4t4c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD | NDRDISC
+| | [Tags] | IMIX | 4C | NDRDISC
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=NDR
 
 | tc18-IMIX-4t4c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs IPv4 routing config with 4 phy cores,\
 | | ... | 2 receive queues per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 50kpps.
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 4C | PDRDISC | SKIP_PATCH
 | | ...
 | | [Template] | Discover NDR or PDR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1 | min_rate=${50000} | search_type=PDR