-# 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:
*** Settings ***
| Library | resources.libraries.python.DPDK.DPDKTools
-| ...
+| Library | resources.libraries.python.TrafficGenerator
+| Library | resources.libraries.python.DUTSetup
+|
| Documentation | Suite teardown keywords.
*** Keywords ***
| Tear down suite
| | [Documentation]
| | ... | Common suite teardown for tests.
-| | ...
+| |
| | ... | *Arguments:*
| | ... | - ${actions} - Additional teardown action. Type: list
-| | ...
+| |
| | [Arguments] | @{actions}
-| | ...
-| | :FOR | ${action} | IN | @{actions}
+| |
+| | FOR | ${action} | IN | @{actions}
| | | Run Keyword | Additional Suite Tear Down Action For ${action}
+| | END
+| | Remove All Added VIF Ports On All DUTs From Topology | ${nodes}
| Additional Suite Tear Down Action For performance
| | [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.
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
-| | | Cleanup DPDK Environment
-| | | ... | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2}
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Cleanup DPDK Framework
+| | | ... | ${nodes['${dut}']} | ${${dut}_${int}1}[0] | ${${dut}_${int}2}[0]
+| | END
+
+| Additional Suite Tear Down Action For hoststack
+| | [Documentation]
+| | ... | Additional teardown for suites which uses hoststack test programs.
+| | ... | Ensure all hoststack test programs are no longer running on all DUTS.
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Kill Program | ${nodes['${dut}']} | iperf3
+| | | Kill Program | ${nodes['${dut}']} | vpp_echo