CSIT-465: Common test setup and teardown

This test setup and teardown is aimed to be used with all functional
tests.
It does not include functionality to manipulate VMs (qemu).

Test setup includes:
- Setup all DUTs before test
- Save VPP PIDs
- Setup all TGs before traffic script
- Update All Interface Data On All Nodes

Test teardown includes:
- Show Packet Trace on All DUTs
- Show vpp trace dump on all DUTs
- Vpp Show Errors On All DUTs
- Check VPP PID in Teardown

Change-Id: Ifee0bd58b7865442c5b510852908fd8363e3c543
Signed-off-by: Tibor Frank <tifrank@cisco.com>

4 files changed, 18 insertions, 27 deletions

diff --git a/tests/func/ipv4/ipv4_arp_untagged.robot b/tests/func/ipv4/ipv4_arp_untagged.robot
index a387eed85f..0950610559 100644
--- a/tests/func/ipv4/ipv4_arp_untagged.robot
+++ b/tests/func/ipv4/ipv4_arp_untagged.robot
@@ -20,14 +20,9 @@
 | Resource | resources/libraries/robot/l2_xconnect.robot
 | Resource | resources/libraries/robot/traffic.robot
 | Library | resources.libraries.python.Trace
-
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO
-| Suite Setup | Run Keywords | Setup all TGs before traffic script
-| ...         | AND          | Update All Interface Data On All Nodes | ${nodes}
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword If Test Failed | Run Keywords
-| ... | Show packet trace on all DUTs | ${nodes} | AND
-| ... | Show vpp trace dump on all DUTs
+| Test Setup | Func Test Setup
+| Test Teardown | Func Test Teardown
 | Documentation | *IPv4 ARP test cases*
 | ...
 | ... | RFC826 ARP: Eth-IPv4 and Eth-ARP on links TG-DUT1, TG-DUT2, DUT1-DUT2:
diff --git a/tests/func/ipv4/ipv4_multipath_routing.robot b/tests/func/ipv4/ipv4_multipath_routing.robot
index 9d31bf0d61..f55ee64df9 100644
--- a/tests/func/ipv4/ipv4_multipath_routing.robot
+++ b/tests/func/ipv4/ipv4_multipath_routing.robot
@@ -20,14 +20,9 @@
 | Resource | resources/libraries/robot/ipv4.robot
 | Resource | resources/libraries/robot/traffic.robot
 | Library | resources.libraries.python.Trace
-
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
-| Suite Setup | Run Keywords | Setup all TGs before traffic script
-| ...         | AND          | Update All Interface Data On All Nodes | ${nodes}
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes}
-| ...           | AND          | Vpp Show Errors | ${nodes['DUT1']}
-| ...           | AND          | Show vpp trace dump on all DUTs
+| Test Setup | Func Test Setup
+| Test Teardown | Func Test Teardown
 | Documentation | *Ipv4 Multipath routing test cases*
 | ...
 | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\
diff --git a/tests/func/ipv4/ipv4_proxy_arp_untagged.robot b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot
index ec164d2d32..765a54b6d5 100644
--- a/tests/func/ipv4/ipv4_proxy_arp_untagged.robot
+++ b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot
@@ -20,12 +20,8 @@
 | Library | resources.libraries.python.Trace
 | Library | resources.libraries.python.ProxyArp
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO
-| Suite Setup | Run Keywords | Setup all TGs before traffic script
-| ...         | AND          | Update All Interface Data On All Nodes | ${nodes}
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords
-| ... | Show packet trace on all DUTs | ${nodes} | AND
-| ... | Show vpp trace dump on all DUTs
+| Test Setup | Func Test Setup
+| Test Teardown | Func Test Teardown
 | Documentation | *RFC1027 Proxy ARP test cases*
 | ...
 | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with
diff --git a/tests/func/ipv4/ipv4_untagged.robot b/tests/func/ipv4/ipv4_untagged.robot
index b7cb9d96a9..4755f2e900 100644
--- a/tests/func/ipv4/ipv4_untagged.robot
+++ b/tests/func/ipv4/ipv4_untagged.robot
@@ -18,14 +18,17 @@
 | Resource | resources/libraries/robot/interfaces.robot
 | Resource | resources/libraries/robot/ipv4.robot
 | Force Tags | HW_ENV
-| Suite Setup | Run Keywords | Setup all DUTs before test
-| ...         | AND          | Setup all TGs before traffic script
-| ...         | AND          | Update All Interface Data On All Nodes | ${nodes}
-| ...         | AND          | Setup DUT nodes for IPv4 testing
-| Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes}
+| Suite Setup | Run Keywords
+| ... | Setup all DUTs before test | AND
+| ... | Setup all TGs before traffic script | AND
+| ... | Update All Interface Data On All Nodes | ${nodes} | AND
+| ... | Setup DUT nodes for IPv4 testing
+| Test Setup | Run Keywords | Save VPP PIDs | AND
+| ... | Clear interface counters on all vpp nodes in topology | ${nodes}
 | Test Teardown | Run Keywords
 | ... | Show packet trace on all DUTs | ${nodes} | AND
-| ... | Show vpp trace dump on all DUTs
+| ... | Show vpp trace dump on all DUTs | AND
+| ... | Check VPP PID in Teardown
 | Documentation | *IPv4 routing test cases*
 | ...
 | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4
@@ -126,7 +129,9 @@
 | | ... | step of 10Bytes. Make TG verify ICMPv4 Echo Replies are correct.
 | | [Tags] | 3_NODE_SINGLE_LINK_TOPO
 | | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']}
-| | [Teardown] | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']}
+| | [Teardown] | Run keywords
+| | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']}
+| | ... | AND | Check VPP PID in Teardown
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']}
 | | Compute Path
 | | ${dut_port} | ${dut_node}= | Last Interface