[Libvirt-cim] [PATCH] [TEST]#2 Fixing main.py with workaround to verify if qemu and qemu-kvm on F10 machines

[Deepti B. Kalakeri]

# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1230015781 28800
# Node ID d31ce4bbab88ee3029128602fb49a4d54ec88ab4
# Parent  a1eb0390e4bb3bb1a468411a33e5c666fe998bee
[TEST]#2 Fixing main.py with  workaround to verify if qemu and qemu-kvm on F10 machines.

Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r a1eb0390e4bb -r d31ce4bbab88 suites/libvirt-cim/main.py
--- a/suites/libvirt-cim/main.py	Mon Dec 22 02:56:58 2008 -0800
+++ b/suites/libvirt-cim/main.py	Mon Dec 22 23:03:01 2008 -0800
@@ -99,7 +99,18 @@
     cmd = "virsh -c %s version" % virt2uri(virt)
     ret, out = utils.run_remote(ip, cmd)
     if ret != 0:
-        return "Encountered an error querying libvirt with: %s" % cmd
+        # The above version cmd does not work for F10.
+        # Hence, this is a workaround to verify if qemu and qemu-kvm 
+        # are installed in case the above version cmd fails.
+        cmd = "qemu -help"
+        ret, out = utils.run_remote(ip, cmd)
+        if ret != 0: 
+            return "Encountered an error querying for qemu" 
+
+        cmd = "qemu-kvm -help"
+        ret, out = utils.run_remote(ip, cmd)
+        if ret != 0: 
+            return "Encountered an error querying for qemu-kvm " 
 
     cmd = "ps -ef | grep -v grep | grep cimserver"
     rc, out = utils.run_remote(ip, cmd)