X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_setup.robot;fp=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_setup.robot;h=ae3e03a64dd6795f1e4e5bd3e197a3f302f50549;hp=98adf6df9d2cd71560a0152132b4b35f1fa6279d;hb=33bd6f2425ddff8e4167d36ea61b64ac81da3a65;hpb=8231ea666c43c0d514708b41cf52667f5e8d0311

diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 98adf6df9d..ae3e03a64d 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -199,6 +199,12 @@
 | | Set Suite Variable | ${dut2_if1_2}
 | | Set Suite Variable | ${dut2_if2}
 
+| Tear down guest VM
+| | [Documentation]
+| | ... | Stop all qemu processes running on nodes.
+| | ...
+| | Run Keyword | vnf_manager.Kill All VMs
+
 | Tear down guest VM with dpdk-testpmd
 | | [Documentation]
 | | ... | Stop all qemu processes with dpdk-testpmd running on ${dut_node}.
@@ -223,28 +229,6 @@
 | | | Dpdk Testpmd Stop | ${vm}
 | | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All
 
-| Tear down guest VM
-| | [Documentation]
-| | ... | Stop all qemu processes running on ${dut_node}.
-| | ... | Argument is dictionary of all qemu nodes running with its names.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut_node - Node where to clean qemu. Type: dictionary
-| | ... | - dut_vm_refs - VM references on node. Type: dictionary
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down guest VM \| ${node['DUT1']} \
-| | ... | \| ${dut_vm_refs} \|
-| | ...
-| | [Arguments] | ${dut_node} | ${dut_vm_refs}
-| | ${vms_number}= | Get Length | ${dut_vm_refs}
-| | ${index}= | Set Variable | ${0}
-| | :FOR | ${vm_name} | IN | @{dut_vm_refs}
-| | | ${vm}= | Get From Dictionary | ${dut_vm_refs} | ${vm_name}
-| | | ${index}= | Evaluate | ${index} + 1
-| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All
-
 # Suite setups
 
 | Set up 2-node performance topology with DUT's NIC model
@@ -715,6 +699,22 @@
 | | :FOR | ${container_group} | IN | @{container_groups}
 | | | Destroy all '${container_group}' containers
 
+| Tear down performance test with vhost
+| | [Documentation] | Common test teardown for performance tests which use
+| | ... | vhost(s) and VM(s).
+| | ...
+| | ... | *Arguments:*
+| | ... | - rate - Rate for sending packets. Type: string
+| | ... | - framesize - L2 Frame Size [B]. Type: integer
+| | ... | - topology_type - Topology type. Type: string
+| | ...
+| | [Arguments] | ${rate} | ${framesize} | ${topology_type}
+| | ...
+| | Tear down performance discovery test | ${rate} | ${framesize}
+| | ... | ${topology_type}
+| | Show VPP vhost on all DUTs | ${nodes}
+| | Tear down guest VM
+
 | Tear down performance test with vhost and VM with dpdk-testpmd
 | | [Documentation] | Common test teardown for performance tests which use
 | | ... | vhost(s) and VM(s) with dpdk-testpmd.
@@ -746,6 +746,14 @@
 | | Run keyword unless | ${dut2_node}==${None}
 | | ... | Tear down guest VM with dpdk-testpmd | ${dut2} | ${dut2_vm_refs}
 
+| Tear down performance mrr test with vhost
+| | [Documentation] | Common test teardown for mrr tests which use
+| | ... | vhost(s) and VM(s).
+| | ...
+| | Tear down performance mrr test
+| | Show VPP vhost on all DUTs | ${nodes}
+| | Tear down guest VM
+
 | Tear down performance mrr test with vhost and VM with dpdk-testpmd
 | | [Documentation] | Common test teardown for mrr tests which use
 | | ... | vhost(s) and VM(s) with dpdk-testpmd.