aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot1
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot1
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdrdisc.robot6
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot1
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot1
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot5
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot5
76 files changed, 216 insertions, 149 deletions
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
index 3a070f8eaf..3fc4c52e97 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
@@ -13,7 +13,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify.Classify
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot
index 5d63633383..25811ad594 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify.Classify
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
| ... | WITH NAME | dut1_v4
| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdrdisc.robot
index 14c47124ea..1ddd32431b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdrdisc.robot
index 967677d3fd..e0848805a1 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdrdisc.robot
index 4e28e6997f..7f3d537982 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot
index 987c810c22..d811c6525a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdrdisc.robot
index b500865533..306ae1cf92 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdrdisc.robot
index 72cc901399..ad206da0bd 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdrdisc.robot
index 6ad814f6af..103b9f2a21 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdrdisc.robot
index 07229d8fd2..fc7a383acd 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdrdisc.robot
index bf9974ad55..df91176087 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdrdisc.robot
index 2eb3ae7734..648ec6aa55 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdrdisc.robot
index 3ef6e0474c..67ea90ed2e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdrdisc.robot
index 3aa0f972d0..e7a2e024b6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS
| ... | IACL | ACL1 | 10k_FLOWS
@@ -23,8 +22,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdrdisc.robot
index fc27dcc59d..030867998e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdrdisc.robot
index 73d5a1e93a..3ce8874a7a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdrdisc.robot
index a3cd4215b5..d919b933b3 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdrdisc.robot
index 2bb5910dfa..2668101267 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdrdisc.robot
index b421314cdb..f8190d4b0b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdrdisc.robot
index 98f3b445d4..6180435171 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdrdisc.robot
index 2f3031023b..d830638210 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot
index 0675f7517e..9ddbc5cdf2 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdrdisc.robot
index 64f033cd82..c7d559a132 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdrdisc.robot
index 3985aa066d..4f90ae81c9 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdrdisc.robot
index f1e25dff14..6fb76e7587 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdrdisc.robot
index 1f1f3b1e65..b9e412aeb5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdrdisc.robot
index bdb16aade7..76aeec1375 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdrdisc.robot
index 09fac074b9..8812a6a546 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdrdisc.robot
index 074c07cdcd..1386518512 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdrdisc.robot
index a03b5cc31b..0a99695f3a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdrdisc.robot
index 5bca34e36e..3f69563ec9 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdrdisc.robot
index c1bb104d6f..93986e8263 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdrdisc.robot
index 47b877ba4a..5776b55be3 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdrdisc.robot
index ef31d67e55..677cd6774f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdrdisc.robot
index b0a9f72730..51c96e764b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdrdisc.robot
index 3da5957ea7..b36525a7a7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdrdisc.robot
index d11a282d1a..170b1ca4c3 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdrdisc.robot
index f3d2004fcb..84c5ec344e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput IPv4 test cases with ACL*
| ...
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
index b82a356f1b..fdd9cf2c8f 100644
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
@@ -13,7 +13,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify.Classify
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
index 6ee98fbcc4..292d77e9a7 100644
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
@@ -13,7 +13,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Classify.Classify
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot
index 892dd0c45d..44f069934b 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot
index d9ffbc83c0..70482c06d3 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot
index 08ff2171cf..7451db04a7 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot
index 211ba98ad7..eef6514edd 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot
index 082d463f19..33494f3968 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot
index 2e2494ab52..88f715384c 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot
index 9eb4a01a7a..706af8cac3 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot
index c4c097e3fa..5f0fa2de99 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot
index 7c86c30fc2..687cb7f9f1 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot
index 5dd525bd10..42690465b1 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot
index 707a6f0bae..b60ad2c356 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot
index d8eef3b259..2ddd8e04c8 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot
index cf86045345..358df8c280 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot
index 926855df0c..e7defa5bd4 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot
index 692851a3a4..919bebe7f6 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot
index 82ae221812..0e2efe493d 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot
index 309473076b..61560b46b6 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot
index 750a423467..ad8d73e748 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot
index 04d732ea0f..b2cf19369b 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot
index cad8fdf328..1c0e75d090 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot
index ab7737f3df..40c128fcac 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot
index 76f615a9ae..f35b1cf974 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot
index cce003a6d5..dad81ada26 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot
index 83d3f839cd..c836431c67 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot
index 761d0b6bef..443d60f021 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot
index ea54c021ed..1c131f5698 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot
index 17f5366ad1..04f166704a 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot
index 729f83b998..9a6b2b0d66 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot
index 83cbcee8f9..972214b576 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot
index 6ed61e24ff..b43ee18f6d 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot
index 3120e641bc..0c87ed95c0 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot
index 84e02f2ce5..96ac214683 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot
index 5c4b4a5731..41cdfa9e78 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot
index eb9ef196d4..033b5030df 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot
index 59f72db0e3..b88447c6a3 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot
index 83ca36acd7..1ceb166816 100644
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot
+++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdrdisc.robot
@@ -23,8 +23,9 @@
| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ...
+| Test Teardown | Tear down performance test with ACL
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
| ...
| Documentation | *RFC2544: Packet throughput L2BD test cases with ACL*
| ...