aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp/perf/ip4
diff options
context:
space:
mode:
Diffstat (limited to 'tests/vpp/perf/ip4')
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot4
63 files changed, 126 insertions, 126 deletions
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot
index 6d479f1faa..02de950c68 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot
@@ -21,10 +21,10 @@
| ... | Set up SRIOV 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name} | AVF
| ... | AND | Set up performance test suite with AVF driver
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
index 6430a9e866..047265511f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
index 3ba1bd3637..3df2710882 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
index 3c16e8a652..9c0be701d7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
index 4c73ad85cc..0d7e90b6e1 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
index 52a8bae942..fb4a7b4c6d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
index ab1d55015b..e9c38b92eb 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
index 700c149fcc..5d5e43aa52 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
index d01bfd9ee0..100f6aecf5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
index fd5cab0d64..e6e05e8183 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
index 81fc3822db..a1a8ea182d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
index df1fb0d73d..e273aecfb2 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
index a3cf1cf8c8..4b5f14b065 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
index 7a8652a506..0e9f24ea43 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
index af738e54c2..e5f28d21ff 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
index e1cfb60425..3531592fe7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
index a4b6f76bd4..f1f4095464 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
index b1e33c3aa2..76163dac5e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
index 49458e0e45..402290d6f6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
index 9bcb56d427..4a813259b1 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
index 0cbfb3145f..510d06d0e9 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
index 616594d17f..dea93d15f0 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
index cad54491ae..7245b54dd5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
index 5f496a9762..3264aff08a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
index 61d02deb82..ca8d17739c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
index 8a7321d846..29cd2330ba 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
index 9e61adfc27..06d8455ceb 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
index 79fa941d25..3c7a7f259b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
@@ -23,10 +23,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
index 1b95fe7b6b..c31d0f34dc 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
index 0ecb07410f..05cccd0a3c 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
index 925b2a13f5..8a169dcfd6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
index a41b44107a..a39e028dd8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
index a1384f733b..423183c686 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
index b8fce13b7b..10fc55d3cf 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
index 3d40e72da7..bcb2307146 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
index 4032f8d320..c42b93bb1f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
index 659dfb2012..7f7221054f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
index d87bb3892d..6f3be8a12e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
index 36e12eccf1..54dd79a38f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
index 9cc36e0ec9..e2ecdf4998 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
index 6e2d5be2fc..7da80ee6da 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
index ce97d755aa..5c0c57d993 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
index 9953340348..9ed6e3d45f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
index 2a9a2e09cb..4415146918 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
index b5235cb9df..d8a3e1afd3 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
index 28536a6b6f..ac9aa80d80 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with ACL
+| Test Teardown | Tear down test | performance | acl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
index 9eb3e410b6..5fd4446939 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
@@ -25,10 +25,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with NAT
+| Test Teardown | Tear down test | performance | nat
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
index b5e4edf8d9..f4b8b0fa5a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
@@ -24,10 +24,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with NAT
+| Test Teardown | Tear down test | performance | nat
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
index 52dccc39ff..8884d987ef 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
@@ -24,10 +24,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with NAT
+| Test Teardown | Tear down test | performance | nat
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
index 051b61b822..a32faceab5 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
@@ -24,10 +24,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
index f5cd4ea119..7f9b5947d7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
@@ -24,10 +24,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with NAT
+| Test Teardown | Tear down test | performance | nat
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
index 740264f796..deec73bc10 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
@@ -24,10 +24,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with NAT
+| Test Teardown | Tear down test | performance | nat
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
index d44754fc5d..af7e7e904e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
@@ -20,10 +20,10 @@
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
| ...
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
index 2a2266385b..7ab9466c67 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
index 41a6a33730..b293dd5479 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
index 2a6abde19a..2c731a1f74 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
index 101db22eb6..4b7bc0b2b8 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
index ba5e41d3c6..c2aa5ad559 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
index 444cc507ee..f41fc5fc52 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
index d1ba554c80..f5bf746d08 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
index 4c42e50f94..c2ef6423e7 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
index 8cc16c671b..9eadef6b6f 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
index a697e1639c..88d0848018 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
@@ -23,10 +23,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test | performance
| ...
| Test Template | Local Template
| ...