X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Ftest_teardown.robot;h=8ba914b946d056216603a0f9d36980767b99019c;hb=c4528bcd137c0813d34b1b248bc92670736e78e6;hp=cad3c620e072c3dd672376dd28fe0443bedc84a1;hpb=248d1a52e06622dc9eb1dfdd6ca9f6670b4c0bc3;p=csit.git

diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index cad3c620e0..8ba914b946 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -17,6 +17,7 @@
 | Resource | resources/libraries/robot/shared/container.robot
 | Library | resources.libraries.python.PapiHistory
 | Library | resources.libraries.python.topology.Topology
+| Variables | resources/libraries/python/Constants.py
 | ...
 | Documentation | Test teardown keywords.
 
@@ -38,13 +39,14 @@
 | | ... | Verify VPP PID in Teardown
 | | :FOR | ${action} | IN | @{actions}
 | | | Run Keyword | Additional Test Tear Down Action For ${action}
+| | 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
+| | ... | Send traffic at specified rate | ${PERF_TRIAL_DURATION} | 10000pps
 | | ... | ${frame_size} | ${traffic_profile} | pkt_trace=${True}
 
 | Additional Test Tear Down Action For packet_trace
@@ -65,7 +67,9 @@
 | | ... | Additional teardown for tests which uses vhost(s) and VM(s).
 | | ...
 | | Show VPP vhost on all DUTs | ${nodes}
-| | vnf_manager.Kill All VMs
+| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
+| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
 
 | Additional Test Tear Down Action For nat
 | | [Documentation]