X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot;h=d297773bf45a22a56a4fcc7262209ee0c0e0b18b;hb=refs%2Fchanges%2F71%2F12771%2F59;hp=a2c81947dada8c189b3248202a970f89f9735ccd;hpb=995ac8540182cecb151298a61633c202150020ce;p=csit.git

diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
index a2c81947da..d297773bf4 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
@@ -70,171 +70,171 @@
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ...
 | | Given Add '${wt}' worker threads and '${rxq}' 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 Run Keyword If | ${get_framesize} < ${1522}
 | | ... | Add no multi seg to all DUTs
 | | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize NAT44 in 3-node circular topology
-| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
+| | Then Traffic should pass with maximum rate
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=${64}
 
 | tc02-1518B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=${1518}
 
 | tc03-9000B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=${9000}
 
 | tc04-IMIX-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
 | | ... | throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD
+| | [Tags] | IMIX | 1C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=1 | rxq=1 | framesize=IMIX_v4_1
 
 | tc05-64B-2t2c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=${64}
 
 | tc06-1518B-2t2c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=${1518}
 
 | tc07-9000B-2t2c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=${9000}
 
 | tc08-IMIX-2t2c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
 | | ... | throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
+| | [Tags] | IMIX | 2C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=2 | rxq=1 | framesize=IMIX_v4_1
 
 | tc09-64B-4t4c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
 | | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=${64}
 
 | tc10-1518B-4t4c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=${1518}
 
 | tc11-9000B-4t4c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=${9000}
 
 | tc12-IMIX-4t4c-ethip4udp-ip4scale1000-udpsrcscale15-snat-mrr
 | | [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 -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
 | | ... | throughput test.
 | | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
 | | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
+| | [Tags] | IMIX | 4C
 | | ...
 | | [Template] | Check RR for IPv4 routing with NAT44
 | | wt=4 | rxq=2 | framesize=IMIX_v4_1