X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Flisp%2Feth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot;h=29f5e4967115686b717bb639b858d9a81e382686;hp=54091a7c9f9ab02b7ba27ea98f1298f3f021e6ae;hb=44dc1d4781470b722c5f7d5adb197ace96b96db3;hpb=c29c69bb91057e4217952602cda71e6a85fd13b6

diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot
index 54091a7c9f..29f5e49671 100644
--- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot
+++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot
@@ -40,7 +40,12 @@
 | ...
 | Test Setup | Run Keywords | Func Test Setup
 | ...        | AND          | Vpp All Ra Suppress Link Layer | ${nodes}
-| Test Teardown | Func Test Teardown
+| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
+| ... | AND | Show VAT History On All DUTs | ${nodes}
+| ... | AND | Show Vpp Settings | ${nodes['DUT1']}
+| ... | AND | Show Vpp Settings | ${nodes['DUT2']}
+| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node}
+| ... | AND | Check VPP PID in Teardown
 | ...
 | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib,
 | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp*
@@ -80,13 +85,6 @@
 | | ... | both DUTs and LISP GPE tunnel between them; verify IPv6 headers on\
 | | ... | 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 Settings | ${dut1_node}
-| | ... | AND | Check VPP PID in Teardown
 | | ...
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
@@ -128,13 +126,6 @@
 | | ... | both DUTs and LISP GPE tunnel between them; verify IPv6 headers on\
 | | ... | 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 Settings | ${dut1_node}
-| | ... | AND | Check VPP PID in Teardown
 | | ...
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96