CSIT-465: Common test setup and teardown

[csit.git] / tests / func / l2_xconnect / l2_xconnect_untagged.robot

diff --git a/tests/func/l2_xconnect/l2_xconnect_untagged.robot b/tests/func/l2_xconnect/l2_xconnect_untagged.robot
index 05da053..2554007 100644 (file)
--- a/tests/func/l2_xconnect/l2_xconnect_untagged.robot
+++ b/tests/func/l2_xconnect/l2_xconnect_untagged.robot
@@ -22,8 +22,8 @@
 | Library  | resources.libraries.python.Trace
 | Library | resources.libraries.python.NodePath
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV
-| Test Setup | Setup all DUTs before test
-| Suite Setup | Setup all TGs before traffic script
+| Test Setup | Func Test Setup
+| Test Teardown | Func Test Teardown
 | Documentation | *L2 cross-connect test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with
@@ -63,7 +63,6 @@
 | | When All Vpp Interfaces Ready Wait | ${nodes}
 | | Then Send and receive ICMPv4 bidirectionally
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
-| | [Teardown] | Run Keyword | Show vpp trace dump on all DUTs
 
 | TC02: DUT1 and DUT2 with L2XC switch ICMPv6 between two TG links
 | | [Documentation]
@@ -83,7 +82,6 @@
 | | When All Vpp Interfaces Ready Wait | ${nodes}
 | | Then Send and receive ICMPv6 bidirectionally
 | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2}
-| | [Teardown] | Run Keyword | Show vpp trace dump on all DUTs
 
 | TC03: DUT with two L2XCs switches ICMPv4 between TG and local VM links
 | | [Documentation]
@@ -107,8 +105,9 @@
 | | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1}
 | | ...                                          | ${tg_to_dut_if2}
 | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| | ...        | AND          | Stop and Clear QEMU | ${dut_node} | ${vm_node}
-| | ...        | AND          | Show vpp trace dump on all DUTs
+| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node}
+| | ... | AND | Show vpp trace dump on all DUTs
+| | ... | AND | Check VPP PID in Teardown
 
 | TC04: DUT with two L2XCs switches ICMPv6 between TG and local VM links
 | | [Documentation]
@@ -132,6 +131,7 @@
 | | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1}
 | | ...                                          | ${tg_to_dut_if2}
 | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| | ...        | AND          | Stop and Clear QEMU | ${dut_node} | ${vm_node}
-| | ...        | AND          | Show vpp trace dump on all DUTs
+| | ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node}
+| | ... | AND | Show vpp trace dump on all DUTs
+| | ... | AND | Check VPP PID in Teardown