X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fsuite_teardown.robot;h=f164b0eeb5aaf4caf6b7e8ae7f5c50a35f32f3d5;hb=f0e964d35af36f0923c6ae0421e74d94022cadba;hp=f0006792ab342fdc31a0964f6f6e9ddac3a9620f;hpb=b340b5c9925b43869b91197850504760757a0bfe;p=csit.git

diff --git a/resources/libraries/robot/shared/suite_teardown.robot b/resources/libraries/robot/shared/suite_teardown.robot
index f0006792ab..f164b0eeb5 100644
--- a/resources/libraries/robot/shared/suite_teardown.robot
+++ b/resources/libraries/robot/shared/suite_teardown.robot
@@ -39,34 +39,17 @@
 | | [Documentation]
 | | ... | Additional teardown for suites which uses performance measurement.
 | |
-| | Teardown traffic generator | ${tg}
+| | Run Keyword And Ignore Error | Teardown traffic generator | ${tg}
 
 | Additional Suite Tear Down Action For dpdk
 | | [Documentation]
 | | ... | Additional teardown for suites which uses dpdk.
 | |
 | | FOR | ${dut} | IN | @{duts}
-| | | Cleanup DPDK Environment
-| | | ... | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2}
+| | | Cleanup DPDK Framework
+| | | ... | ${nodes['${dut}']} | ${${dut}_${int}1}[0] | ${${dut}_${int}2}[0]
 | | END
 
-| Additional Suite Tear Down Action For wrk
-| | [Documentation]
-| | ... | Additional teardown for suites which uses wrk.
-| |
-| | ${intf_name}= | Get Linux interface name | ${tg}
-| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']}
-| | FOR | ${ip_addr} | IN | @{wrk_ip_addrs}
-| | | ${ip_addr_on_intf}= | Linux Interface Has IP | ${tg} | ${intf_name}
-| | | ... | ${ip_addr} | ${wrk_ip_prefix}
-| | | Run Keyword If | ${ip_addr_on_intf}==${True} | Delete Linux Interface IP
-| | | ... | ${tg} | ${intf_name} | ${ip_addr} | ${wrk_ip_prefix}
-| | END
-| | Run Keyword And Ignore Error | PCI Driver Unbind
-| | ... | ${tg} | ${tg['interfaces']['${tg_if1}']['pci_address']}
-| | Run Keyword And Ignore Error | PCI Driver Unbind
-| | ... | ${tg} | ${tg['interfaces']['${tg_if2}']['pci_address']}
-
 | Additional Suite Tear Down Action For hoststack
 | | [Documentation]
 | | ... | Additional teardown for suites which uses hoststack test programs.