X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Flisp%2Fipsec_ipv4_lispgpe_ipv4.robot;h=18494ab565a9dbbad34751ba1d60ad28f8085cb4;hp=bdd41e3af404e234d1caa135990add5ec6322f55;hb=440370de3fc66d5bb9754a55fa78ccce8c598f5d;hpb=efe5c162d2311ed470285a6f84af7c0f3a0c109c

diff --git a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot
index bdd41e3af4..18494ab565 100644
--- a/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot
+++ b/tests/func/lisp/ipsec_ipv4_lispgpe_ipv4.robot
@@ -35,13 +35,12 @@
 | ...
 | 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 Setup | Func Test Setup
 | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ...           | AND          | Show vpp trace dump on all DUTs
-| ...           | AND          | Show Vpp Settings | ${nodes['DUT1']}
-| ...           | AND          | Show Vpp Settings | ${nodes['DUT2']}
+| ... | AND | Show vpp trace dump on all DUTs
+| ... | AND | Show Vpp Settings | ${nodes['DUT1']}
+| ... | AND | Show Vpp Settings | ${nodes['DUT2']}
+| ... | AND | Check VPP PID in Teardown
 | ...
 | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)
 | ...
@@ -248,10 +247,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       | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
-| | ...           | AND       | Show VPP Settings | ${dut1_node}
-| | ...           | AND       | Show VPP Settings | ${dut2_node}
+| | ... | AND | Show vpp trace dump on all DUTs
+| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
+| | ... | AND | Show VPP Settings | ${dut1_node}
+| | ... | AND | Show VPP Settings | ${dut2_node}
+| | ... | AND | Check VPP PID in Teardown
 | | ...
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
@@ -295,10 +295,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       | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
-| | ...           | AND       | Show VPP Settings | ${dut1_node}
-| | ...           | AND       | Show VPP Settings | ${dut2_node}
+| | ... | AND | Show vpp trace dump on all DUTs
+| | ... | AND | Stop and Clear QEMU | ${dut1_node} | ${vm_node}
+| | ... | AND | Show VPP Settings | ${dut1_node}
+| | ... | AND | Show VPP Settings | ${dut2_node}
+| | ... | AND | Check VPP PID in Teardown
 | | ...
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96