X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Fipv4%2Fipv4_untagged.robot;h=020d1f143bb316fc90ab9d28f99abe7fcdd14939;hp=3b6716d858f33cd6bef5c8a62308823149570267;hb=c3e3e7aab817fc936c95e7dca7b14dcc74d873bf;hpb=70cbaaee0e6210682ce6d278ea645b8bea153b67

diff --git a/tests/func/ipv4/ipv4_untagged.robot b/tests/func/ipv4/ipv4_untagged.robot
index 3b6716d858..020d1f143b 100644
--- a/tests/func/ipv4/ipv4_untagged.robot
+++ b/tests/func/ipv4/ipv4_untagged.robot
@@ -18,13 +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}
-| Test Teardown | Run Keyword If Test Failed | Show packet trace on all DUTs | ${nodes}
-| ...           | AND                        | Show vpp trace dump on all DUTs
+| 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 | AND
+| ... | Check VPP PID in Teardown
 | Documentation | *IPv4 routing test cases*
 | ...
 | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4
@@ -97,18 +101,6 @@
 | | ${dst_port} | ${dst_node}= | Last Interface
 | | ${hops}= | Set Variable | ${2}
 | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4
-| | ${port} | ${node}= | Next Interface
-| | ${port} | ${node}= | Next Interface
-| | ${exp_counter_val}= | Set Variable | ${1}
-| | Vpp dump stats table | ${node}
-| | Check ipv4 interface counter | ${node} | ${port} | ${exp_counter_val}
-| | ${port} | ${node}= | Next Interface
-| | Check ipv4 interface counter | ${node} | ${port} | ${exp_counter_val}
-| | ${port} | ${node}= | Next Interface
-| | Vpp dump stats table | ${node}
-| | Check ipv4 interface counter | ${node} | ${port} | ${exp_counter_val}
-| | ${port} | ${node}= | Next Interface
-| | Check ipv4 interface counter | ${node} | ${port} | ${exp_counter_val}
 
 | TC06: DUT replies to ICMPv4 Echo Reqs with size 64B-to-1500B-incr-1B
 | | [Documentation]
@@ -125,7 +117,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