X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Ffunc%2Flisp%2Fipsec_ipv4_lispgpe_ipv6.robot;h=71ff7d721b98e7423c8a78c73d19320c8130a3e2;hb=0d782a5690c7e28a329952fb93afde84ddd97078;hp=c290564d7b199ec73a166d717268982414051ca2;hpb=c1bf0a18260813cc9ca57d27bb2419f8654a9ed3;p=csit.git

diff --git a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot
index c290564d7b..71ff7d721b 100644
--- a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot
+++ b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv6.robot
@@ -37,13 +37,8 @@
 | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP
 | ...
-| Test Setup | Run Keywords | Setup all DUTs before test
-| ...        | AND          | Setup all TGs before traffic script
-| ...        | AND          | Update All Interface Data On All Nodes | ${nodes}
-| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ...           | AND          | Show vpp trace dump on all DUTs
-| ...           | AND          | VPP Show Errors | ${nodes['DUT1']}
-| ...           | AND          | VPP Show Errors | ${nodes['DUT2']}
+| Test Setup | Func Test Setup
+| Test Teardown | Func Test Teardown
 | ...
 | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp*
 | ...
@@ -141,10 +136,11 @@
 | | ... | received packets are correct.
 | | ... | [Ref] RFC6830, RFC4303.
 | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| | ...           | AND       | Show vpp trace dump on all DUTs
-| | ...           | AND       | VPP Show Errors | ${nodes['DUT1']}
-| | ...           | AND       | VPP Show Errors | ${nodes['DUT2']}
-| | ...           | AND       | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
+| | ... | AND | Show vpp trace dump on all DUTs
+| | ... | AND | VPP Show Errors | ${nodes['DUT1']}
+| | ... | AND | VPP Show Errors | ${nodes['DUT2']}
+| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
+| | ... | AND | Check VPP PID in Teardown
 | | ...
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
@@ -181,10 +177,11 @@
 | | ... | received packets are correct.
 | | ... | [Ref] RFC6830, RFC4303.
 | | [Teardown] | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| | ...           | AND       | Show vpp trace dump on all DUTs
-| | ...           | AND       | VPP Show Errors | ${nodes['DUT1']}
-| | ...           | AND       | VPP Show Errors | ${nodes['DUT2']}
-| | ...           | AND       | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
+| | ... | AND | Show vpp trace dump on all DUTs
+| | ... | AND | VPP Show Errors | ${nodes['DUT1']}
+| | ... | AND | VPP Show Errors | ${nodes['DUT2']}
+| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
+| | ... | AND | Check VPP PID in Teardown
 | | ...
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96