X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Ftest_teardown.robot;h=1174fde9de096a3dde69ba5d6e313f4e42ea63b8;hb=56440df4a2d9404aefe5d47ad9db9128fdb33b69;hp=336cff5dad2e314447ec258ef3343403d3b4c58e;hpb=7de465c09018b1cf739a28992fe198ccd5f5699d;p=csit.git

diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index 336cff5dad..1174fde9de 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -18,34 +18,38 @@
 | Library | resources.libraries.python.PapiHistory
 | Library | resources.libraries.python.topology.Topology
 | Variables | resources/libraries/python/Constants.py
-| ...
+|
 | Documentation | Test teardown keywords.
 
 *** Keywords ***
 | Tear down test
 | | [Documentation]
 | | ... | Common test teardown for tests.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - ${actions} - Additional teardown action. Type: list
-| | ...
+| |
 | | [Arguments] | @{actions}
-| | ...
+| |
 | | Remove All Added Ports On All DUTs From Topology | ${nodes}
 | | Show PAPI History On All DUTs | ${nodes}
-| | Show Log On All DUTs | ${nodes}
+| | Run Keyword If Test Failed
+| | ... | Show Log On All DUTs | ${nodes}
 | | Run Keyword If Test Failed
 | | ... | Get Core Files on All Nodes | ${nodes}
 | | Run Keyword If Test Failed
 | | ... | Verify VPP PID in Teardown
-| | :FOR | ${action} | IN | @{actions}
+| | Run Keyword If Test Failed
+| | ... | VPP Show Memory On All DUTs | ${nodes}
+| | FOR | ${action} | IN | @{actions}
 | | | Run Keyword | Additional Test Tear Down Action For ${action}
+| | END
 | | Clean Sockets On All Nodes | ${nodes}
 
 | Additional Test Tear Down Action For performance
 | | [Documentation]
 | | ... | Additional teardown for tests which uses performance measurement.
-| | ...
+| |
 | | Run Keyword If Test Failed
 | | ... | Send traffic at specified rate | ${PERF_TRIAL_DURATION} | 10000pps
 | | ... | ${frame_size} | ${traffic_profile} | pkt_trace=${True}
@@ -53,20 +57,21 @@
 | Additional Test Tear Down Action For packet_trace
 | | [Documentation]
 | | ... | Additional teardown for tests which uses packet trace.
-| | ...
+| |
 | | Show Packet Trace on All DUTs | ${nodes}
 
 | Additional Test Tear Down Action For container
 | | [Documentation]
 | | ... | Additional teardown for tests which uses containers.
-| | ...
-| | :FOR | ${container_group} | IN | @{container_groups}
+| |
+| | FOR | ${container_group} | IN | @{container_groups}
 | | | Destroy all '${container_group}' containers
+| | END
 
 | Additional Test Tear Down Action For vhost
 | | [Documentation]
 | | ... | Additional teardown for tests which uses vhost(s) and VM(s).
-| | ...
+| |
 | | Show VPP vhost on all DUTs | ${nodes}
 | | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
 | | ... | Keyword Should Exist | vnf_manager.Kill All VMs
@@ -75,29 +80,32 @@
 | Additional Test Tear Down Action For nat
 | | [Documentation]
 | | ... | Additional teardown for tests which uses NAT feature.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Run Keyword If Test Failed
 | | | ... | Show NAT verbose | ${nodes['${dut}']}
+| | END
 
 | Additional Test Tear Down Action For namespace
 | | [Documentation]
 | | ... | Additional teardown for tests which uses namespace.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Clean Up Namespaces | ${nodes['${dut}']}
+| | END
 
 | Additional Test Tear Down Action For linux_bridge
 | | [Documentation]
 | | ... | Additional teardown for tests which uses linux_bridge.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Linux Del Bridge | ${nodes['${dut}']} | ${bid_TAP}
+| | END
 
 | Additional Test Tear Down Action For acl
 | | [Documentation]
 | | ... | Additional teardown for tests which uses ACL feature.
-| | ...
+| |
 | | Run Keyword If Test Failed
 | | ... | Vpp Log Plugin Acl Settings | ${dut1}
 | | Run Keyword If Test Failed
@@ -106,7 +114,7 @@
 | Additional Test Tear Down Action For macipacl
 | | [Documentation]
 | | ... | Additional teardown for tests which uses MACIP ACL feature.
-| | ...
+| |
 | | Run Keyword If Test Failed
 | | ... | Vpp Log Macip Acl Settings | ${dut1}
 | | Run Keyword If Test Failed
@@ -115,14 +123,14 @@
 | Additional Test Tear Down Action For classify
 | | [Documentation]
 | | ... | Additional teardown for tests which uses classify tables.
-| | ...
+| |
 | | Run Keyword If Test Failed
 | | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
 
 | Additional Test Tear Down Action For srv6
 | | [Documentation]
 | | ... | Additional teardown for tests which uses SRv6.
-| | ...
+| |
 | | Run Keyword If Test Failed
 | | ... | Show SR Policies on all DUTs | ${nodes}
 | | Run Keyword If Test Failed