aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_IPv4_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_IPv6_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Long_Xconnect_Intel-X520-DA2.robot36
-rw-r--r--tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_IPv4_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_IPv6_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot18
-rw-r--r--tests/perf/Short_Xconnect_Intel-X520-DA2.robot18
18 files changed, 243 insertions, 243 deletions
diff --git a/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot b/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot
index 00f301e51b..9d3843b5b5 100644
--- a/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot
@@ -58,7 +58,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -80,7 +80,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -104,7 +104,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -126,7 +126,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -150,7 +150,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -171,7 +171,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -194,7 +194,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -216,7 +216,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -240,7 +240,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -262,7 +262,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -286,7 +286,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -307,7 +307,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -330,7 +330,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -352,7 +352,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -376,7 +376,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -398,7 +398,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -422,7 +422,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -443,7 +443,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
diff --git a/tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot
index 802ec7b76d..06bb0f99f0 100644
--- a/tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot
@@ -62,7 +62,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -91,7 +91,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -122,7 +122,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -151,7 +151,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -182,7 +182,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
@@ -210,7 +210,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
@@ -240,7 +240,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -269,7 +269,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -300,7 +300,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -329,7 +329,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -360,7 +360,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
@@ -388,7 +388,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
@@ -418,7 +418,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -447,7 +447,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -478,7 +478,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -507,7 +507,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -538,7 +538,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
@@ -566,7 +566,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
diff --git a/tests/perf/Long_IPv4_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Intel-X520-DA2.robot
index 749ee138a0..d287373cbf 100644
--- a/tests/perf/Long_IPv4_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv4_Intel-X520-DA2.robot
@@ -62,7 +62,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -84,7 +84,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -108,7 +108,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -130,7 +130,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -154,7 +154,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -175,7 +175,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -198,7 +198,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -220,7 +220,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -244,7 +244,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -266,7 +266,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -290,7 +290,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -311,7 +311,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -334,7 +334,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -356,7 +356,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -380,7 +380,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -402,7 +402,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -426,7 +426,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -447,7 +447,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
diff --git a/tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot
index acf624514b..4d568a8fcc 100644
--- a/tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot
@@ -62,7 +62,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -99,7 +99,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -138,7 +138,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -175,7 +175,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -214,7 +214,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -250,7 +250,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -288,7 +288,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -325,7 +325,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -364,7 +364,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -401,7 +401,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -440,7 +440,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -476,7 +476,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -514,7 +514,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -551,7 +551,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -590,7 +590,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -627,7 +627,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -666,7 +666,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -702,7 +702,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
diff --git a/tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot b/tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot
index 8f80e738b3..a3755c0501 100644
--- a/tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot
@@ -60,7 +60,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -89,7 +89,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -120,7 +120,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -149,7 +149,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -180,7 +180,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
@@ -208,7 +208,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
@@ -238,7 +238,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -267,7 +267,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -298,7 +298,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -327,7 +327,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -358,7 +358,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
@@ -386,7 +386,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
@@ -416,7 +416,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -445,7 +445,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -476,7 +476,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -505,7 +505,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -536,7 +536,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
@@ -564,7 +564,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
diff --git a/tests/perf/Long_IPv6_Intel-X520-DA2.robot b/tests/perf/Long_IPv6_Intel-X520-DA2.robot
index 5664ce4b36..f89e6f31ec 100644
--- a/tests/perf/Long_IPv6_Intel-X520-DA2.robot
+++ b/tests/perf/Long_IPv6_Intel-X520-DA2.robot
@@ -56,7 +56,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -78,7 +78,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -102,7 +102,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -124,7 +124,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -148,7 +148,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -169,7 +169,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -192,7 +192,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -214,7 +214,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -238,7 +238,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -260,7 +260,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -284,7 +284,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -305,7 +305,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -328,7 +328,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -350,7 +350,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -374,7 +374,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -396,7 +396,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -420,7 +420,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -441,7 +441,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
diff --git a/tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot
index 09d93983fe..96ea29020c 100644
--- a/tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot
@@ -66,7 +66,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -97,7 +97,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -130,7 +130,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -161,7 +161,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -194,7 +194,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
@@ -224,7 +224,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
@@ -256,7 +256,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -287,7 +287,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -320,7 +320,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -351,7 +351,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -384,7 +384,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
@@ -414,7 +414,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
@@ -446,7 +446,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -477,7 +477,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -510,7 +510,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -541,7 +541,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -574,7 +574,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
@@ -604,7 +604,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
diff --git a/tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
index 86716f460d..55136941ce 100644
--- a/tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
@@ -62,7 +62,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -92,7 +92,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -124,7 +124,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -154,7 +154,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -186,7 +186,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
@@ -215,7 +215,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
@@ -246,7 +246,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -276,7 +276,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -308,7 +308,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -338,7 +338,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -370,7 +370,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
@@ -399,7 +399,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
@@ -430,7 +430,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -460,7 +460,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -492,7 +492,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -522,7 +522,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -554,7 +554,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
@@ -583,7 +583,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
diff --git a/tests/perf/Long_Xconnect_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Intel-X520-DA2.robot
index 01f692db9e..8c7a3a6f89 100644
--- a/tests/perf/Long_Xconnect_Intel-X520-DA2.robot
+++ b/tests/perf/Long_Xconnect_Intel-X520-DA2.robot
@@ -58,7 +58,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -80,7 +80,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -104,7 +104,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -126,7 +126,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -150,7 +150,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -171,7 +171,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -194,7 +194,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -216,7 +216,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -240,7 +240,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -262,7 +262,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -286,7 +286,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -307,7 +307,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
@@ -330,7 +330,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -352,7 +352,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -376,7 +376,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -398,7 +398,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -422,7 +422,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
@@ -443,7 +443,7 @@
| | ${binary_max}= | Set Variable | ${max_rate}
| | ${threshold}= | Set Variable | ${min_rate}
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
diff --git a/tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot b/tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot
index c6ddbaba28..68f5f43471 100644
--- a/tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot
+++ b/tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot
@@ -53,7 +53,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.2mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -70,7 +70,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -87,7 +87,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -103,7 +103,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 6.9mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -120,7 +120,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -137,7 +137,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -153,7 +153,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.4mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -170,7 +170,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
@@ -187,7 +187,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 bridge domain initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
diff --git a/tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot b/tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot
index 1a6e15acaf..215b0d566e 100644
--- a/tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot
+++ b/tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot
@@ -56,7 +56,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -79,7 +79,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -102,7 +102,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
@@ -124,7 +124,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 6.6mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -147,7 +147,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -170,7 +170,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
@@ -192,7 +192,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -215,7 +215,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -238,7 +238,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
diff --git a/tests/perf/Short_IPv4_Intel-X520-DA2.robot b/tests/perf/Short_IPv4_Intel-X520-DA2.robot
index 9e60561656..384f318aa0 100644
--- a/tests/perf/Short_IPv4_Intel-X520-DA2.robot
+++ b/tests/perf/Short_IPv4_Intel-X520-DA2.robot
@@ -57,7 +57,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.5mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -74,7 +74,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -91,7 +91,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -107,7 +107,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.5mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -124,7 +124,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -141,7 +141,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -157,7 +157,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.0mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -174,7 +174,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -191,7 +191,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
diff --git a/tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot b/tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot
index ea4a0871d1..9d8490c4ab 100644
--- a/tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot
+++ b/tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot
@@ -56,7 +56,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.1mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -87,7 +87,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -118,7 +118,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -148,7 +148,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.8mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -179,7 +179,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -210,7 +210,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
@@ -240,7 +240,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.8mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv4 forwarding initialized in a 3-node circular topology
@@ -271,7 +271,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
@@ -302,7 +302,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv4 forwarding initialized in a 3-node circular topology
| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
diff --git a/tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot b/tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot
index 5ef42c5a86..dc00e7db02 100644
--- a/tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot
+++ b/tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot
@@ -54,7 +54,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.8mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -77,7 +77,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -100,7 +100,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
@@ -122,7 +122,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 4.9mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -145,7 +145,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -168,7 +168,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
@@ -190,7 +190,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 10.1mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -213,7 +213,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
@@ -236,7 +236,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | When IPv6 forwarding initialized in a 3-node circular topology
| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
diff --git a/tests/perf/Short_IPv6_Intel-X520-DA2.robot b/tests/perf/Short_IPv6_Intel-X520-DA2.robot
index cf163a9e44..7a8911495a 100644
--- a/tests/perf/Short_IPv6_Intel-X520-DA2.robot
+++ b/tests/perf/Short_IPv6_Intel-X520-DA2.robot
@@ -53,7 +53,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -70,7 +70,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -87,7 +87,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -103,7 +103,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 5.9mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -120,7 +120,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -137,7 +137,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -153,7 +153,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.3mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -170,7 +170,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
@@ -187,7 +187,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And IPv6 forwarding initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
diff --git a/tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot b/tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot
index 5779dc54f4..2caf7aedc5 100644
--- a/tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot
+++ b/tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot
@@ -61,7 +61,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -87,7 +87,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 810635pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -113,7 +113,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138458pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
@@ -138,7 +138,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.0mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -164,7 +164,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 810635pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -190,7 +190,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138458pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
@@ -215,7 +215,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 8.0mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -241,7 +241,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 810635pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -267,7 +267,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138458pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN subinterfaces initialized on 3-node topology
diff --git a/tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot
index b2eb1ad9a5..03a7d62d9e 100644
--- a/tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot
+++ b/tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot
@@ -57,7 +57,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 2.9mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -82,7 +82,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -107,7 +107,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
@@ -131,7 +131,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 7.0mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -156,7 +156,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -181,7 +181,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
@@ -205,7 +205,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 11.0mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -230,7 +230,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 720000pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
@@ -255,7 +255,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 120000pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And VPP interfaces in path are up in a 3-node circular topology
| | When VLAN dot1q subinterfaces initialized on 3-node topology
diff --git a/tests/perf/Short_Xconnect_Intel-X520-DA2.robot b/tests/perf/Short_Xconnect_Intel-X520-DA2.robot
index 56df7a4ead..e7e6fb0bfd 100644
--- a/tests/perf/Short_Xconnect_Intel-X520-DA2.robot
+++ b/tests/perf/Short_Xconnect_Intel-X520-DA2.robot
@@ -53,7 +53,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 3.6mpps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -70,7 +70,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -87,7 +87,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '1' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -103,7 +103,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 8.3mpps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -120,7 +120,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -137,7 +137,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '2' worker threads and rxqueues '1' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}
@@ -153,7 +153,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 9.3mpps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -170,7 +170,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 812743pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Add No Multi Seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
@@ -187,7 +187,7 @@
| | ${duration}= | Set Variable | 10
| | ${rate}= | Set Variable | 138580pps
| | Given Add '4' worker threads and rxqueues '2' without HTT to all DUTs
-| | And Add all PCI devices to all DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
| | And Apply startup configuration on all VPP DUTs
| | And L2 xconnect initialized in a 3-node circular topology
| | Then Traffic should pass with no loss | ${duration} | ${rate}