[Libvirt-cim] [PATCH 4 of 4] [TEST] Fixing HostedService/03_forward_errs.py

Deepti B. Kalakeri deeptik at linux.vnet.ibm.com
Wed Sep 2 12:12:00 UTC 2009


# HG changeset patch
# User Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>
# Date 1251893476 25200
# Node ID 8bb902c189fbfe8cd71fb68c4523733703966047
# Parent  faa43f693e4d2df9cf3d7a9cd91d477ef37b0b10
[TEST] Fixing  HostedService/03_forward_errs.py

Tested with F11/SLES11 with and w/o sblim-cmpi-base and KVM with current sources.
Signed-off-by: Deepti B. Kalakeri <deeptik at linux.vnet.ibm.com>

diff -r faa43f693e4d -r 8bb902c189fb suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py	Wed Sep 02 05:01:11 2009 -0700
+++ b/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py	Wed Sep 02 05:11:16 2009 -0700
@@ -25,7 +25,7 @@
 from pywbem.cim_obj import CIMInstanceName
 from XenKvmLib import assoc
 from XenKvmLib import enumclass
-from XenKvmLib.common_util import get_host_info, try_assoc
+from XenKvmLib.common_util import get_host_info, try_assoc, check_cimom
 from XenKvmLib.classes import get_typed_class
 from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_USER, \
                             CIM_PASS, CIM_NS
@@ -54,8 +54,12 @@
     
     host_ccn = host_inst.CreationClassName
     host_name = host_inst.Name
-    
-    if (host_ccn == "Linux_ComputerSystem"):
+    rc, out = check_cimom(options.ip)
+    if rc != PASS:
+        logger.error("Failed to get the cimom information")    
+        return FAIL
+
+    if (host_ccn == "Linux_ComputerSystem") and "cimserver" in out:
         exp_values['invalid_ccname'] = {"rc" : pywbem.CIM_ERR_INVALID_PARAMETER,
                                         "desc" : "Linux_ComputerSystem"
                                        } 




More information about the Libvirt-cim mailing list