[Autotest] [PATCH 2/2] libvirt: Fix/Enhance virsh_cmd() calls exception handling

[Chris Evich]

Signed-off-by: Chris Evich <cev...@redhat.com>
---
 client/virt/libvirt_vm.py |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/client/virt/libvirt_vm.py b/client/virt/libvirt_vm.py
index 3c4a7f1..55c23fb 100644
--- a/client/virt/libvirt_vm.py
+++ b/client/virt/libvirt_vm.py
@@ -112,11 +112,14 @@ def virsh_is_alive(name, uri = ""):
 
 def virsh_is_dead(name, uri = ""):
     """
-    Return True if the domain is not started/dead.
+    Return True if the domain is undefined or not started/dead.
 
     @param name: VM name
     """
-    state = virsh_domstate(name, uri)
+    try:
+        state = virsh_domstate(name, uri)
+    except error.CmdError:
+        return True
     if state in ('running', 'idle', 'no state', 'paused'):
         return False
     else:
@@ -138,8 +141,8 @@ def virsh_suspend(name, uri = ""):
             return True
         else:
             return False
-    except error.CmdError:
-        logging.error("Suspending VM %s failed", name)
+    except error.CmdError,detail:
+        logging.error("Suspending VM %s failed" % (name,detail))
         return False
 
 
@@ -158,8 +161,8 @@ def virsh_resume(name, uri = ""):
             return True
         else:
             return False
-    except error.CmdError:
-        logging.error("Resume VM %s failed", name)
+    except error.CmdError, detail:
+        logging.error("Resume VM %s failed" % (name,detail))
         return False
 
 def virsh_save(name, path, uri = ""):
@@ -213,8 +216,8 @@ def virsh_start(name, uri = ""):
     try:
         virsh_cmd("start %s" % (name), uri)
         return True
-    except error.CmdError:
-        logging.error("Start VM %s failed", name)
+    except error.CmdError, detail:
+        logging.error("Start VM %s failed: %s" % (name,detail))
         return False
 
 
@@ -231,8 +234,8 @@ def virsh_shutdown(name, uri = ""):
     try:
         virsh_cmd("shutdown %s" % (name), uri)
         return True
-    except error.CmdError:
-        logging.error("Shutdown VM %s failed", name)
+    except error.CmdError,detail:
+        logging.error("Shutdown VM %s failed" % (name,detail))
         return False
 
 
@@ -250,8 +253,8 @@ def virsh_destroy(name, uri = ""):
     try:
         virsh_cmd("destroy %s" % (name), uri)
         return True
-    except error.CmdError:
-        logging.error("Destroy VM %s failed", name)
+    except error.CmdError, detail:
+        logging.error("Destroy VM %s failed: %s" % (name,detail))
         return False
 
 
@@ -268,8 +271,8 @@ def virsh_undefine(name, uri = ""):
         virsh_cmd("undefine %s" % (name), uri)
         logging.debug("undefined VM %s", name)
         return True
-    except error.CmdError:
-        logging.error("undefine VM %s failed", name)
+    except error.CmdError, detail:
+        logging.error("undefine VM %s failed: %s" % (name,detail))
         return False
 
 
@@ -295,8 +298,8 @@ def virsh_domain_exists(name, uri = ""):
     try:
         virsh_cmd("domstate %s" % name, uri)
         return True
-    except error.CmdError:
-        logging.warning("VM %s does not exist", name)
+    except error.CmdError, detail:
+        logging.warning("VM %s does not exist: %s" % (name,detail))
         return False
 
 
-- 
1.7.7.6

_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest