Signed-off-by: Yu Mingfei <[email protected]>
---
libvirt/tests/virsh_edit.py | 6 +++---
libvirt/tests/virsh_managedsave.py | 2 +-
libvirt/tests/virsh_setvcpus.py | 4 ++--
virttest/libvirt_vm.py | 11 ++++++++++-
virttest/virsh.py | 14 ++------------
5 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/libvirt/tests/virsh_edit.py b/libvirt/tests/virsh_edit.py
index f09bee6..882c6ab 100644
--- a/libvirt/tests/virsh_edit.py
+++ b/libvirt/tests/virsh_edit.py
@@ -61,10 +61,10 @@ def run_virsh_edit(test, params, env):
if not status :
return status
if params.get("paused_after_start_vm") == "yes":
- virsh.resume(guest_name)
- virsh.destroy(guest_name)
+ virsh.resume(guest_name, ignore_status=True)
+ virsh.destroy(guest_name, ignore_status=True)
elif params.get("start_vm") == "yes":
- virsh.destroy(guest_name)
+ virsh.destroy(guest_name, ignore_status=True)
vcpus = vm.dominfo()["CPU(s)"]
#Recover cpuinfo
status = modify_vcpu(source, dic_mode["recover"])
diff --git a/libvirt/tests/virsh_managedsave.py
b/libvirt/tests/virsh_managedsave.py
index 6ca905c..9eb4b2a 100644
--- a/libvirt/tests/virsh_managedsave.py
+++ b/libvirt/tests/virsh_managedsave.py
@@ -28,7 +28,7 @@ def run_virsh_managedsave(test, params, env):
raise error.TestFail("virsh list output invalid")
virsh.start(guest_name)
if params.get("paused_after_start_vm") == "yes":
- virsh.resume(guest_name)
+ virsh.resume(guest_name, ignore_status=True)
#This time vm should be in the list
ret = virsh.dom_list()
if not re.search(guest_name, ret.stdout):
diff --git a/libvirt/tests/virsh_setvcpus.py b/libvirt/tests/virsh_setvcpus.py
index 251464d..679ddf8 100644
--- a/libvirt/tests/virsh_setvcpus.py
+++ b/libvirt/tests/virsh_setvcpus.py
@@ -102,7 +102,7 @@ def run_virsh_setvcpus(test, params, env):
break
status = virsh.setvcpus(dom_option, count_option, options,
ignore_status=True).exit_status
if pre_vm_state == "paused":
- virsh.resume(vm_name)
+ virsh.resume(vm_name, ignore_status=True)
if status_error == "no":
if status == 0:
if pre_vm_state == "shut off":
@@ -126,7 +126,7 @@ def run_virsh_setvcpus(test, params, env):
if libvirtd == "off":
libvirt_vm.libvirtd_start()
- virsh.destroy(vm_name)
+ virsh.destroy(vm_name, ignore_status=True)
virsh.undefine(vm_name)
virsh.define(xml_file)
if os.path.exists(xml_file):
diff --git a/virttest/libvirt_vm.py b/virttest/libvirt_vm.py
index b5beedb..3f6d1bb 100644
--- a/virttest/libvirt_vm.py
+++ b/virttest/libvirt_vm.py
@@ -1329,7 +1329,16 @@ class VM(virt_vm.BaseVM):
def resume(self):
- return virsh.resume(self.name, uri=self.connect_uri)
+ try:
+ virsh.resume(self.name, ignore_status=False, uri=self.connect_uri)
+ if self.is_alive():
+ logging.debug("Resumed VM %s", self.name)
+ return True
+ else:
+ return False
+ except error.CmdError, detail:
+ logging.error("Resume VM %s failed:\n%s", self.name, detail)
+ return False
def save_to_file(self, path):
diff --git a/virttest/virsh.py b/virttest/virsh.py
index 88fdfc9..1824242 100644
--- a/virttest/virsh.py
+++ b/virttest/virsh.py
@@ -800,19 +800,9 @@ def resume(name, **dargs):
@param: name: VM name
@param: dargs: standardized virsh function API keywords
- @return: True operation was successful
+ @return: CmdResult object
"""
- dargs['ignore_status'] = False
- try:
- command("resume %s" % (name), **dargs)
- if is_alive(name, **dargs):
- logging.debug("Resumed VM %s", name)
- return True
- else:
- return False
- except error.CmdError, detail:
- logging.error("Resume VM %s failed:\n%s", name, detail)
- return False
+ return command("resume %s" % (name), **dargs)
def dommemstat(name, extra="", **dargs):
--
1.7.11.7
_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel
