Align suite/test teardown/setup

+ Phase I - aligning FUNC/PERF

Change-Id: I46b1e43687ddb29f5ed3c6335fe1baf21ec02822
Signed-off-by: Peter Mikus <pmikus@cisco.com>

18 files changed, 19 insertions, 42 deletions

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*
 | ...