diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2017-05-02 13:51:55 +0200 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2017-05-05 07:44:33 +0000 |
| commit | adae22c83eb77a49a49f9ee50ef11c1a67239d4e (patch) | |
| tree | 21150ea704454d6ef8a11ea8b580cf44083b21c2 | |
| parent | 919b7cb359cc8fd06ca8cc7a651391ac6aa03f20 (diff) | |
Use 'Qemu Kill All' in perf test teardown
- replace 'Qemu Kill' KW by 'Qemu Kill All'
- use self.qemu_kill_all() in case of qemu_start(self) failure
Change-Id: I19d4c64d5daef4f00548344d45f0d4943ca4f7e8
Signed-off-by: Jan Gelety <jgelety@cisco.com>
| -rw-r--r-- | resources/libraries/python/QemuUtils.py | 2 | ||||
| -rw-r--r-- | resources/libraries/robot/performance.robot | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py index eeca320fed..cbdfe856f0 100644 --- a/resources/libraries/python/QemuUtils.py +++ b/resources/libraries/python/QemuUtils.py @@ -545,7 +545,7 @@ class QemuUtils(object): try: self._wait_until_vm_boot() except (RuntimeError, SSHTimeout): - self.qemu_kill() + self.qemu_kill_all() self.qemu_clear_socks() raise # Update interface names in VM node dict diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot index 0d80436e99..39ea14cd7a 100644 --- a/resources/libraries/robot/performance.robot +++ b/resources/libraries/robot/performance.robot @@ -1854,7 +1854,7 @@ | | ... | ${eth0_mac} | ${eth1_mac} | ${skip}=${6} | ${count}=${5} | | ... | ${qemu_id}=${1} | | ... -| | Import Library | resources.libraries.python.QemuUtils +| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} | | ... | WITH NAME | ${vm_name} | | ${serial_port}= | Evaluate | ${qemu_id} + ${4555} | | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port} @@ -2084,7 +2084,7 @@ | | | Dpdk Testpmd Stop | ${vm} | | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | | Run Keyword | ${vm_name}.Qemu Clear Socks -| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill +| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All | Guest VM Teardown | | [Documentation] @@ -2108,7 +2108,7 @@ | | | ${index}= | Evaluate | ${index} + 1 | | | Run Keyword | ${vm_name}.Qemu Set Node | ${dut_node} | | | Run Keyword | ${vm_name}.Qemu Clear Socks -| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill +| | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All | Lisp IPv4 forwarding initialized in a 3-node circular topology | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \ |