aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-06-18 20:31:48 +0000
committerPeter Mikus <pmikus@cisco.com>2019-06-21 12:13:05 +0000
commit6871d4e7f6ed43ce0bb003cb08e88b2581a474eb (patch)
tree1ffdf006911d88de247d7dd0fc37818032c20461
parent8ded937abab242f2e096f83423e1dcecd1ecf722 (diff)
Align suite/test teardown/setup
+ Phase I - aligning FUNC/PERF Change-Id: I46b1e43687ddb29f5ed3c6335fe1baf21ec02822 Signed-off-by: Peter Mikus <pmikus@cisco.com>
-rw-r--r--resources/libraries/robot/crypto/ipsec.robot29
-rw-r--r--resources/libraries/robot/l2/l2_bridge_domain.robot37
-rw-r--r--resources/libraries/robot/performance/performance_setup.robot251
-rw-r--r--resources/libraries/robot/shared/default.robot39
-rw-r--r--resources/libraries/robot/shared/qemu.robot51
-rw-r--r--resources/libraries/robot/shared/suite_teardown.robot47
-rw-r--r--resources/libraries/robot/shared/test_teardown.robot127
-rw-r--r--resources/libraries/robot/vm/qemu.robot86
-rw-r--r--resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.sh2
-rw-r--r--tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot5
-rw-r--r--tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot5
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot5
-rw-r--r--tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot5
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot4
-rw-r--r--tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot4
-rw-r--r--tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot5
-rw-r--r--tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot5
-rw-r--r--tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot5
-rw-r--r--tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot5
-rw-r--r--tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot2
-rw-r--r--tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot2
-rw-r--r--tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot2
-rw-r--r--tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot2
-rw-r--r--tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot6
-rw-r--r--tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot3
-rw-r--r--tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot2
-rw-r--r--tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot2
-rw-r--r--tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot2
-rw-r--r--tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot2
-rw-r--r--tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot4
-rw-r--r--tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot4
-rw-r--r--tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot4
-rw-r--r--tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot4
-rw-r--r--tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot4
-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
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot6
-rw-r--r--tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot2
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot4
-rw-r--r--tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot4
407 files changed, 1008 insertions, 1438 deletions
diff --git a/resources/libraries/robot/crypto/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot
index b571fcd6ca..135881f83e 100644
--- a/resources/libraries/robot/crypto/ipsec.robot
+++ b/resources/libraries/robot/crypto/ipsec.robot
@@ -250,34 +250,5 @@
| | ...
| | [Arguments] | ${ip_version}
| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | Import Library | resources.libraries.python.VppConfigGenerator
-| | | ... | WITH NAME | ${dut}
-| | | Run keyword | ${dut}.Set Node | ${nodes['${dut}']}
-| | | Run keyword | ${dut}.Set Vpp Startup Conf Backup
-| | | Run keyword | ${dut}.Set Vpp Logfile | /tmp/vpp.log
-| | | Run keyword | ${dut}.Add Unix Nodaemon
-| | | Run keyword | ${dut}.Add Unix Log
-| | | Run keyword | ${dut}.Add Unix Coredump
-| | | Run keyword | ${dut}.Add Unix CLI Listen | /run/vpp/cli.sock
-| | | Run keyword | ${dut}.Add Unix Gid
-| | | Run keyword | ${dut}.Add Api Segment Gid
-| | | ${socket_id}= | Set Variable | ${0}
-| | | ${sw_dev_count}= | Set Variable | ${1}
-| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | aesni_mb | ${socket_id}
-| | | ... | ${sw_dev_count}
-| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | aesni_gcm | ${socket_id}
-| | | ... | ${sw_dev_count}
-| | Write startup configuration on all VPP DUTs
| | Set up VPP device test
| | Run Keyword | Configure topology for ${ip_version} IPsec testing
-
-| Tear down IPSec SW device functional test
-| | [Documentation]
-| | ... | Tear down IPSec SW device functional test.
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | Run keyword | ${dut}.Restore Config
-| | Tear down VPP device test
diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot
index b69d449a10..fda211508b 100644
--- a/resources/libraries/robot/l2/l2_bridge_domain.robot
+++ b/resources/libraries/robot/l2/l2_bridge_domain.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -202,41 +202,6 @@
| | ${mac}= | Get Interface Mac | ${dest_node} | ${dest_node_if}
| | Vpp Add L2fib Entry | ${vpp_node} | ${mac} | ${vpp_node_if} | ${bd_id}
-| Configure VM for vhost L2BD forwarding
-| | [Documentation] | Setup QEMU and start VM with two vhost interfaces.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node to start VM on. Type: dictionary
-| | ... | - ${sock1} - Socket path for first Vhost-User interface. Type: string
-| | ... | - ${sock2} - Socket path for second Vhost-User interface. Type: string
-| | ... | - ${qemu_name} - Qemu instance name by which the object will be
-| | ... | accessed (Optional). Type: string
-| | ...
-| | ... | _NOTE:_ This KW sets following test case variable:
-| | ... | - ${${qemu_name}} - VM node info. Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT1']} \
-| | ... | \| /tmp/sock1 \| /tmp/sock2 \|
-| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT2']} \
-| | ... | \| /tmp/sock1 \| /tmp/sock2 \| qemu_instance_2 \|
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_name}=vm_node
-| | Import Library | resources.libraries.python.QemuUtils | node=${dut_node} |
-| | ... | WITH NAME | ${qemu_name}
-| | Set Test Variable | ${${qemu_name}} | ${None}
-| | Run Keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock1}
-| | Run Keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock2}
-| | ${vm}= | Run keyword | ${qemu_name}.Qemu Start
-| | ${br}= | Set Variable | br0
-| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1}
-| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
-| | Linux Add Bridge | ${vm} | ${br} | ${vhost1} | ${vhost2}
-| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name
-| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name
-| | Set Interface State | ${vm} | ${br} | up | if_type=name
-| | Set Test Variable | ${${qemu_name}} | ${vm}
-
| Configure vhost interfaces for L2BD forwarding
| | [Documentation] | Create two Vhost-User interfaces on defined VPP node.
| | ...
diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 9350c65beb..3e27c18d6a 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -200,36 +200,6 @@
| | Set Suite Variable | ${dut2_if1_2}
| | Set Suite Variable | ${dut2_if2}
-| Tear down guest VM
-| | [Documentation]
-| | ... | Stop all qemu processes running on nodes.
-| | ...
-| | Run Keyword | vnf_manager.Kill All VMs
-
-| Tear down guest VM with dpdk-testpmd
-| | [Documentation]
-| | ... | Stop all qemu processes with dpdk-testpmd running on ${dut_node}.
-| | ... | Argument is dictionary of all qemu nodes running with its names.
-| | ... | Dpdk-testpmd is stopped gracefully with printing stats.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut_node - Node where to clean qemu. Type: dictionary
-| | ... | - dut_vm_refs - VM references on node. Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down guest VM with dpdk-testpmd \| ${node['DUT1']} \
-| | ... | \| ${dut_vm_refs} \|
-| | ...
-| | [Arguments] | ${dut_node} | ${dut_vm_refs}
-| | ${vms_number}= | Get Length | ${dut_vm_refs}
-| | ${index}= | Set Variable | ${0}
-| | :FOR | ${vm_name} | IN | @{dut_vm_refs}
-| | | ${vm}= | Get From Dictionary | ${dut_vm_refs} | ${vm_name}
-| | | ${index}= | Evaluate | ${index} + 1
-| | | Dpdk Testpmd Stop | ${vm}
-| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All
-
# Suite setups
| Set up 2-node performance topology with DUT's NIC model
@@ -581,20 +551,6 @@
| | Set Linux interface up | ${tg} | ${intf_name}
| | Install wrk | ${tg}
-# Suite teardowns
-
-| Tear down 2-node performance topology
-| | [Documentation]
-| | ... | Suite teardown phase with traffic generator teardown.
-| | ...
-| | Teardown traffic generator | ${tg}
-
-| Tear down 3-node performance topology
-| | [Documentation]
-| | ... | Suite teardown phase with traffic generator teardown.
-| | ...
-| | Teardown traffic generator | ${tg}
-
# Tests setups
| Set up performance test
@@ -656,210 +612,5 @@
| | Start VPP in all '${container_group}' containers
| | Restart VPP service on all DUTs | ${nodes}
| | Verify VPP on all DUTs | ${nodes}
+| | Save VPP PIDs
| | Append To List | ${container_groups} | ${container_group}
-
-# Tests teardowns
-
-| Tear down performance test
-| | [Documentation] | Common test teardown for performance tests.
-| | ...
-| | ... | TODO: Rename to "Tear down VPP performance test"?
-| | ... | most steps do not apply to DPDK nor other vswitch solutions.
-| | ... | TODO: Document at least some steps this keyword takes.
-| | ...
-| | ... | To save space in suites, this keyword does not accept
-| | ... | any explicit arguments. Instead, it requires few variables
-| | ... | to be defined in at least test scope.
-| | ...
-| | ... | *Test Variables needed:*
-| | ... | - frame_size - L2 Frame Size [B]. Type: integer
-| | ... | - traffic_profile - Profile name to run debug trial with. Type: string
-| | ... | - nodes - Parsed information object. Type: dict
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Set Test Variable \| \${frame_size} \| 64 \|
-| | ... | \| Tear down performance test \|
-| | ...
-| | Remove All Added Ports On All DUTs From Topology | ${nodes}
-| | Show PAPI History On All DUTs | ${nodes}
-| | Get Core Files on All Nodes | ${nodes}
-| | Set Test Variable | ${pkt_trace} | ${True}
-| | Run Keyword If Test Failed
-| | ... | Traffic should pass with no loss | ${perf_trial_duration} | 10000pps
-| | ... | ${frame_size} | ${traffic_profile} | fail_on_loss=${False}
-
-| Tear down performance test with container
-| | [Documentation]
-| | ... | Common test teardown for performance tests which uses containers.
-| | ...
-| | ... | TODO: Call Tear down performance test?
-| | ...
-| | :FOR | ${container_group} | IN | @{container_groups}
-| | | Destroy all '${container_group}' containers
-
-| Tear down performance test with vhost
-| | [Documentation] | Common test teardown for performance tests which use
-| | ... | vhost(s) and VM(s).
-| | ...
-| | Tear down performance test
-| | Show VPP vhost on all DUTs | ${nodes}
-| | Tear down guest VM
-
-| Tear down performance test with vhost and VM with dpdk-testpmd
-| | [Documentation] | Common test teardown for performance tests which use
-| | ... | vhost(s) and VM(s) with dpdk-testpmd.
-| | ...
-| | ... | *Test Variables needed:*
-| | ... | - frame_size - L2 Frame Size [B]. Type: integer
-| | ... | - traffic_profile - Profile name to run debug trial with. Type: string
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut1_node - Node where to clean qemu. Type: dictionary
-| | ... | - dut1_vm_refs - VM references on node. Type: dictionary
-| | ... | - dut2_node - Node where to clean qemu. Type: dictionary
-| | ... | - dut2_vm_refs - VM references on node. Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down performance test with vhost and VM with dpdk-testpmd \
-| | ... | \| ${node['DUT1']} \| ${dut_vm_refs} \
-| | ... | \| ${node['DUT2']} \| ${dut_vm_refs} \|
-| | ...
-| | [Arguments] | ${dut1_node}=${None} | ${dut1_vm_refs}=${None}
-| | ... | ${dut2_node}=${None} | ${dut2_vm_refs}=${None}
-| | ...
-| | Tear down performance test
-| | Show VPP vhost on all DUTs | ${nodes}
-| | Run keyword unless | ${dut1_node}==${None}
-| | ... | Tear down guest VM with dpdk-testpmd | ${dut1} | ${dut1_vm_refs}
-| | Run keyword unless | ${dut2_node}==${None}
-| | ... | Tear down guest VM with dpdk-testpmd | ${dut2} | ${dut2_vm_refs}
-
-| Tear down performance test with vhost and VM with dpdk-testpmd and ACL
-| | [Documentation] | Common test teardown for performance tests which use
-| | ... | vhost(s) and VM(s) with ACL and dpdk-testpmd.
-| | ...
-| | ... | *Test Variables needed:*
-| | ... | - frame_size - L2 Frame Size [B]. Type: integer
-| | ... | - traffic_profile - Profile name to run debug trial with. Type: string
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut1_node - Node where to clean qemu. Type: dictionary
-| | ... | - dut1_vm_refs - VM references on node. Type: dictionary
-| | ... | - dut2_node - Node where to clean qemu. Type: dictionary
-| | ... | - dut2_vm_refs - VM references on node. Type: dictionary
-| | ...
-| | [Arguments] | ${dut1_node}=${None} | ${dut1_vm_refs}=${None}
-| | ... | ${dut2_node}=${None} | ${dut2_vm_refs}=${None}
-| | ...
-| | Tear down performance test with vhost and VM with dpdk-testpmd
-| | ... | ${dut1_node} | ${dut1_vm_refs}
-| | ... | ${dut2_node} | ${dut2_vm_refs}
-| | Run Keyword If Test Failed | Vpp Log Plugin Acl Settings | ${dut1}
-| | Run Keyword If Test Failed | Run Keyword And Ignore Error
-| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
-
-| Tear down DPDK 2-node performance topology
-| | [Documentation]
-| | ... | Suite teardown phase with traffic generator teardown.
-| | ... | Cleanup DPDK test environment.
-| | ...
-| | ... | TODO: Add "Traffic should pass with no loss" with min rate
-| | ... | on failure, as in the VPP test teardown?
-| | ...
-| | Teardown traffic generator | ${tg}
-| | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
-
-| Tear down DPDK 3-node performance topology
-| | [Documentation]
-| | ... | Suite teardown phase with traffic generator teardown.
-| | ... | Cleanup DPDK test environment.
-| | ...
-| | ... | TODO: Add "Traffic should pass with no loss" with min rate
-| | ... | on failure, as in the VPP test teardown?
-| | ...
-| | Teardown traffic generator | ${tg}
-| | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | Cleanup DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
-
-| Tear down performance test with NAT
-| | [Documentation] | Common test teardown for performance \
-| | ... | tests with NAT feature used.
-| | ...
-| | ... | *Test Variables needed:*
-| | ... | - frame_size - L2 Frame Size [B]. Type: integer
-| | ... | - traffic_profile - Profile name to run debug trial with. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down performance test with NAT \|
-| | ...
-| | Tear down performance test
-| | Show NAT verbose | ${dut1}
-| | Show NAT verbose | ${dut2}
-
-| Tear down performance test with ACL
-| | [Documentation] | Common test teardown for performance \
-| | ... | tests with ACL feature used.
-| | ...
-| | ... | *Test Variables needed:*
-| | ... | - frame_size - L2 Frame Size [B]. Type: integer
-| | ... | - traffic_profile - Profile name to run debug trial with. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down performance test with ACL \|
-| | ...
-| | Tear down performance test
-| | Run Keyword If Test Failed | Vpp Log Plugin Acl Settings | ${dut1}
-| | Run Keyword If Test Failed | Run Keyword And Ignore Error
-| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
-
-| Tear down performance test with MACIP ACL
-| | [Documentation] | Common test teardown for performance \
-| | ... | tests with MACIP ACL feature used.
-| | ...
-| | ... | *Test Variables needed:*
-| | ... | - frame_size - L2 Frame Size [B]. Type: integer
-| | ... | - traffic_profile - Profile name to run debug trial with. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down performance test with MACIP ACL \|
-| | ...
-| | Tear down performance test
-| | Run Keyword If Test Failed | Run Keyword And Ignore Error
-| | ... | Vpp Log Macip Acl Settings | ${dut1}
-| | Run Keyword And Ignore Error
-| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
-
-| Tear down performance test with Ligato Kubernetes
-| | [Documentation] | Common test teardown for performance \
-| | ... | tests with Ligato Kubernetes.
-| | ...
-| | ... | TODO: Call Tear down performance test?
-| | ...
-| | Run Keyword If Test Failed
-| | ... | Get Kubernetes logs on all DUTs | ${nodes} | csit
-| | Run Keyword If Test Failed
-| | ... | Describe Kubernetes resource on all DUTs | ${nodes} | csit
-| | Delete Kubernetes resource on all DUTs | ${nodes} | csit
-
-| Tear down performance test with SRv6 with encapsulation
-| | [Documentation] | Common test teardown for performance \
-| | ... | tests with SRv6 with encapsulation feature used.
-| | ...
-| | ... | *Test Variables needed:*
-| | ... | - frame_size - L2 Frame Size [B]. Type: integer
-| | ... | - traffic_profile - Profile name to run debug trial with. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down performance test with SRv6 with encapsulation \|
-| | ...
-| | Tear down performance test
-| | Run Keyword If Test Failed | Show SR Policies on all DUTs | ${nodes}
-| | Run Keyword If Test Failed
-| | ... | Show SR Steering Policies on all DUTs | ${nodes}
-| | Run Keyword If Test Failed | Show SR LocalSIDs on all DUTs | ${nodes}
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 262dc02f55..b7e4a75773 100644
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -34,7 +34,10 @@
| Library | resources.libraries.python.topology.Topology
| ...
| Resource | resources/libraries/robot/shared/container.robot
-| Resource | resources/libraries/robot/vm/qemu.robot
+| Resource | resources/libraries/robot/shared/qemu.robot
+| Resource | resources/libraries/robot/shared/suite_teardown.robot
+| Resource | resources/libraries/robot/shared/test_teardown.robot
+
*** Keywords ***
| Configure all TGs for traffic script
@@ -421,6 +424,7 @@
| | ${duts}= | Get Matches | ${nodes} | DUT*
| | :FOR | ${dut} | IN | @{duts}
| | | Run keyword | ${dut}.Apply Config
+| | Save VPP PIDs
| | Enable Coredump Limit VPP on All DUTs | ${nodes}
| | Update All Interface Data On All Nodes | ${nodes} | skip_tg=${True}
@@ -434,8 +438,6 @@
| | :FOR | ${key} | IN | @{keys}
| | | ${pid}= | Get From Dictionary | ${setup_vpp_pids} | ${key}
| | | Run Keyword If | $pid is None | FAIL | No VPP PID found on node ${key}
-| | | Run Keyword If | ',' in '${pid}'
-| | | ... | FAIL | More then one VPP PID found on node ${key}: ${pid}
| | Set Test Variable | ${setup_vpp_pids}
| Verify VPP PID in Teardown
@@ -486,17 +488,6 @@
| | Update All Interface Data On All Nodes | ${nodes} | skip_tg_udev=${True}
| | Reset PAPI History On All DUTs | ${nodes}
-| Tear down VPP device test
-# TODO: Generalize this KW if it will not diverge from Functional derivate too
-# much
-| | [Documentation] | Common test teardown for vpp-device tests.
-| | ...
-| | Remove All Added Ports On All DUTs From Topology | ${nodes}
-| | Show Packet Trace on All DUTs | ${nodes}
-| | Show PAPI History On All DUTs | ${nodes}
-| | Vpp Show Errors On All DUTs | ${nodes}
-| | Verify VPP PID in Teardown
-
| Tear down LISP functional test
| | [Documentation] | Common test teardown for functional tests with LISP.
| | ...
@@ -508,19 +499,6 @@
| | Vpp Show Errors On All DUTs | ${nodes}
| | Verify VPP PID in Teardown
-| Tear down LISP functional test with QEMU
-| | [Documentation] | Common test teardown for functional tests with LISP and\
-| | ... | QEMU.
-| | ...
-| | Remove All Added Ports On All DUTs From Topology | ${nodes}
-| | Show Packet Trace on All DUTs | ${nodes}
-| | Show PAPI History On All DUTs | ${nodes}
-| | Show Vpp Settings | ${nodes['DUT1']}
-| | Show Vpp Settings | ${nodes['DUT2']}
-| | Vpp Show Errors On All DUTs | ${nodes}
-| | Tear down QEMU
-| | Verify VPP PID in Teardown
-
| Set up functional test with containers
| | [Documentation]
| | ... | Common test setup for functional tests with containers.
@@ -560,13 +538,6 @@
| | Start VPP in all '${container_group}' containers
| | Append To List | ${container_groups} | ${container_group}
-| Tear down functional test with container
-| | [Documentation]
-| | ... | Common test teardown for functional tests which uses containers.
-| | ...
-| | :FOR | ${container_group} | IN | @{container_groups}
-| | | Destroy all '${container_group}' containers
-
| Stop VPP Service on DUT
| | [Documentation] | Stop the VPP service on the specified node.
| | ...
diff --git a/resources/libraries/robot/shared/qemu.robot b/resources/libraries/robot/shared/qemu.robot
new file mode 100644
index 0000000000..1178fa93b4
--- /dev/null
+++ b/resources/libraries/robot/shared/qemu.robot
@@ -0,0 +1,51 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*** Settings ***
+| Library | resources.libraries.python.L2Util
+| Library | resources.libraries.python.InterfaceUtil
+
+*** Keywords ***
+| Configure VM for vhost L2BD forwarding
+| | [Documentation] | Setup QEMU and start VM with two vhost interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - ${dut_node} - DUT node to start VM on. Type: dictionary
+| | ... | - ${sock1} - Socket path for first Vhost-User interface. Type: string
+| | ... | - ${sock2} - Socket path for second Vhost-User interface. Type: string
+| | ... | - ${qemu_name} - Qemu instance name by which the object will be
+| | ... | accessed (Optional). Type: string
+| | ...
+| | ... | _NOTE:_ This KW sets following test case variable:
+| | ... | - ${${qemu_name}} - VM node info. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT1']} \
+| | ... | \| /tmp/sock1 \| /tmp/sock2 \|
+| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT2']} \
+| | ... | \| /tmp/sock1 \| /tmp/sock2 \| qemu_instance_2 \|
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_name}=vm_node
+| | Import Library | resources.libraries.python.QemuUtils | node=${dut_node} |
+| | ... | WITH NAME | ${qemu_name}
+| | Set Test Variable | ${${qemu_name}} | ${None}
+| | Run Keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock1}
+| | Run Keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock2}
+| | ${vm}= | Run keyword | ${qemu_name}.Qemu Start
+| | ${br}= | Set Variable | br0
+| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1}
+| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
+| | Linux Add Bridge | ${vm} | ${br} | ${vhost1} | ${vhost2}
+| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name
+| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name
+| | Set Interface State | ${vm} | ${br} | up | if_type=name
+| | Set Test Variable | ${${qemu_name}} | ${vm}
diff --git a/resources/libraries/robot/shared/suite_teardown.robot b/resources/libraries/robot/shared/suite_teardown.robot
new file mode 100644
index 0000000000..1b738eaeef
--- /dev/null
+++ b/resources/libraries/robot/shared/suite_teardown.robot
@@ -0,0 +1,47 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Keywords used in suite teardowns."""
+
+*** Settings ***
+| Library | resources.libraries.python.DPDK.DPDKTools
+| ...
+| Documentation | Suite teardown keywords.
+
+*** Keywords ***
+| Tear down suite
+| | [Documentation]
+| | ... | Common suite teardown for tests.
+| | ...
+| | ... | *Arguments:*
+| | ... | - ${actions} - Additional teardown action. Type: list
+| | ...
+| | [Arguments] | @{actions}
+| | ...
+| | :FOR | ${action} | IN | @{actions}
+| | | Run Keyword | Additional Suite Tear Down Action For ${action}
+
+| Additional Suite Tear Down Action For performance
+| | [Documentation]
+| | ... | Additional teardown for suites which uses performance measurement.
+| | ...
+| | Teardown traffic generator | ${tg}
+
+| Additional Suite Tear Down Action For dpdk
+| | [Documentation]
+| | ... | Additional teardown for suites which uses dpdk.
+| | ...
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Cleanup DPDK Environment
+| | | ... | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2}
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
new file mode 100644
index 0000000000..e30aa9f41e
--- /dev/null
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -0,0 +1,127 @@
+# Copyright (c) 2019 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Keywords used in test teardowns."""
+
+*** Settings ***
+| Documentation | Test teardown keywords.
+
+*** Keywords ***
+| Tear down test
+| | [Documentation]
+| | ... | Common test teardown for tests.
+| | ...
+| | ... | *Arguments:*
+| | ... | - ${actions} - Additional teardown action. Type: list
+| | ...
+| | [Arguments] | @{actions}
+| | ...
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
+| | Show PAPI History On All DUTs | ${nodes}
+| | Get Core Files on All Nodes | ${nodes}
+| | Verify VPP PID in Teardown
+| | :FOR | ${action} | IN | @{actions}
+| | | Run Keyword | Additional Test Tear Down Action For ${action}
+
+| Additional Test Tear Down Action For performance
+| | [Documentation]
+| | ... | Additional teardown for tests which uses performance measurement.
+| | ...
+| | Set Test Variable | ${pkt_trace} | ${True}
+| | Run Keyword If Test Failed
+| | ... | Send traffic at specified rate | ${perf_trial_duration} | 10000pps
+| | ... | ${frame_size} | ${traffic_profile}
+
+| Additional Test Tear Down Action For packet_trace
+| | [Documentation]
+| | ... | Additional teardown for tests which uses packet trace.
+| | ...
+| | Show Packet Trace on All DUTs | ${nodes}
+
+| Additional Test Tear Down Action For container
+| | [Documentation]
+| | ... | Additional teardown for tests which uses containers.
+| | ...
+| | :FOR | ${container_group} | IN | @{container_groups}
+| | | Destroy all '${container_group}' containers
+
+| Additional Test Tear Down Action For vhost
+| | [Documentation]
+| | ... | Additional teardown for tests which uses vhost(s) and VM(s).
+| | ...
+| | # TODO: Remove IF condition once devicetest is running KernelVM.
+| | Show VPP vhost on all DUTs | ${nodes}
+| | Run Keyword If | "PERFTEST" in @{TEST TAGS} | vnf_manager.Kill All VMs
+| | Run Keyword If | "DEVICETEST" in @{TEST TAGS} | vm_node.Qemu Kill
+
+| Additional Test Tear Down Action For nat
+| | [Documentation]
+| | ... | Additional teardown for tests which uses NAT feature.
+| | ...
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Show NAT verbose | ${nodes['${dut}']}
+
+| Additional Test Tear Down Action For namespace
+| | [Documentation]
+| | ... | Additional teardown for tests which uses namespace.
+| | ...
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Clean Up Namespaces | ${nodes['${dut}']}
+
+| Additional Test Tear Down Action For linux_bridge
+| | [Documentation]
+| | ... | Additional teardown for tests which uses linux_bridge.
+| | ...
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | :FOR | ${dut} | IN | @{duts}
+| | | Linux Del Bridge | ${nodes['${dut}']} | ${bid_TAP}
+
+| Additional Test Tear Down Action For acl
+| | [Documentation]
+| | ... | Additional teardown for tests which uses ACL feature.
+| | ...
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed | Run Keyword And Ignore Error
+| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+
+| Additional Test Tear Down Action For macipacl
+| | [Documentation]
+| | ... | Additional teardown for tests which uses MACIP ACL feature.
+| | ...
+| | Run Keyword If Test Failed | Run Keyword And Ignore Error
+| | ... | Vpp Log Macip Acl Settings | ${dut1}
+| | Run Keyword And Ignore Error
+| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+
+| Additional Test Tear Down Action For srv6
+| | [Documentation]
+| | ... | Additional teardown for tests which uses SRv6.
+| | ...
+| | Run Keyword If Test Failed
+| | ... | Show SR Policies on all DUTs | ${nodes}
+| | Run Keyword If Test Failed
+| | ... | Show SR Steering Policies on all DUTs | ${nodes}
+| | Run Keyword If Test Failed | Show SR LocalSIDs on all DUTs | ${nodes}
+
+| Additional Test Tear Down Action For ligato
+| | [Documentation]
+| | ... | Additional teardown for performance tests with Ligato.
+| | ...
+| | Run Keyword If Test Failed
+| | ... | Get Kubernetes logs on all DUTs | ${nodes} | csit
+| | Run Keyword If Test Failed
+| | ... | Describe Kubernetes resource on all DUTs | ${nodes} | csit
+| | Delete Kubernetes resource on all DUTs | ${nodes} | csit
diff --git a/resources/libraries/robot/vm/qemu.robot b/resources/libraries/robot/vm/qemu.robot
deleted file mode 100644
index 765a6cf398..0000000000
--- a/resources/libraries/robot/vm/qemu.robot
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*** Settings ***
-| Library | resources.libraries.python.IPUtil
-
-*** Keywords ***
-| Configure QEMU vhost and run it
-| | [Documentation]
-| | ... | Setup Qemu with 4 vhost-user interfaces and 4 namespaces.
-| | ... | Each call will be different object instance.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut_node - Node where to setup qemu. Type: dict
-| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
-| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
-| | ... | - sock3 - Socket path for third Vhost-User interface. Type: string
-| | ... | - sock4 - Socket path for forth Vhost-User interface. Type: string
-| | ... | - ip1 - IP address for namespace 1. Type: string
-| | ... | - ip2 - IP address for namespace 2. Type: string
-| | ... | - ip3 - IP address for namespace 3. Type: string
-| | ... | - ip4 - IP address for namespace 4. Type: string
-| | ... | - prefix_length - IP prefix length. Type: int
-| | ... | - qemu_name - Qemu instance name by which the object will be accessed.
-| | ... | Type: string
-| | ... | - mac_ID - MAC address ID used to differentiate qemu instances and
-| | ... | namespaces assigned to them. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Setup QEMU Vhost And Run\| {nodes['DUT1']} \| /tmp/sock1 \
-| | ... | \| /tmp/sock2 \| /tmp/sock3 \| /tmp/sock4 \| 16.0.0.1 \| 16.0.0.2 \
-| | ... | \| 16.0.0.3 \| 16.0.0.4 \| 24 \| qemu_instance_1 \| 06 \|
-| | ...
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${sock3} | ${sock4}
-| | ... | ${ip1} | ${ip2} | ${ip3} | ${ip4} | ${prefix_length}
-| | ... | ${qemu_name}=vm_node | ${mac_ID}=${None}
-| | ...
-| | Import Library | resources.libraries.python.QemuUtils \
-| | ... | node=${dut_node} | WITH NAME | ${qemu_name}
-| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock1}
-| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock2}
-| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock3}
-| | Run keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock4}
-| | ${vm}= | Run keyword | ${qemu_name}.Qemu Start
-| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1}
-| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
-| | ${vhost3}= | Get Vhost User If Name By Sock | ${vm} | ${sock3}
-| | ${vhost4}= | Get Vhost User If Name By Sock | ${vm} | ${sock4}
-| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name
-| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name
-| | Set Interface State | ${vm} | ${vhost3} | up | if_type=name
-| | Set Interface State | ${vm} | ${vhost4} | up | if_type=name
-| | Setup Network Namespace
-| | ... | ${vm} | nmspace1 | ${vhost1} | ${ip1} | ${prefix_length}
-| | Setup Network Namespace
-| | ... | ${vm} | nmspace2 | ${vhost2} | ${ip2} | ${prefix_length}
-| | Setup Network Namespace
-| | ... | ${vm} | nmspace3 | ${vhost3} | ${ip3} | ${prefix_length}
-| | Setup Network Namespace
-| | ... | ${vm} | nmspace4 | ${vhost4} | ${ip4} | ${prefix_length}
-| | Set Test Variable | ${${qemu_name}} | ${vm}
-
-| Tear down QEMU
-| | [Documentation]
-| | ... | Stop specific qemu instance running on DUT.
-| | ...
-| | ... | *Arguments:*
-| | ... | - qemu_name - Qemu instance by name. Type: string
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down QEMU \| qemu_node_1 \|
-| | ...
-| | [Arguments] | ${qemu_name}=vm_node
-| | ...
-| | Run Keyword | ${qemu_name}.Qemu Kill
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.sh b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.sh
index 092f6ef9f5..06b9923128 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.sh
+++ b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs.sh
@@ -67,5 +67,7 @@ for pci_addr in ${pci_whitelist[@]}; do
pci_idx=$(( pci_idx + 1 ))
;;
esac
+ rmmod i40evf
+ modprobe i40evf
fi
done
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index f81f3dd334..26b05c8378 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -14,9 +14,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
@@ -24,7 +21,7 @@
| ...
| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down DPDK 3-node performance topology
+| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
| ...
diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 09f207362c..d4c6c381a0 100644
--- a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -14,9 +14,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
@@ -24,7 +21,7 @@
| ...
| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down DPDK 3-node performance topology
+| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
| ...
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index 22e2080559..0f018b3f8f 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -14,9 +14,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
@@ -24,7 +21,7 @@
| ...
| Suite Setup | Set up DPDK 2-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down DPDK 2-node performance topology
+| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
| ...
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 84a6474f5d..ae5932e73f 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -14,9 +14,6 @@
*** Settings ***
| Resource | resources/libraries/robot/performance/performance_setup.robot
| Resource | resources/libraries/robot/dpdk/default.robot
-| Library | resources.libraries.python.topology.Topology
-| Library | resources.libraries.python.NodePath
-| Library | resources.libraries.python.InterfaceUtil
| Library | resources.libraries.python.DPDK.DPDKTools
| ...
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA
@@ -24,7 +21,7 @@
| ...
| Suite Setup | Set up DPDK 2-node performance topology with DUT's NIC model
| ... | L3 | ${nic_name}
-| Suite Teardown | Tear down DPDK 2-node performance topology
+| Suite Teardown | Tear down suite | performance | dpdk
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
index beaff76e25..8fad8c64d7 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
index c71b450d71..cfa9cbc395 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
index 66cdeeb3c0..78ee42f67e 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
index 5b69c974da..a3a9c08e1c 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
index 5c7bbf7e56..99e5deee91 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2bdbasemaclrn-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
index 06771d233d..ca72c311b8 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-1drcl2xc-1paral-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
index 350db05e96..e018bf1146 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-2drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
index 0d8916151f..4be47e61fd 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-2memif-4drcl2xc-1horiz-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
index b3344f210c..66c47034ae 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-4memif-2drcl2xc-1chain-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
index 6072680664..2cfc9bd1b4 100644
--- a/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
+++ b/tests/kubernetes/perf/container_memif/10ge2p1x710-eth-1drcl2xcbase-eth-8memif-4drcl2xc-1chain-k8s-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test with Ligato Kubernetes
-| Test Teardown | Tear down performance test with Ligato Kubernetes
+| Test Teardown | Tear down test | ligato
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
index ac1251be3e..b504507a25 100644
--- a/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
@@ -23,10 +23,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down functional test with container
-| ... | AND | Tear down VPP device test
-| ... | AND | Show Memif on all DUTs | ${nodes}
+| Test Teardown | Tear down test | packet_trace | container
| ...
| Documentation | *L2 bridge-domain test cases with memif interface*
| ...
diff --git a/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot
index 0c4ec0e5f9..1d1fb15722 100644
--- a/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot
@@ -23,10 +23,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down functional test with container
-| ... | AND | Tear down VPP device test
-| ... | AND | Show Memif on all DUTs | ${nodes}
+| Test Teardown | Tear down test | packet_trace | container
| ...
| Documentation | *L2 cross-connect test cases with memif interface*
| ...
diff --git a/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot
index 7fcf754ee5..2db7a79030 100644
--- a/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot
@@ -26,10 +26,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down functional test with container
-| ... | AND | Tear down VPP device test
-| ... | AND | Show Memif on all DUTs | ${nodes}
+| Test Teardown | Tear down test | packet_trace | container
| ...
| Documentation | *IPv4 routing test cases with memif interface*
| ...
diff --git a/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot
index fcf1ce0658..a6d3c8c8b8 100644
--- a/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot
@@ -25,10 +25,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down functional test with container
-| ... | AND | Tear down VPP device test
-| ... | AND | Show Memif on all DUTs | ${nodes}
+| Test Teardown | Tear down test | packet_trace | container
| ...
| Documentation | *IPv4 routing test cases with memif interface*
| ...
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot
index 6983b079eb..8eec787f84 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot
@@ -19,7 +19,7 @@
| ...
| Test Setup | Set up IPSec SW device functional test | IPv4
| ...
-| Test Teardown | Tear down IPSec SW device functional test
+| Test Teardown | Tear down test | packet_trace
| ...
| Documentation | *IPv4 IPsec tunnel mode test suite.*
| ...
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot
index 3355ca0667..9b545933ed 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot
@@ -19,7 +19,7 @@
| ...
| Test Setup | Set up IPSec SW device functional test | IPv4
| ...
-| Test Teardown | Tear down IPSec SW device functional test
+| Test Teardown | Tear down test | packet_trace
| ...
| Documentation | *IPv4 IPsec transport mode test suite.*
| ...
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot
index d17d94b5ed..b0fd6c3823 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot
@@ -19,7 +19,7 @@
| ...
| Test Setup | Set up IPSec SW device functional test | IPv6
| ...
-| Test Teardown | Tear down IPSec SW device functional test
+| Test Teardown | Tear down test | packet_trace
| ...
| Documentation | *IPv6 IPsec tunnel mode test suite.*
| ...
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot
index 36724ff007..e65b89122d 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot
@@ -19,7 +19,7 @@
| ...
| Test Setup | Set up IPSec SW device functional test | IPv6
| ...
-| Test Teardown | Tear down IPSec SW device functional test
+| Test Teardown | Tear down test | packet_trace
| ...
| Documentation | *IPv6 IPsec transport mode test suite.*
| ...
diff --git a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
index f7a0fbe153..0cd3dc82ec 100644
--- a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
@@ -30,9 +30,7 @@
| Test Setup | Run Keywords | Set up VPP device test
| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
| ...
-| Test Teardown | Run Keywords | Tear down VPP device test
-| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
-| ... | AND | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP}
+| Test Teardown | Tear down test | packet_trace | namespace | linux_bridge
| ...
| Documentation | *Tap Interface Traffic Tests*
| ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
@@ -87,4 +85,4 @@
| | And Add interface to bridge domain | ${dut_node}
| | ... | ${dut_to_tg_if2} | ${bid_from_TG} | 0
| | Then Send ICMP packet and verify received packet | ${tg_node}
-| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} \ No newline at end of file
+| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
diff --git a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot
index 47de572b18..24d0cdd44a 100644
--- a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot
@@ -31,8 +31,7 @@
| Test Setup | Run Keywords | Set up VPP device test
| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
| ...
-| Test Teardown | Run Keywords | Tear down VPP device test
-| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
+| Test Teardown | Tear down test | packet_trace | namespace
| ...
| Documentation | *Tap Interface Traffic Tests*
| ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot
index 7c9c302da6..34429c61ff 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot
@@ -22,7 +22,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Tear down VPP device test
+| Test Teardown | Tear down test
| ...
| Documentation | *IPv4 routing test cases*
| ...
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot
index eca76cb2e3..1145ff9461 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot
@@ -22,7 +22,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Tear down VPP device test
+| Test Teardown | Tear down test
| ...
| Documentation | *IPv6 routing test cases*
| ...
diff --git a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot
index 24c46c571d..616f8c6503 100644
--- a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot
@@ -24,7 +24,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Tear down VPP device test
+| Test Teardown | Tear down test
| ...
| Documentation | *L2 bridge-domain test cases*
| ...
diff --git a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot
index 47e3d9695a..ff1ef411fa 100644
--- a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot
+++ b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot
@@ -22,7 +22,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Tear down VPP device test
+| Test Teardown | Tear down test
| ...
| Documentation | *L2 cross-connect test cases*
| ...
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
index 3a24c6dce9..9c9bd39de5 100644
--- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
@@ -32,9 +32,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down QEMU
-| ... | AND | Tear down VPP device test
+| Test Teardown | Tear down test | packet_trace | vhost
| ...
| Documentation | *IPv4 routing test cases with vhost user interface*
| ...
diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot
index 508e628729..3f71f831c4 100644
--- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot
@@ -32,9 +32,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down QEMU
-| ... | AND | Tear down VPP device test
+| Test Teardown | Tear down test | packet_trace | vhost
| ...
| Documentation | *IPv4 routing test cases with vhost user interface*
| ...
diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
index b2700042f5..30ad621eba 100644
--- a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
@@ -22,9 +22,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down QEMU
-| ... | AND | Tear down VPP device test
+| Test Teardown | Tear down test | packet_trace | vhost
| ...
| Documentation | *L2 bridge-domain test cases with vhost user interface*
| ...
diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
index fb59971d70..b610a6cb29 100644
--- a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
@@ -26,9 +26,7 @@
| ...
| Test Setup | Set up VPP device test
| ...
-| Test Teardown | Run Keywords
-| ... | Tear down QEMU
-| ... | AND | Tear down VPP device test
+| Test Teardown | Tear down test | packet_trace | vhost
| ...
| Documentation | *L2 cross-connect test cases with vhost user interface*
| ...
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index be7d3a8a09..8125605bc1 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
index d7b7d6a1b9..bb6e551a70 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
index 363450820c..6ff0a962d4 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index b44bf23e67..86e7d9aebe 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
index e245660aaa..49c5313cde 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index bd19bdac93..1c4a2a2b50 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index c5dd6a71bb..a2948f6673 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 641080d924..cfcabc7ebd 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index 81b7acd313..b3c16b0022 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index 0440f067e9..a0f2ac6bb4 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -21,12 +21,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 3afae064ae..9dd4fd0fc1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index c80ebad683..cbac46185b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 43ad65f4e2..6e5069aa00 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 1fa6637610..a3a2b8c627 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index e0d85de856..74fa143cd5 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 108a5ccfb0..8e9a3b6774 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index cd754c8376..4deb357c98 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index 368a99618c..e57b5e601e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index c11e6d9792..029428b551 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 3fa0298fe8..f6e0510ca2 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 739514ffff..e13a1dcf72 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index b7d10ba19f..5e4201d274 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index b316ca4664..e57d072235 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index c9c9f1e50b..ded1eaff4a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 5ec98f7b65..db5bde5c60 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 618aa091aa..aad42b8fa7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index d643e223d5..efaecb7e96 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 21bf7d491d..c8ce30fa9e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index 379fd16fe8..5b24b71993 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index 33638c2b56..36f7e72b31 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index fda54a9aed..c99ceb9ecb 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 88bab1ce2d..09a27f4238 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 98c1364905..c1b7146733 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 8c19c10663..30b7d76b30 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index bc1e42030c..0a75cb54d7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index bef8f19cec..3ef24092f0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index d595123908..bf20f422c7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index 8239c81358..c901a23d35 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | HW_DH895xcc
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 6d52cfd697..010326bc79 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index d5dc38563f..becd08e918 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 964bdb4888..daab33fb3c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index f725109b53..124f19a32d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -21,10 +21,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index ed24811e6f..67231351d3 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 7329b3c97f..0faaec4f6c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 768dbabd63..5f949177d8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 5c052c5707..adf3d9b536 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index a456422b9d..0cf9f1b798 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 2f7421ddde..5bc274e934 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index 9909992e38..f0f0fcc869 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index ec9e6ee4d4..ef9f021a31 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 51f09bfeaf..3e7101673d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 132a2633af..4cc9b480ea 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 89e026312b..330483a3ac 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 3f6a59aadf..11bdaf2787 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index bb7524574c..1df2e6fbcb 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 66422d055d..777059474c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index f13ac51389..ad1364ecba 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 61f66a48d7..e998af634f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 480a72be46..05a229b09b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 3cce1391f6..a3c88cc4d8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 99557cdf65..539a048e75 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 595970b53b..fbe0949c22 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -22,10 +22,10 @@
| Suite Setup | Run Keywords
| ... | Set up IPSec performance test suite | L3 | ${nic_name} | SW_cryptodev
| ... | AND | Set up performance test suite with crypto ipsecmb
-| 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/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
index e291548231..9cca8dd126 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
@@ -23,10 +23,10 @@
| ...
| Suite Setup | Set up IPSec performance test suite | L3 | ${nic_name}
| ... | HW_DH895xcc
-| 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-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
| ...
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
index 5af3f9d8cd..c975bfe279 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
index 4f7ba5e738..30305a3fba 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
index 91d251ddcc..bb63138137 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
index dc8eed699e..d265e6b677 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
index b5ff0b6c56..d5067061de 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
@@ -21,10 +21,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_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
index 99d40c603d..427018a5c5 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
@@ -21,10 +21,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_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
index 06d91353db..03301cf601 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
index 1d496eb2cd..bc24674711 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
index 91a80e6a0e..ccec825157 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-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/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
index bd2db15bcd..c18607f9ce 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-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/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
index 3895b44b78..0146503e4e 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-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/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index 00f6d02df9..4f8da1071e 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-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/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index f141e7eebb..adc3b1036b 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-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/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index 4d16159f1e..ed6b0eba2f 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-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/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index be8f8ea228..1ca96ebfdb 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-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/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
index e592d252ca..51f7496b28 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-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/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index 3446c43fce..a52ad238dd 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-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/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index cea7f81be6..f8b99d8c99 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-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/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index a080c07fcb..ea17fd68b6 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-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/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index 08829a4cda..35eb4e7924 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-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/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
index f3533d81c7..5ce751609e 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
@@ -21,10 +21,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/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
index 97aa15b255..20955e69aa 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
@@ -21,11 +21,11 @@
| ...
| 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/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
index 9e84f1e1f9..486ee2dec9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -21,10 +21,10 @@
| ... | Set up SRIOV 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
index 0043717279..69a9b1fe94 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
@@ -21,10 +21,10 @@
| ... | Set up SRIOV 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
index 307261e5b2..ceced189a0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
@@ -21,10 +21,10 @@
| ... | Set up SRIOV 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
index 579ce172e8..19970535c1 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 88368d8954..89f72fedb3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index a2c8a8ef52..e3ad0a4347 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
index 55dd104a5b..037e85bdde 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
index eb6f6149be..9d6347d964 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
index e867488d9d..470d960353 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
index 57b8824f75..aaf9a15417 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
index e0b17c6245..97bc9965db 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
index c19feb63a3..8e7a7f9d15 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
index 26a72316cb..11c5ecd378 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
index f785a67648..fa9af5deb0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
index 7a29f318d5..9ab31ea38a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
index 853e1970ec..72ed8325a0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
index 9b65dc3499..9710fc007a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
index 290939c9e5..70514d6471 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
index f81ed549d1..44e9a93ce4 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
index dd7488e411..c987aba83b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
index a923984e0c..05be52cd53 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
index 57ca2aeda1..b04df6b0ed 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
index 4d4d3b35fb..4b86f3e4c6 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
index c4d480208b..93eccdb2a7 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
index ef21ac70d2..f76c1dd419 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
index 2393f3ead9..caa52e1365 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
index 0d8c6f050f..cce8015a71 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
index bfdfe080a2..2e68b77e9c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
index bd7b9b5811..313c3d1e23 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
index 6423db5f8b..0f3601c593 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
index 2a22b42709..aa9ccaa398 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
index 691dffc264..16081910a8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
index 81eb8cac3d..9a77d1221e 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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 MACIP ACL
+| Test Teardown | Tear down test | performance | macipacl
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index c8dca2972d..6538cf2ea8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
index 4698fa507a..95d2506da1 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
index 7a6e05fcb2..6581055498 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
index ba03f5f102..8d773c347b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
index e4ea4637cf..e5e4171c24 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
index be2ed0fb65..c7ad073d8c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
index f7da6c33e6..d3b0c62673 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
index 6dce6f23de..dc4544f97a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
index 1ad26d46eb..524ea58573 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
index a741c0b523..16843bec3b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
index 67c7d2f15e..ce7adbef64 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
index cb2876414c..48f58ce3d1 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
index 130b49ca2a..fbf1d930e5 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
index 27337a8c13..40f0014adc 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
index 67eba59333..475faf66d7 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
index 6157671d6f..2f4fc064d0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
index f8b9a19637..dc2c1980c8 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
index 2d44f26586..1012f30649 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
index a8f28a734a..88eb466ee9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
@@ -22,10 +22,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${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/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index 7d18fbbbdd..2b962cf5fe 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index ae36ee99d9..b881f75a94 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index bb16519392..6336036744 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
index fb440c873d..02ff85b44d 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index bf22459b2a..7bb18fe6d2 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
index 489edd2dc0..595ca05187 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -21,10 +21,10 @@
| ... | Set up SRIOV 2-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name} | AVF
| ... | AND | Set up performance test suite with AVF driver
-| 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/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
index 97ab9892c2..2aca6084b7 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
@@ -21,10 +21,10 @@
| ... | Set up SRIOV 2-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name} | AVF
| ... | AND | Set up performance test suite with AVF driver
-| 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/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
index 82c10d1cb0..c5838066c9 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
@@ -21,10 +21,10 @@
| ... | Set up SRIOV 2-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name} | AVF
| ... | AND | Set up performance test suite with AVF driver
-| 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/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 683c181be5..804b5155f2 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index 428a201e3f..83810afed1 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index 5e395e4d72..fc5825f01b 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index da147b89d0..7d4427a47c 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index 40d5c1e8bf..da9d518199 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index 4fdfbc7636..a6e07711ed 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
index 656f6942c2..a3c14d1dbf 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index 9bc6278e2c..c6f36c2d5e 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${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/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
index c62ed1da48..6e0c830a21 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
index 409dc2352d..031875ecae 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
index 8a8d863d46..c6e8610939 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
index 62265e6109..3cf4a3bf25 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
index a75068fc20..a8c54c5e38 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index fcecfccb02..63d12ddf30 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 5bbea2a7ce..72b743bbc1 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
index bd5ac3248e..6557ed2417 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
index 7ed3535430..5206b9793b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
index 7b78a43fa5..874774ca77 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
index 0882d63d98..3faeedcdf8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
index 043c3296e6..7c664f8e6d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
index 353dd59c83..68df070a40 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index 00d5bfa384..d9fdfb219a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index 8e9dbd1e8c..5e7ca55585 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 18dfe4393f..6993ecc006 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 8613bb70b6..12ad91f8e3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
index 6daa2319fd..608b52843c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
index 919205a45c..713ce667b6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index 0da06ad980..4a12911bef 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index f6322bd43b..8f0f02d57e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
index 19b39d35a8..2d08829575 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
index d97c963a1b..7f455b204f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
index 574018cc15..ee0c4f0de9 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index 7a179af1a0..c59f15eef6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index b977a60bff..01c4e549b4 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 48c649ad7a..5c892a1d34 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 067fd37e28..af4ea8cb8c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index 3b201e07e0..5bee75e479 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index 08256b8832..a1f800055d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
index 64e624e1d8..dee3b57402 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index 77814496d8..cc23fee17f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index 6f47eed0f9..8704e127ff 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
index f84edae7cb..d5ea7c3d93 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
index 9d59f4c1be..e87c1f7b2e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
index 7d904b727f..dca004f8b4 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
index c866074bc0..c26e767a78 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
index 7ab0cb3cfe..cb26a5acd2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 974a0489e3..fd8bbf4a2f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index b10ebe5d3e..ba33f01e35 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index 0789452c3d..9cdfca51e8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index e63bc8933d..b6f37a7106 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
index 69e6a381f9..2caf3e27ba 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
index 8622f0ba95..75bfd54616 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
index 31c8a9da53..186c747f05 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
index 03e3fe6d71..772bb258f5 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
index e76e69892a..cdc380ea90 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
index 67738aef6c..08cf03e7d1 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
index 5fb0d8a32c..cbd54a6e4a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
index fcc0be980e..95573205e2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
index 05f6dd621b..7c58b82a0f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
index 17750167fb..c65a8d95ee 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
index 9066c51236..b742015164 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
index 86f8bf8eea..f95f35033d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
index f8ba6fd723..3dcbf0b970 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
index ba4aa235e9..eae7579dfe 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
index 9fab19ecbb..b1d9f2061c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
index da4487ccb2..7ed1e1d1b0 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
index df0e15480f..d06621c38f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
index 0b58ec9aa1..f8a4e90bfc 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
index 98f0e875bc..0bdafaad0e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
index c1dffbd2dc..6684029234 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
index 16bcf0a31b..6c9ec1d4ca 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
index d0a6c35509..236b90412a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
index 6be96b8bb7..78fcc0d997 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
index 348340788a..6c55770909 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
index eb3fc8e872..c15cb5b23e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
index fb60376f30..176ae6c050 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
index 86041272c2..df2a6d77d3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
index aa1003e85e..b61854c7dc 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
index 771b5ab577..8d4c2ce270 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
index df9485707a..7caa47c404 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
index 83e6840045..4c29f46f18 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
index 0a96dfb68f..9d875c558b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
index 3d67127e55..faba715ba6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
index 252705e437..f9da8a72bf 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
index d0bf36e7da..68636a1381 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
index 752f6fd6d9..e52e844676 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
index aec6c725f2..c03d7dbf5d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
index f98e355a44..0977159b2d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
index 413b48467d..774c217109 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
index 7330ecc688..2291fecaa6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
index fdc151b4f5..9df5dbf97c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
index a7ac595d28..8c0b8efd77 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -22,12 +22,10 @@
| ... | Set up 2-node performance topology with DUT's NIC model | L3
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
index 99c5cda637..9ff608e534 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
index ec2c0aada8..ca67ba58f0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
index 87a1cd0e99..adfa4d77bc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
index ae78f0b1db..6666848235 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
index b6cd526a48..eb617db740 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 1bff538e49..6827892941 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 8cdff1aa72..767a47e0bd 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
index eda55f4130..e5d47c7710 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
index 934082fb53..36cd6ff922 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
index 8200434094..5d29031d74 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
index 01a992c2dd..048f151cc4 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
index e2b5f3de9f..2040813434 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
index 6e787a23d9..fc69e493bd 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 857989e6bd..2fc1d83c6b 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
index 2e61dc5be5..012597e90d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 0aa8e8923b..b9a3205665 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 9de7998ec0..14eec5f949 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
index 3915b39100..ac6a5db28d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
index 1f76412b18..095a8e4d7b 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 2d80164991..2348d22111 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 0fb2ce1603..dc37db1bcb 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
index 577aff18b2..49b1af04b0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
index 5257ff08b5..486671b274 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
index b9c6dd7537..cbb7762422 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 9a035a27fc..4baee04510 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
index e621e502b9..a390d0d1a5 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 923af98cf6..e448aa1b89 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
index c841a90739..197288c564 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 400bd2274c..94eadb5e73 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
index f6569d5712..481756c1ab 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
index bfe490ff60..6992469663 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 20d99015ea..597028af56 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
index eb696acc6b..28bd12e94d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
index 36e69e6e64..5177703a98 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
index 9e6d7b8cf5..3a80c9ea21 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
index 00ce5360ff..ded92e8991 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
index 2daeae488a..b68a87e93e 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
index accf7de908..4ac55071f6 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 0459689ea9..b7543868cc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 7da25a3ab5..6b55e552a0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 4bbdacaead..54b54587cc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 73fdb5495e..d16671ae73 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-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 with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
index cc6fd3aa7e..8e36a25b88 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-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 with SRv6 with encapsulation
+| Test Teardown | Tear down test | performance | srv6
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
index bbcd155960..0cf678fa65 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-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 with SRv6 with encapsulation
+| Test Teardown | Tear down test | performance | srv6
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
index 8a96b69bef..5843dcb203 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-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 with SRv6 with encapsulation
+| Test Teardown | Tear down test | performance | srv6
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
index d05e271d64..52d7b3e0fb 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
@@ -23,12 +23,10 @@
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Dynamic SRv6 proxy
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test with SRv6 with encapsulation
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | srv6 | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
index 43d5785a21..237162c21f 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
@@ -23,12 +23,10 @@
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Masquerading SRv6 proxy
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test with SRv6 with encapsulation
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | srv6 | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
index 3997f7e267..637eccee1b 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
@@ -23,12 +23,10 @@
| ... | ${nic_name}
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Static SRv6 proxy
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite | performance
| ...
| Test Setup | Set up performance test
-| Test Teardown | Run Keywords
-| ... | Tear down performance test with SRv6 with encapsulation
-| ... | AND | Tear down performance test with container
+| Test Teardown | Tear down test | performance | srv6 | container
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
index 6239771520..c597b085ab 100644
--- a/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
+++ b/tests/vpp/perf/tcp/10ge2p1x520-ethip4tcphttp-httpserver.robot
@@ -24,7 +24,7 @@
| ... | Intel-XL710
| ...
| Test Setup | Set up tcp performance test
-| Test Teardown | Tear down performance test
+| Test Teardown | Tear down test
| ...
| Test Template | Local template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 6040a320f2..765b792993 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -23,10 +23,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with LACP mode link bonding
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 8807dc5184..d2b3424fa0 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -23,10 +23,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | ${nic_name}
| ... | AND | Set up performance test suite with LACP mode link bonding
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 05925de881..5fb6e0825e 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -23,10 +23,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model with double link between DUTs
| ... | L2 | ${nic_name}
| ... | AND | Set up performance test suite with LACP mode link bonding
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 5265c18f58..162703062c 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -23,10 +23,10 @@
| ... | Set up 3-node performance topology with DUT's NIC model with double link between DUTs
| ... | L2 | ${nic_name}
| ... | AND | Set up performance test suite with LACP mode link bonding
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index ea2a5834c2..bb42889dac 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 76c613a6cb..1b3aaa24e7 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index ae426fe86d..97f5715f65 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 1a01032153..4672a448a1 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index b3f36830ae..9e51895c63 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-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
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 501917e273..35977e8f19 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 3-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 43d14cdfde..91ba3c2246 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -20,10 +20,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index aaecbb665a..e545a48356 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index e855acad8c..1ac2fdf2a3 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -19,10 +19,10 @@
| ...
| Suite Setup | Set up 2-node performance topology with DUT's NIC model
| ... | L2 | ${nic_name}
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Teardown | Tear down suite
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index ab3350278f..b85195f0f8 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-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
| ...
| Test Setup | Set up performance test
-| Test Teardown | Tear down performance test with vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
index 27ef3203dc..432fc277f6 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-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 vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
index 8e30354eb3..40724effd8 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-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 vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...
diff --git a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
index 4e5d4df008..ffbf4ab3aa 100644
--- a/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-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 vhost
+| Test Teardown | Tear down test | performance | vhost
| ...
| Test Template | Local Template
| ...