From: Jan Gelety <jgelety@cisco.com>
Date: Mon, 24 Oct 2016 09:05:03 +0000 (+0200)
Subject: Use only Qemu Kill on the teardown of double qemu setup
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=64b8f55af5dd6a0e7f360186cbd60ed788040939

Use only Qemu Kill on the teardown of double qemu setup

- do not use Qemu System Powerdown or Qemu Quit in the teardown of
  double qemu setup
- use just Qemu Kill there

Change-Id: I8dd1e4055e0adb5d306e3a9904090a271d17c3e5
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---

diff --git a/resources/libraries/robot/double_qemu_setup.robot b/resources/libraries/robot/double_qemu_setup.robot
index 8a262c29ba..d8b32bd2fa 100644
--- a/resources/libraries/robot/double_qemu_setup.robot
+++ b/resources/libraries/robot/double_qemu_setup.robot
@@ -87,15 +87,9 @@
 | | ...
 | | [Arguments] | ${dut_node} | ${vm} | ${qemu_name}
 | | ${set_node}= | Replace Variables | ${qemu_name}.Qemu Set Node
-| | ${sys_status}= | Replace Variables | ${qemu_name}.Qemu System Status
 | | ${kill}= | Replace Variables | ${qemu_name}.Qemu Kill
-| | ${sys_pd}= | Replace Variables | ${qemu_name}.Qemu System Powerdown
-| | ${quit}= | Replace Variables | ${qemu_name}.Qemu Quit
 | | ${clear_socks}= | Replace Variables | ${qemu_name}.Qemu Clear Socks
 | | Run Keyword | ${set_node} | ${dut_node}
-| | ${status} | ${value}= | Run Keyword And Ignore Error | ${sys_status}
-| | Run Keyword If | "${status}" == "FAIL" | ${kill}
-| | ... | ELSE IF | "${value}" == "running" | ${sys_pd}
-| | ... | ELSE | ${quit}
+| | Run Keyword | ${kill}
 | | Run Keyword | ${clear_socks}
 | | Run Keyword If | ${vm} is not None | Disconnect | ${vm}