# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1251892871 25200 # Node ID faa43f693e4d2df9cf3d7a9cd91d477ef37b0b10 # Parent 850e4a3c0275e31ca9a036c7743dee763d3ab870 [TEST] Fixing HostedResourcePool/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@linux.vnet.ibm.com> diff -r 850e4a3c0275 -r faa43f693e4d suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Wed Sep 02 04:33:04 2009 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Wed Sep 02 05:01:11 2009 -0700 @@ -26,7 +26,7 @@ from XenKvmLib import assoc from XenKvmLib import enumclass from XenKvmLib.common_util import get_host_info -from XenKvmLib.common_util import try_assoc +from XenKvmLib.common_util import try_assoc, check_cimom from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL @@ -55,8 +55,13 @@ Globals.CIM_NS) host_cn = host_inst.CreationClassName host_sys = host_inst.Name + + rc, out = check_cimom(options.ip) + if rc != PASS: + logger.error("Failed to get the cimom information") + return FAIL - if (host_cn == "Linux_ComputerSystem"): + if (host_cn == "Linux_ComputerSystem") and "cimserver" in out: sblim_rc = pywbem.CIM_ERR_INVALID_PARAMETER expr_values['invalid_ccname'] = {"rc" : sblim_rc, "desc" : "wrong"} expr_values['invalid_name'] = {"rc" : sblim_rc, "desc" : "wrong"}