# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com&gt; # Date 1224153688 25200 # Node ID 9d17e6d2f6b5f2d9614cd3b3f6df753886feffa8 # Parent 96d45b1dcc0801ade819413abe1af43b3957dde4 [TEST] Updating 02_hostsystem_to_rasd.py of HostSystem to work with/without sblim-base-provider. Tested with Xen, XenFV, KVM with current sources, with/without sblim-base-provider. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com&gt; diff -r 96d45b1dcc08 -r 9d17e6d2f6b5 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Wed Oct 15 06:07:28 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Thu Oct 16 03:41:28 2008 -0700 @@ -55,12 +55,12 @@ from XenKvmLib.common_util import get_host_info from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, \ CIM_ERROR_ASSOCIATORS -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \ verify_diskrasd_values, verify_memrasd_values, rasd_init_list sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] - +bug_sblim = '00007' test_dom = "CrossClass_GuestDom" test_vcpus = 1 @@ -112,7 +112,7 @@ return status, inst -def get_assoc_info(server, cn, an, qcn, name, vsxml, virt="Xen"): +def get_assoc_info(server, cn, an, qcn, name, vsxml): status = PASS assoc_info = [] try: @@ -122,8 +122,11 @@ CreationClassName = cn, Name = name) if len(assoc_info) < 1: - logger.error("%s returned %i %s objects" % (an, len(assoc_info), qcn)) - status = FAIL + if cn == 'Linux_ComputerSystem': + status = XFAIL_RC(bug_sblim) + else: + logger.error("%s returned %i %s objects", an, len(assoc_info), qcn) + status = FAIL except Exception, detail: print_err(CIM_ERROR_ASSOCIATORNAMES, detail, cn) @@ -201,9 +204,10 @@ an = get_typed_class(options.virt, 'HostedDependency') qcn = get_typed_class(options.virt, 'ComputerSystem') name = host_name - status, cs_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml, options.virt) + status, cs_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml) if status != PASS or len(cs_assoc_info) == 0: return status + filter_name = {"key" : "Name"} status, cs_dom = get_inst_from_list(server, cn, @@ -217,7 +221,7 @@ an = get_typed_class(options.virt, 'SystemDevice') qcn = 'Devices' name = test_dom - status, sd_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml, options.virt) + status, sd_assoc_info = get_assoc_info(server, cn, an, qcn, name, vsxml) if status != PASS or len(sd_assoc_info) == 0: return status status = verify_RASD_values(server, sd_assoc_info, vsxml, options.virt)