May 2008 - CIM - libvirt List Archives

CimTest Report on XenFV 15-05-2008
by Deepti B Kalakeri 15 May '08

15 May '08

====================================== CIM Test Report for XenFV ====================================== Distro : RHEL 5.2 Beta Kernel : 2.6.18-88.el5xen Xen version : 3.1.2-88.el5 Libvirt : libvirt-0.3.3-7.el5 CIMOM : pegasus PyWBEM : pywbem-3.14 CIM Schema : cimv216Experimental LibCMPIutil : 78 LibVirtCIM : 587 CIMTEST : 138 ====================================== PASS : 85 FAIL : 18 XFAIL : 4 SKIP : 22 ----------------- Total : 129 ====================================== List of tc that are failing ComputerSystem - 04_defineStartVS.py: FAIL ComputerSystem - 06_paused_active_suspend.py: FAIL ComputerSystem - 23_suspend_suspend.py: FAIL ComputerSystem - 32_start_reboot.py: FAIL ComputerSystem - 33_suspend_reboot.py: FAIL ComputerSystem - 35_start_reset.py: FAIL ElementAllocatedFromPool - 04_forward_errs.py: FAIL ElementCapabilities - 01_forward.py: FAIL ElementConforms - 01_forward.py: FAIL EnabledLogicalElementCapabilities - 01_enum.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL LogicalDisk - 03_ld_gi_errs.py: FAIL Memory - 01_memory.py: FAIL ResourceAllocationFromPool - 05_RAPF_err.py: FAIL SettingsDefine - 02_reverse.py: FAIL VSSD - 04_vssd_to_rasd.py: FAIL VirtualSystemManagementService - 02_destroysystem.py: FAIL VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL Please find the complete report attached with the mail. Thanks and Regards, Deepti. Starting test suite: libvirt-cim Cleaned log files. Testing XenFV hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: FAIL ERROR - Error: property values are not set for VS domguest ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 85769 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<85769> ComputerSystem - 06_paused_active_suspend.py: FAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain not running') ERROR - Unable to suspend dom DomST1 using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain not running ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 27_define_suspend_errs.py: PASS ComputerSystem - 32_start_reboot.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 33_suspend_reboot.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 35_start_reset.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 40_RSC_start.py: PASS ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: FAIL ERROR - Unexpected rc code 6 and description CIM_ERR_NOT_FOUND: No such instance (hd_domain/hda) ERROR - ------FAILED: Invalid SystemName KeyName.------ ElementCapabilities - 01_forward.py: FAIL ERROR - ElementCapabilities association classname error ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: FAIL ERROR - Failed to get associators information for ElementConformsToProfile ERROR - Exception: not enough arguments for format string ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: SKIP ElementSettingData - 03_esd_assoc_with_rasd_errs.py: SKIP EnabledLogicalElementCapabilities - 01_enum.py: FAIL ERROR - Get domain list error, the number of domains is not equal EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: PASS HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - Error checking RASD attribute values 'propertypolicy' ERROR - SystemExit : 1 HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: SKIP HostedDependency - 02_reverse.py: SKIP HostedDependency - 03_enabledstate.py: SKIP HostedDependency - 04_reverse_errs.py: SKIP HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: FAIL ERROR - Failed to get instance by the class of Xen_LogicalDisk ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (hd_domain/hda)') Memory - 01_memory.py: FAIL ERROR - Capacity should be 256 MB instead of 131072 MB Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: XFAIL Bug: 90844 ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') Bug:<90844> NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: SKIP Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: SKIP Profile - 02_profile_to_elec.py: SKIP Profile - 03_rprofile_gi_errs.py: SKIP RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: FAIL ERROR - Xen_NetResourceAllocationSettingData returned 0 instances, excepted atleast 1 instance ERROR - ------FAILED: to verify the RAFP.------ ResourcePool - 01_enum.py: SKIP ResourcePool - 02_rp_gi_errors.py: SKIP ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL Bug: 92173 ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Unknown Method InvokeMethod(AddResourcesToResourcePool): CIM_ERR_FAILED: Unknown Method Bug:<92173> ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: FAIL ERROR - Mistmatching value for VSSDComponent association CIM_ERR_NOT_FOUND: No such instance (virtgst/proc) SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: PASS SettingsDefineCapabilities - 03_forward_errs.py: PASS SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: SKIP VSSD - 03_vssd_gi_errs.py: PASS VSSD - 04_vssd_to_rasd.py: FAIL ERROR - Xen_VirtualSystemSettingData with VSSDC_dom was not returned ERROR - Xen_VirtualSystemSettingData returned 0 VSSD objects, expected only 1 VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: PASS VirtualSystemManagementService - 02_destroysystem.py: FAIL ERROR - Unknow exception happened ERROR - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.') ERROR - Destroyed multiple domains InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain name. error line 1: syntax error in 'wrong' VirtualSystemManagementService - 03_definesystem_ess.py: PASS error line 1: syntax error in 'wrong' VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL ERROR - destroy_fail>>noname: Error executing DestroySystem, exception details below ERROR - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.') ERROR - destroy_fail>>nonexistent: Error executing DestroySystem, exception details below ERROR - (1, u'CIM_ERR_FAILED: Failed to find domain') InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain name. InvokeMethod(DestroySystem): CIM_ERR_FAILED: Failed to find domain VirtualSystemManagementService - 06_addresource.py: SKIP error line 1: syntax error in 'ever' VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853 ERROR - Error invoking ModifyRS ERROR - (1, u"CIM_ERR_FAILED: Unknown system `rstest_domain'") InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Unknown system `rstest_domain' Bug:<90853> VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS

1 0

[PATCH] [TEST] #2 Resubmit PoolXML class for creating a virtual pool in vxml.py
by Deepti B. Kalakeri 15 May '08

15 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210852307 25200 # Node ID a8dbad0a9854623167932386e4bae8a737b46672 # Parent 06c87ac466e374f7ca5b7e3dd1923ee32f1ef2ce [TEST] #2 Resubmit PoolXML class for creating a virtual pool in vxml.py. Removed source tag and add pool destroy function. Added the pool-destroy to the file_arg_cmds list. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 06c87ac466e3 -r a8dbad0a9854 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Thu May 15 04:51:47 2008 -0700 @@ -37,6 +37,9 @@ default_bridge_name = 'testbridge' default_bridge_name = 'testbridge' default_network_name = 'default-net' +#vxml.PoolXML +default_pool_name = 'testpool' + # vxml.VirtXML default_domname = 'domU1' default_memory = 128 diff -r 06c87ac466e3 -r a8dbad0a9854 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu May 15 04:51:47 2008 -0700 @@ -143,12 +143,14 @@ class Virsh: self.vuri = 'qemu:///system' def run(self, ip, vcmd, param): - file_arg_cmds = ['define', 'create', 'net-create'] + file_arg_cmds = ['define', 'create', 'net-create', 'pool-create', 'pool-destroy'] if vcmd in file_arg_cmds: ntf = tempfile.NamedTemporaryFile('w') ntf.write(param) ntf.flush() name = ntf.name + elif vcmd == 'pool-destroy': + name = param elif param is None: name = "" else: @@ -211,6 +213,28 @@ class NetXML(Virsh, XMLClass): def create_vnet(self): return self.run(self.server, 'net-create', self.xml_string) +class PoolXML(Virsh, XMLClass): + + def __init__(self, server, poolname=const.default_pool_name, + virt='xen'): + + XMLClass.__init__(self) + if virt == 'XenFV': + virt = 'xen' + Virsh.__init__(self, str(virt).lower()) + self.pool_name = poolname + self.server = server + + pool = self.add_sub_node(self.xdoc, 'pool', type='dir') + self.add_sub_node(pool, 'name', self.pool_name) + target = self.add_sub_node(pool, 'target') + self.add_sub_node(target, 'path', '/tmp') + + def create_vpool(self): + return self.run(self.server, 'pool-create', self.xml_string) + + def destroy_vpool(self): + return self.run(self.server, 'pool-destroy', self.pool_name) class VirtXML(Virsh, XMLClass): """Base class for all XML generation & operation"""

1 0

[PATCH] [TEST] #2 Updating 01_forward.py of SDC
by Deepti B. Kalakeri 15 May '08

15 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210765634 25200 # Node ID 128d23c76793c50f827372963acf29db57663a87 # Parent 6671b339cc8fd7c2cc7cada2ac15bc93635fbe4b [TEST] #2 Updating 01_forward.py of SDC. To use the storage pool present on the machine. This tc will now pass on latest libvirt-cim for KVM. This tc will require virsh_version() and diskpool_list() and create_diskpool() function changes to work. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 6671b339cc8f -r 128d23c76793 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed May 14 04:45:49 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed May 14 04:47:14 2008 -0700 @@ -57,19 +57,16 @@ from distutils.file_util import move_fil from distutils.file_util import move_file from XenKvmLib import assoc from XenKvmLib import enumclass -from XenKvmLib.test_xml import netxml -from XenKvmLib.test_doms import create_vnet -from VirtLib.live import net_list +from VirtLib.live import virsh_version from CimTest.ReturnCodes import PASS, FAIL, SKIP from CimTest.Globals import do_main, platform_sup, logger, \ CIM_ERROR_GETINSTANCE, CIM_ERROR_ASSOCIATORS from XenKvmLib.classes import get_typed_class -from XenKvmLib.common_util import cleanup_restore, test_dpath, \ -create_diskpool_file +from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \ +create_netpool_conf from XenKvmLib.common_util import print_field_error from XenKvmLib.const import CIM_REV -diskid = "%s/%s" % ("DiskPool", test_dpath) memid = "%s/%s" % ("MemoryPool", 0) procid = "%s/%s" % ("ProcessorPool", 0) libvirtcim_sdc_rasd_rev = 571 @@ -130,22 +127,17 @@ def get_pool_details(virt, server): def get_pool_details(virt, server): dpool = npool = mpool = ppool = None try : + status, diskid = create_diskpool_conf(server, virt) + if status != PASS: + return status, dpool, npool, mpool, ppool + dpool = get_pool_info(virt, server, diskid, poolname="DiskPool") mpool = get_pool_info(virt, server, memid, poolname= "MemoryPool") ppool = get_pool_info(virt, server, procid, poolname= "ProcessorPool") - vir_network = net_list(server, virt) - if len(vir_network) > 0: - test_network = vir_network[0] - else: - bridgename = 'testbridge' - test_network = 'default-net' - net_xml, bridge = netxml(server, bridgename, test_network) - ret = create_vnet(server, net_xml, virt) - if not ret: - logger.error("Failed to create Virtual Network '%s'", - test_network) - return SKIP + status, test_network = create_netpool_conf(server, virt) + if status != PASS: + return status, dpool, npool, mpool, ppool netid = "%s/%s" % ("NetworkPool", test_network) npool = get_pool_info(virt, server, netid, poolname= "NetworkPool") @@ -225,11 +217,6 @@ def main(): server = options.ip virt = options.virt - # Verify DiskPool on machine - status = create_diskpool_file() - if status != PASS: - return status - status, dpool, npool, mpool, ppool = get_pool_details(virt, server) if status != PASS or dpool.InstanceID == None or mpool.InstanceID == None \ or npool.InstanceID == None or ppool.InstanceID == None:

2 1

[PATCH] [TEST] Adding create_diskpool() function
by Deepti B. Kalakeri 15 May '08

15 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210765549 25200 # Node ID 6671b339cc8fd7c2cc7cada2ac15bc93635fbe4b # Parent 63c2d5e576bd750c0ba0975424a72ac24105c6f7 [TEST] Adding create_diskpool() function. Modified vxml to get the poolname and networkname . To create the storage pool on machine with libvirt >= 0.4.1 Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 63c2d5e576bd -r 6671b339cc8f suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Wed May 14 04:36:40 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Wed May 14 04:45:49 2008 -0700 @@ -1,3 +1,4 @@ +#!/usr/bin/python # # Copyright 2008 IBM Corp. # @@ -33,6 +34,8 @@ from CimTest.Globals import logger, log_ from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.const import CIM_REV +from VirtLib.live import diskpool_list, virsh_version, net_list +from XenKvmLib.vxml import PoolXML, NetXML test_dpath = "foo" diskpoolconf_rev = 558 @@ -294,3 +297,53 @@ def create_diskpool_file(): return conf_file() +def create_diskpool(server, virt='KVM'): + status = PASS + try: + dpool_list = diskpool_list(server, virt='KVM') + if len(dpool_list) > 0: + dpoolname=dpool_list[0] + else: + diskxml = PoolXML(server, virt=virt) + ret = diskxml.create_vpool() + if not ret: + logger.error('Failed to create the disk pool "%s"', + dpoolname) + status = FAIL + dpoolname=diskxml.xml_get_diskpool_name() + except Exception, detail: + logger.error("Exception: In fn create_diskpool(): %s", detail) + status=FAIL + return status, dpoolname + +def create_diskpool_conf(server, virt): + libvirt_version = virsh_version(server, virt) + if virt == 'KVM' and libvirt_version >= '0.4.1' and \ + CIM_REV > diskpoolconf_rev: + status, dpoolname = create_diskpool(server, virt=virt) + diskid = "%s/%s" % ("DiskPool", dpoolname) + else: + status = create_diskpool_file() + diskid = "%s/%s" % ("DiskPool", test_dpath) + + return status, diskid + + +def create_netpool_conf(server, virt): + status = PASS + try: + vir_network = net_list(server, virt) + if len(vir_network) > 0: + test_network = vir_network[0] + else: + netxml = NetXML(server, virt=virt) + ret = netxml.create_vnet() + if not ret: + logger.error("Failed to create Virtual Network '%s'", + test_network) + status = FAIL + test_network = netxml.xml_get_netpool_name() + except Exception, detail: + logger.error("Exception: In fn create_netpool_conf(): %s", detail) + status=FAIL + return status, test_network diff -r 63c2d5e576bd -r 6671b339cc8f suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed May 14 04:36:40 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed May 14 04:45:49 2008 -0700 @@ -121,7 +121,6 @@ class XMLClass: except Exception: logger.info('Zero or multiple node found') return None - if node.nodeType == Node.ATTRIBUTE_NODE: return node.value if node.nodeType == Node.TEXT_NODE: @@ -213,10 +212,14 @@ class NetXML(Virsh, XMLClass): def create_vnet(self): return self.run(self.server, 'net-create', self.xml_string) + def xml_get_netpool_name(self): + npoolname = self.get_value_xpath('/network/name') + return npoolname + class PoolXML(Virsh, XMLClass): def __init__(self, server, poolname=const.default_pool_name, - virt='xen'): + virt='xen'): XMLClass.__init__(self) if virt == 'XenFV': @@ -235,6 +238,10 @@ class PoolXML(Virsh, XMLClass): def destroy_vpool(self): return self.run(self.server, 'pool-destroy', self.pool_name) + + def xml_get_diskpool_name(self): + dpoolname = self.get_value_xpath('/pool/name') + return dpoolname class VirtXML(Virsh, XMLClass): """Base class for all XML generation & operation""" @@ -293,7 +300,7 @@ class VirtXML(Virsh, XMLClass): def set_diskdev(self, diskdev): self.set_attributes('/domain/devices/disk/target', dev=diskdev) - + def define(self, ip): return self.run(ip, 'define', self.xml_string) @@ -374,7 +381,8 @@ class VirtXML(Virsh, XMLClass): bridgeStr = self.get_value_xpath( '/domain/devices/interface/source/@bridge') return bridgeStr - + + def dumpxml(self, ip): cmd = 'virsh -c %s dumpxml %s' % (self.vuri, self.dname) s, o = utils.run_remote(ip, cmd)

2 2

[PATCH] [TEST] Resubmit PoolXML class for creating a virtual pool in vxml.py
by Guo Lian Yun 15 May '08

15 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1210730487 25200 # Node ID 82e90471b04874cb48a473dd72468be6f784acba # Parent 06c87ac466e374f7ca5b7e3dd1923ee32f1ef2ce [TEST] Resubmit PoolXML class for creating a virtual pool in vxml.py Removed source tag and add pool destroy function Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 06c87ac466e3 -r 82e90471b048 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Tue May 13 19:01:27 2008 -0700 @@ -37,6 +37,9 @@ default_bridge_name = 'testbridge' default_bridge_name = 'testbridge' default_network_name = 'default-net' +#vxml.PoolXML +default_pool_name = 'testpool' + # vxml.VirtXML default_domname = 'domU1' default_memory = 128 diff -r 06c87ac466e3 -r 82e90471b048 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Tue May 13 19:01:27 2008 -0700 @@ -143,12 +143,14 @@ class Virsh: self.vuri = 'qemu:///system' def run(self, ip, vcmd, param): - file_arg_cmds = ['define', 'create', 'net-create'] + file_arg_cmds = ['define', 'create', 'net-create', 'pool-create'] if vcmd in file_arg_cmds: ntf = tempfile.NamedTemporaryFile('w') ntf.write(param) ntf.flush() name = ntf.name + elif vcmd == 'pool-destroy': + name = param elif param is None: name = "" else: @@ -211,6 +213,28 @@ class NetXML(Virsh, XMLClass): def create_vnet(self): return self.run(self.server, 'net-create', self.xml_string) +class PoolXML(Virsh, XMLClass): + + def __init__(self, server, poolname=const.default_pool_name, + virt='xen'): + + XMLClass.__init__(self) + if virt == 'XenFV': + virt = 'xen' + Virsh.__init__(self, str(virt).lower()) + self.pool_name = poolname + self.server = server + + pool = self.add_sub_node(self.xdoc, 'pool', type='dir') + self.add_sub_node(pool, 'name', self.pool_name) + target = self.add_sub_node(pool, 'target') + self.add_sub_node(target, 'path', '/tmp') + + def create_vpool(self): + return self.run(self.server, 'pool-create', self.xml_string) + + def destroy_vpool(self): + return self.run(self.server, 'pool-destroy', self.pool_name) class VirtXML(Virsh, XMLClass): """Base class for all XML generation & operation"""

2 1

[PATCH] ProcessorRASD, the class that won't go away
by Jay Gagnon 15 May '08

15 May '08

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1210778696 14400 # Node ID 5d6e45906bf07c81d973e2edcc10dcefbc265dab # Parent 0b26d79ea3283461b349d20dbcfdf1715344afcd ProcessorRASD, the class that won't go away Around and round we go on the merry-go-round of indecision, hopefully for our last ride. The definitely probably absolutely tentative final plan is that the default representation of processors as virt_device structs will be one per domain, with a quantity. Virt_Devices will just need to be told how to handle that, and all the RASD stuff will be much happier for it. And then we will never speak of this again. So today being my last official day on the team, I kind of have to get this out in a not perfect state. From what I can see it does what it is supposed to do, but it is entirely possible (likely?) that there are a few things in here that aren't really great things to do. I wish I could polish it more but I think I've at least got it to the point where any work left to be done is generic "not a great idea in C" problems, as opposed to the much more annoying "what exactly are we supposed to do in this case" problems. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r 0b26d79ea328 -r 5d6e45906bf0 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Fri May 02 16:32:37 2008 -0400 +++ b/libxkutil/device_parsing.c Wed May 14 11:24:56 2008 -0400 @@ -337,7 +337,6 @@ static int parse_vcpu_device(xmlNode *no struct virt_device *list = NULL; char *count_str; int count; - int i; count_str = get_node_content(node); if (count_str == NULL) @@ -347,24 +346,15 @@ static int parse_vcpu_device(xmlNode *no free(count_str); - list = calloc(count, sizeof(*list)); + list = calloc(1, sizeof(*list)); if (list == NULL) goto err; - - for (i = 0; i < count; i++) { - struct virt_device *vdev = &list[i]; - struct vcpu_device *cdev = &vdev->dev.vcpu; - - cdev->number = i; - - vdev->type = CIM_RES_TYPE_PROC; - if (asprintf(&vdev->id, "%i", i) == -1) - vdev->id = NULL; - } + + list->dev.vcpu.quantity = count; *vdevs = list; - return count; + return 1; err: free(list); @@ -620,7 +610,7 @@ struct virt_device *virt_device_dup(stru dev->dev.mem.size = _dev->dev.mem.size; dev->dev.mem.maxsize = _dev->dev.mem.maxsize; } else if (dev->type == CIM_RES_TYPE_PROC) { - dev->dev.vcpu.number = _dev->dev.vcpu.number; + dev->dev.vcpu.quantity = _dev->dev.vcpu.quantity; } else if (dev->type == CIM_RES_TYPE_EMU) { DUP_FIELD(dev, _dev, dev.emu.path); } else if (dev->type == CIM_RES_TYPE_GRAPHICS) { @@ -672,6 +662,32 @@ static int _get_mem_device(const char *x return 1; } +static int _get_proc_device(const char *xml, struct virt_device **list) +{ + struct virt_device *proc_devs = NULL; + struct virt_device *proc_dev = NULL; + int ret; + + ret = parse_devices(xml, &proc_devs, CIM_RES_TYPE_PROC); + if (ret <= 0) + return ret; + + proc_dev = malloc(sizeof(*proc_dev)); + if (proc_dev == NULL) + return 0; + + memset(proc_dev, 0, sizeof(*proc_dev)); + + proc_dev->type = CIM_RES_TYPE_PROC; + proc_dev->id = strdup("proc"); + proc_dev->dev.vcpu.quantity = proc_devs[0].dev.vcpu.quantity; + *list = proc_dev; + + cleanup_virt_devices(&proc_devs, ret); + + return 1; +}; + int get_devices(virDomainPtr dom, struct virt_device **list, int type) { char *xml; @@ -683,6 +699,8 @@ int get_devices(virDomainPtr dom, struct if (type == CIM_RES_TYPE_MEM) ret = _get_mem_device(xml, list); + else if (type == CIM_RES_TYPE_PROC) + ret = _get_proc_device(xml, list); else ret = parse_devices(xml, list, type); diff -r 0b26d79ea328 -r 5d6e45906bf0 libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Fri May 02 16:32:37 2008 -0400 +++ b/libxkutil/device_parsing.h Wed May 14 11:24:56 2008 -0400 @@ -50,7 +50,7 @@ struct mem_device { }; struct vcpu_device { - uint64_t number; + uint64_t quantity; }; struct emu_device { diff -r 0b26d79ea328 -r 5d6e45906bf0 src/Virt_Device.c --- a/src/Virt_Device.c Fri May 02 16:32:37 2008 -0400 +++ b/src/Virt_Device.c Wed May 14 11:24:56 2008 -0400 @@ -174,23 +174,6 @@ static CMPIInstance *mem_instance(const return inst; } -static CMPIInstance *vcpu_instance(const CMPIBroker *broker, - struct vcpu_device *dev, - const virDomainPtr dom, - const char *ns) -{ - CMPIInstance *inst; - virConnectPtr conn; - - conn = virDomainGetConnect(dom); - inst = get_typed_instance(broker, - pfx_from_conn(conn), - "Processor", - ns); - - return inst; -} - static int device_set_devid(CMPIInstance *instance, struct virt_device *dev, const virDomainPtr dom) @@ -229,43 +212,114 @@ static int device_set_systemname(CMPIIns return 1; } -static CMPIInstance *device_instance(const CMPIBroker *broker, - struct virt_device *dev, - const virDomainPtr dom, - const char *ns) -{ - CMPIInstance *instance; - - if (dev->type == CIM_RES_TYPE_NET) - instance = net_instance(broker, - &dev->dev.net, - dom, - ns); - else if (dev->type == CIM_RES_TYPE_DISK) - instance = disk_instance(broker, - &dev->dev.disk, - dom, - ns); - else if (dev->type == CIM_RES_TYPE_MEM) - instance = mem_instance(broker, - &dev->dev.mem, - dom, - ns); - else if (dev->type == CIM_RES_TYPE_PROC) - instance = vcpu_instance(broker, - &dev->dev.vcpu, - dom, - ns); - else - return NULL; - - if (!instance) - return NULL; - - device_set_devid(instance, dev, dom); - device_set_systemname(instance, dom); - - return instance; +static char *get_vcpu_inst_id(const virDomainPtr dom, + int proc_num) +{ + int rc; + char *id_num = NULL; + char *dev_id = NULL; + + rc = asprintf(&id_num, "%d", proc_num); + if (rc == -1) { + free(dev_id); + dev_id = NULL; + goto out; + } + + dev_id = get_fq_devid((char *)virDomainGetName(dom), id_num); + free(id_num); + + out: + return dev_id; +} + +static bool vcpu_instances(const CMPIBroker *broker, + const virDomainPtr dom, + const char *ns, + uint64_t proc_count, + struct inst_list *list) +{ + int i; + char *dev_id; + CMPIInstance *inst; + virConnectPtr conn; + + for (i = 0; i < proc_count; i++) { + conn = virDomainGetConnect(dom); + inst = get_typed_instance(broker, + pfx_from_conn(conn), + "Processor", + ns); + if (inst == NULL) + return false; + + dev_id = get_vcpu_inst_id(dom, i); + CMSetProperty(inst, "DeviceID", + (CMPIValue *)dev_id, CMPI_chars); + free(dev_id); + + device_set_systemname(inst, dom); + inst_list_add(list, inst); + } + + return true; +} + +static bool device_instances(const CMPIBroker *broker, + struct virt_device *devs, + int count, + const virDomainPtr dom, + const char *ns, + struct inst_list *list) +{ + int i; + bool ret; + uint64_t proc_count = 0; + bool proc_found = false; + CMPIInstance *instance = NULL; + + for (i = 0; i < count; i++) { + struct virt_device *dev = &devs[i]; + + if (dev->type == CIM_RES_TYPE_NET) + instance = net_instance(broker, + &dev->dev.net, + dom, + ns); + else if (dev->type == CIM_RES_TYPE_DISK) + instance = disk_instance(broker, + &dev->dev.disk, + dom, + ns); + else if (dev->type == CIM_RES_TYPE_MEM) + instance = mem_instance(broker, + &dev->dev.mem, + dom, + ns); + else if (dev->type == CIM_RES_TYPE_PROC) { + proc_found = true; + proc_count = dev->dev.vcpu.quantity; + continue; + } else + return false; + + if (!instance) + return false; + + device_set_devid(instance, dev, dom); + device_set_systemname(instance, dom); + inst_list_add(list, instance); + } + + if (proc_count) { + ret = vcpu_instances(broker, + dom, + ns, + proc_count, + list); + } + + return true; } uint16_t res_type_from_device_classname(const char *classname) @@ -290,25 +344,27 @@ static CMPIStatus _get_devices(const CMP { CMPIStatus s = {CMPI_RC_OK, NULL}; int count; - int i; + bool rc; struct virt_device *devs = NULL; count = get_devices(dom, &devs, type); if (count <= 0) goto out; - for (i = 0; i < count; i++) { - CMPIInstance *dev = NULL; - - dev = device_instance(broker, - &devs[i], - dom, - NAMESPACE(reference)); - if (dev) - inst_list_add(list, dev); - - cleanup_virt_device(&devs[i]); - } + rc = device_instances(broker, + devs, + count, + dom, + NAMESPACE(reference), + list); + + if (!rc) { + CU_DEBUG("Problem getting device instances"); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Couldn't get device instances"); + + cleanup_virt_devices(&devs, count); out: free(devs); @@ -427,6 +483,29 @@ static int parse_devid(const char *devid return 1; } +static int proc_dev_list(uint64_t quantity, + struct virt_device **list) +{ + int i; + int rc; + + + *list = (struct virt_device *)calloc(quantity, + sizeof(struct virt_device)); + + for (i = 0; i < quantity; i++) { + char *dev_num; + + rc = asprintf(&dev_num, "%d", i); + + (*list)[i].id = strdup(dev_num); + + free(dev_num); + } + + return quantity; +} + static struct virt_device *find_dom_dev(virDomainPtr dom, char *device, int type) @@ -439,6 +518,17 @@ static struct virt_device *find_dom_dev( count = get_devices(dom, &list, type); if (!count) goto out; + + if (type == CIM_RES_TYPE_PROC) { + struct virt_device *tmp_list; + int tmp_count; + + tmp_count = proc_dev_list(list[0].dev.vcpu.quantity, + &tmp_list); + cleanup_virt_devices(&list, count); + list = tmp_list; + count = tmp_count; + } for (i = 0; i < count; i++) { if (STREQC(device, list[i].id)) @@ -462,10 +552,13 @@ CMPIStatus get_device_by_name(const CMPI CMPIStatus s = {CMPI_RC_OK, NULL}; char *domain = NULL; char *device = NULL; - CMPIInstance *instance = NULL; virConnectPtr conn = NULL; virDomainPtr dom = NULL; struct virt_device *dev = NULL; + struct inst_list tmp_list; + bool rc; + + inst_list_init(&tmp_list); conn = connect_by_classname(broker, CLASSNAME(reference), &s); if (conn == NULL) { @@ -501,13 +594,27 @@ CMPIStatus get_device_by_name(const CMPI goto err; } - instance = device_instance(broker, - dev, - dom, - NAMESPACE(reference)); + if (type == CIM_RES_TYPE_PROC) { + CU_DEBUG("PROC"); + rc = vcpu_instances(broker, + dom, + NAMESPACE(reference), + 1, + &tmp_list); + } else { + + rc = device_instances(broker, + dev, + 1, + dom, + NAMESPACE(reference), + &tmp_list); + } + cleanup_virt_device(dev); - *_inst = instance; + *_inst = tmp_list.list[0]; + CU_DEBUG("cleaning up"); err: virDomainFree(dom); @@ -515,6 +622,7 @@ CMPIStatus get_device_by_name(const CMPI free(device); out: + inst_list_free(&tmp_list); virConnectClose(conn); return s; diff -r 0b26d79ea328 -r 5d6e45906bf0 src/Virt_RASD.c --- a/src/Virt_RASD.c Fri May 02 16:32:37 2008 -0400 +++ b/src/Virt_RASD.c Wed May 14 11:24:56 2008 -0400 @@ -173,10 +173,8 @@ static CMPIInstance *rasd_from_vdev(cons CMSetProperty(inst, "Limit", (CMPIValue *)&dev->dev.mem.maxsize, CMPI_uint64); } else if (dev->type == CIM_RES_TYPE_PROC) { - /* This would be the place to set the virtualquantity. */ - uint64_t quantity = dev->dev.vcpu.number + 1; CMSetProperty(inst, "VirtualQuantity", - (CMPIValue *)&quantity, CMPI_uint64); + (CMPIValue *)&dev->dev.vcpu.quantity, CMPI_uint64); } /* FIXME: Put the HostResource in place */

2 1

CimTest Report for KVM on F9 14-05-2008
by Deepti B Kalakeri 14 May '08

14 May '08

======================================================================== CIM Test Report for KVM on F9 with latest libvirt-cim and libcmpiutil ======================================================================== Distro : Fedora 9 Beta Kernel : 2.6.25-0.121.rc5.git4.fc9 Libvirt : libvirt-0.4.2-1.fc9.x86_64 CIMOM : pegasus PyWBEM : pywbem-0.6 CIM Schema : cimv216Experimental LibCMPIutil : 77 LibVirtCIM : 587 CIMTEST : 138 ======================================================= PASS : 94 FAIL : 15 XFAIL : 4 SKIP : 16 ----------------- Total : 129 ======================================================= List of tc that are failing ComputerSystem - 40_RSC_start.py: FAIL ComputerSystemIndication - 01_created_indication.py: FAIL ElementCapabilities - 01_forward.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL Memory - 01_memory.py: FAIL [This is extra failure from the last test run , this is bcs of the recent memory modifications.] Memory - 02_defgetmem.py: FAIL NetworkPort - 03_user_netport.py: FAIL Processor - 02_definesys_get_procs.py: FAIL SettingsDefine - 02_reverse.py: FAIL SettingsDefineCapabilities - 01_forward.py: FAIL [ This tc was skipped last time, fails here bcs it require the storage pool.] VSSD - 03_vssd_gi_errs.py: FAIL VirtualSystemManagementService - 01_definesystem_name.py: FAIL VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL VirtualSystemManagementService - 06_addresource.py: FAIL VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py Please find the complete report attached with the mail. Thanks and Regards, Deepti. Starting test suite: libvirt-cim Cleaned log files. Testing KVM hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 85769 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<85769> ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 85769 ERROR - ERROR: VS DomST1 transition from suspend State to Activate state was not Successful Bug:<85769> ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: SKIP ComputerSystem - 27_define_suspend_errs.py: SKIP ComputerSystem - 32_start_reboot.py: SKIP ComputerSystem - 33_suspend_reboot.py: SKIP ComputerSystem - 35_start_reset.py: SKIP ComputerSystem - 40_RSC_start.py: FAIL ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT'] ERROR - Exception: ('Unable create domain %s using DefineSystem()', 'test_domain') ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: FAIL ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT'] ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: FAIL ERROR - ElementCapabilities association classname error ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: PASS ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS EnabledLogicalElementCapabilities - 01_enum.py: PASS EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: PASS HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - HostedResourcePool has returned 3 instances, expected 4 instances HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: PASS HostedDependency - 02_reverse.py: PASS HostedDependency - 03_enabledstate.py: PASS HostedDependency - 04_reverse_errs.py: PASS HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: PASS Memory - 01_memory.py: FAIL ERROR - Capacity should be 256 MB instead of 262144 MB Memory - 02_defgetmem.py: FAIL ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT'] ERROR - Exception: Unable to create domain domu using DefineSys() Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: PASS NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: FAIL ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: FAIL ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT'] ERROR - Exception: Unable create domain test_domain using DefineSystem() Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: PASS Profile - 02_profile_to_elec.py: SKIP Profile - 03_rprofile_gi_errs.py: SKIP RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: PASS ResourcePool - 02_rp_gi_errors.py: PASS ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL Bug: 92173 ERROR - Unexpected rc code 1 and description CIM_ERR_FAILED: Unknown Method InvokeMethod(AddResourcesToResourcePool): CIM_ERR_FAILED: Unknown Method Bug:<92173> ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: FAIL ERROR - Mistmatching value for VSSDComponent association CIM_ERR_NOT_FOUND: No such instance (virtgst/proc) SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: FAIL ERROR - AttributeError : 'list' object has no attribute 'InstanceID' CIM_ERR_NOT_FOUND: No such instance (foo) SettingsDefineCapabilities - 03_forward_errs.py: PASS SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: SKIP VSSD - 04_vssd_to_rasd.py: PASS VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: FAIL ERROR - Error invoke method `DefineSystem'. invalid extra attributes [u'EMBEDDEDOBJECT'] VirtualSystemManagementService - 02_destroysystem.py: PASS VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL ERROR - destroy_fail>>noname: Error executing DestroySystem, exception details below ERROR - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.') ERROR - destroy_fail>>nonexistent: Error executing DestroySystem, exception details below ERROR - (1, u'CIM_ERR_FAILED: Failed to find domain') InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain name. InvokeMethod(DestroySystem): CIM_ERR_FAILED: Failed to find domain VirtualSystemManagementService - 06_addresource.py: FAIL ERROR - Error invoking AddRS ERROR - (1, u'CIM_ERR_FAILED: Failed to create domain') InvokeMethod(AddResourceSettings): CIM_ERR_FAILED: Failed to create domain VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853 ERROR - Error invoking ModifyRS ERROR - (1, u'CIM_ERR_FAILED: Failed to create domain') InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Failed to create domain Bug:<90853> VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS

1 1

[PATCH] [TEST] add AC and related pool class for LXC AC support
by Guo Lian Yun 14 May '08

14 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1210750647 25200 # Node ID 2466e8715737283b27fe04426b1f7ebc555ac35b # Parent 06c87ac466e374f7ca5b7e3dd1923ee32f1ef2ce [TEST] add AC and related pool class for LXC AC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 06c87ac466e3 -r 2466e8715737 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Wed May 14 00:37:27 2008 -0700 @@ -119,10 +119,16 @@ class KVM_MemoryPool(CIM_ResourcePool): class KVM_MemoryPool(CIM_ResourcePool): pass +class LXC_MemoryPool(CIM_ResourcePool): + pass + class Xen_ProcessorPool(CIM_ResourcePool): pass class KVM_ProcessorPool(CIM_ResourcePool): + pass + +class LXC_ProcessorPool(CIM_ResourcePool): pass class Xen_VirtualSystemManagementCapabilities(CIM_VirtualSystemManagementCapabilities): @@ -149,12 +155,18 @@ class KVM_DiskPool(CIM_ResourcePool): class KVM_DiskPool(CIM_ResourcePool): pass +class LXC_DiskPool(CIM_ResourcePool): + pass + class Xen_NetworkPool(CIM_ResourcePool): pass class KVM_NetworkPool(CIM_ResourcePool): pass +class LXC_NetworkPool(CIM_ResourcePool): + pass + class Xen_VirtualSystemMigrationCapabilities(Virt_VirtualSystemMigrationCapabilities): pass @@ -165,6 +177,9 @@ class Xen_AllocationCapabilities(CIM_All pass class KVM_AllocationCapabilities(CIM_AllocationCapabilities): + pass + +class LXC_AllocationCapabilities(CIM_AllocationCapabilities): pass class Xen_VirtualSystemMigrationSettingData(CIM_VirtualSystemMigrationSettingData):

1 0

[PATCH] [TEST] add LXC class to library for test
by Guo Lian Yun 14 May '08

14 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1210749855 25200 # Node ID ea663bc93926cbff6fac7c484a2f61749b51eb32 # Parent 06c87ac466e374f7ca5b7e3dd1923ee32f1ef2ce [TEST] add LXC class to library for test Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 06c87ac466e3 -r ea663bc93926 suites/libvirt-cim/lib/XenKvmLib/devices.py --- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Wed May 14 00:24:15 2008 -0700 @@ -75,10 +75,16 @@ class KVM_LogicalDisk(CIM_LogicalDisk): class KVM_LogicalDisk(CIM_LogicalDisk): pass +class LXC_LogicalDisk(CIM_LogicalDisk): + pass + class Xen_NetworkPort(CIM_NetworkPort): pass class KVM_NetworkPort(CIM_NetworkPort): + pass + +class LXC_NetworkPort(CIM_NetworkPort): pass class Xen_Memory(CIM_Memory): @@ -87,10 +93,16 @@ class KVM_Memory(CIM_Memory): class KVM_Memory(CIM_Memory): pass +class LXC_Memory(CIM_Memory): + pass + class Xen_Processor(CIM_Processor): pass class KVM_Processor(CIM_Processor): + pass + +class LXC_Processor(CIM_Processor): pass def get_class(classname): diff -r 06c87ac466e3 -r ea663bc93926 suites/libvirt-cim/lib/XenKvmLib/hostsystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/hostsystem.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/hostsystem.py Wed May 14 00:24:15 2008 -0700 @@ -50,6 +50,8 @@ class KVM_HostSystem(CIM_System): class KVM_HostSystem(CIM_System): pass +class LXC_HostSystem(CIM_System): + pass def enumerate(server, virt='Xen'): conn = pywbem.WBEMConnection('http://%s' % server, diff -r 06c87ac466e3 -r ea663bc93926 suites/libvirt-cim/lib/XenKvmLib/rpcs.py --- a/suites/libvirt-cim/lib/XenKvmLib/rpcs.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/rpcs.py Wed May 14 00:24:15 2008 -0700 @@ -50,6 +50,8 @@ class KVM_ResourcePoolConfigurationServi class KVM_ResourcePoolConfigurationService(CIM_ResourcePoolConfigurationService): pass +class LXC_ResourcePoolConfigurationService(CIM_ResourcePoolConfigurationService): + pass def enumerate(server, classname): conn = pywbem.WBEMConnection('http://%s' % server, diff -r 06c87ac466e3 -r ea663bc93926 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Wed May 14 00:24:15 2008 -0700 @@ -64,6 +64,9 @@ class Xen_VirtualSystemManagementService pass class KVM_VirtualSystemManagementService(CIM_VirtualSystemManagementService): + pass + +class LXC_VirtualSystemManagementService(CIM_VirtualSystemManagementService): pass @eval_cls('VirtualSystemManagementService')

1 0

[PATCH] [TEST] Updating 01_forward.py of SDC
by Deepti B. Kalakeri 14 May '08

14 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210684825 25200 # Node ID cf44a468be8440eb3b09c9a43804af7ecf5f9ae0 # Parent a6ffa074aab4b3867358eb77c0dcc7c622c595d4 [TEST] Updating 01_forward.py of SDC. To use the storage pool present on the machine. This tc will now pass on latest libvirt-cim for KVM. This tc will require virsh_version() and diskpool_list() and create_diskpool() function changes to work. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r a6ffa074aab4 -r cf44a468be84 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue May 13 06:12:22 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Tue May 13 06:20:25 2008 -0700 @@ -59,17 +59,16 @@ from XenKvmLib import enumclass from XenKvmLib import enumclass from XenKvmLib.test_xml import netxml from XenKvmLib.test_doms import create_vnet -from VirtLib.live import net_list +from VirtLib.live import net_list, virsh_version from CimTest.ReturnCodes import PASS, FAIL, SKIP from CimTest.Globals import do_main, platform_sup, logger, \ CIM_ERROR_GETINSTANCE, CIM_ERROR_ASSOCIATORS from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import cleanup_restore, test_dpath, \ -create_diskpool_file +create_diskpool_file, diskpoolconf_rev, create_diskpool, dpoolname from XenKvmLib.common_util import print_field_error from XenKvmLib.const import CIM_REV -diskid = "%s/%s" % ("DiskPool", test_dpath) memid = "%s/%s" % ("MemoryPool", 0) procid = "%s/%s" % ("ProcessorPool", 0) libvirtcim_sdc_rasd_rev = 571 @@ -130,6 +129,18 @@ def get_pool_details(virt, server): def get_pool_details(virt, server): dpool = npool = mpool = ppool = None try : + libvirt_version = virsh_version(server, virt) + if virt == 'KVM' and libvirt_version >= '0.4.1' and \ + CIM_REV > diskpoolconf_rev: + diskid = "%s/%s" % ("DiskPool", dpoolname) + status = create_diskpool(server, virt=virt) + else: + diskid = "%s/%s" % ("DiskPool", test_dpath) + status = create_diskpool_file() + + if status != PASS: + return status, dpool, npool, mpool, ppool + dpool = get_pool_info(virt, server, diskid, poolname="DiskPool") mpool = get_pool_info(virt, server, memid, poolname= "MemoryPool") ppool = get_pool_info(virt, server, procid, poolname= "ProcessorPool") @@ -145,7 +156,7 @@ def get_pool_details(virt, server): if not ret: logger.error("Failed to create Virtual Network '%s'", test_network) - return SKIP + return SKIP, dpool, npool, mpool, ppool netid = "%s/%s" % ("NetworkPool", test_network) npool = get_pool_info(virt, server, netid, poolname= "NetworkPool") @@ -225,11 +236,6 @@ def main(): server = options.ip virt = options.virt - # Verify DiskPool on machine - status = create_diskpool_file() - if status != PASS: - return status - status, dpool, npool, mpool, ppool = get_pool_details(virt, server) if status != PASS or dpool.InstanceID == None or mpool.InstanceID == None \ or npool.InstanceID == None or ppool.InstanceID == None:

2 1

[PATCH] [TEST] Adding create_diskpool() function
by Deepti B. Kalakeri 14 May '08

14 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210684342 25200 # Node ID a6ffa074aab4b3867358eb77c0dcc7c622c595d4 # Parent f81fd5f73b3e71630bf2b6e6e6a51a8f7f254346 [TEST] Adding create_diskpool() function To create the storage pool on machine with libvirt >= 0.4.1 Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f81fd5f73b3e -r a6ffa074aab4 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue May 13 06:07:27 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue May 13 06:12:22 2008 -0700 @@ -1,3 +1,4 @@ +#!/usr/bin/python # # Copyright 2008 IBM Corp. # @@ -32,9 +33,12 @@ from XenKvmLib.classes import get_typed_ from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, log_param, CIM_ERROR_ENUMERATE from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -from XenKvmLib.const import CIM_REV +from XenKvmLib.const import CIM_REV, default_pool_name +from VirtLib.live import diskpool_list +from XenKvmLib.vxml import PoolXML test_dpath = "foo" +dpoolname = default_pool_name diskpoolconf_rev = 558 if CIM_REV < diskpoolconf_rev: @@ -294,3 +298,17 @@ def create_diskpool_file(): return conf_file() +def create_diskpool(server, virt='KVM'): + dpool_list = diskpool_list(server, virt='KVM') + if len(dpool_list) > 0: + dpoolname=dpool_list[0] + else: + global dpoolname + diskxml = PoolXML(server, virt=virt) + ret = diskxml.create_vpool() + if not ret: + logger.error('Failed to create the disk pool "%s"', + dpoolname) + return FAIL + logger.info("Disk Pool on machine is: %s ", dpoolname) + return PASS

2 1

[PATCH] [TEST] Add PoolXML class for creating a virtual pool in vxml.py
by yunguol＠cn.ibm.com 14 May '08

14 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1210779243 -28800 # Node ID dcb1f04780e641973d1070440bc6f50fac2e9831 # Parent cdcf642c493a548d2deb499f223bb9a1f414cb3c [TEST] Add PoolXML class for creating a virtual pool in vxml.py Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r cdcf642c493a -r dcb1f04780e6 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Mon May 12 03:23:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Wed May 14 23:34:03 2008 +0800 @@ -37,6 +37,9 @@ default_bridge_name = 'testbridge' default_network_name = 'default-net' +#vxml.PoolXML +default_pool_name = 'testpool' + # vxml.VirtXML default_domname = 'domU1' default_memory = 128 diff -r cdcf642c493a -r dcb1f04780e6 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon May 12 03:23:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed May 14 23:34:03 2008 +0800 @@ -143,7 +143,7 @@ self.vuri = 'qemu:///system' def run(self, ip, vcmd, param): - file_arg_cmds = ['define', 'create', 'net-create'] + file_arg_cmds = ['define', 'create', 'net-create', 'pool-create'] if vcmd in file_arg_cmds: ntf = tempfile.NamedTemporaryFile('w') ntf.write(param) @@ -211,6 +211,27 @@ def create_vnet(self): return self.run(self.server, 'net-create', self.xml_string) +class PoolXML(Virsh, XMLClass): + + def __init__(self, server, poolname=const.default_pool_name, + virt='xen'): + + XMLClass.__init__(self) + if virt == 'XenFV': + virt = 'xen' + Virsh.__init__(self, str(virt).lower()) + self.pool_name = poolname + self.server = server + + pool = self.add_sub_node(self.xdoc, 'pool', type='dir') + self.add_sub_node(pool, 'name', self.pool_name) + source = self.add_sub_node(pool, 'source') + self.add_sub_node(source, 'device', path='/tmp') + target = self.add_sub_node(pool, 'target') + self.add_sub_node(target, 'path', '/tmp') + + def create_vpool(self): + return self.run(self.server, 'pool-create', self.xml_string) class VirtXML(Virsh, XMLClass): """Base class for all XML generation & operation"""

3 3

[PATCH] [TEST] Adding virsh_version() and diskpool_list() to live.py
by Deepti B. Kalakeri 13 May '08

13 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210684047 25200 # Node ID f81fd5f73b3e71630bf2b6e6e6a51a8f7f254346 # Parent cdcf642c493a548d2deb499f223bb9a1f414cb3c [TEST] Adding virsh_version() and diskpool_list() to live.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r cdcf642c493a -r f81fd5f73b3e lib/VirtLib/live.py --- a/lib/VirtLib/live.py Mon May 12 03:23:12 2008 -0700 +++ b/lib/VirtLib/live.py Tue May 13 06:07:27 2008 -0700 @@ -313,3 +313,28 @@ def network_by_bridge(bridge, server, vi return network return None + +def virsh_version(server, virt="KVM"): + cmd = "virsh -c %s -v " % utils.virt2uri(virt) + ret, out = utils.run_remote(server, cmd) + if ret != 0: + return None + return out + +def diskpool_list(server, virt="KVM"): + """Function to list active DiskPool list""" + names = [] + cmd = "virsh -c %s pool-list | sed -e '1,2 d' -e '$ d'" % \ + utils.virt2uri(virt) + ret, out = utils.run_remote(server, cmd) + + if ret != 0: + return names + + lines = out.split("\n") + for line in lines: + disk_pool = line.split() + if len(disk_pool) >= 1 and disk_pool[1] == "active": + names.append(disk_pool[0]) + + return names

1 0

[PATCH] [TEST] Capture return from create_using_definesystem() in 01_created_indication.py
by Kaitlin Rupert 13 May '08

13 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1210559507 25200 # Node ID 0647d07426408da321b42cb23eaefab0032f50e6 # Parent 336c6f965baed9b56b484507171ad940e09e6096 [TEST] Capture return from create_using_definesystem() in 01_created_indication.py This test was returning a false positive in the case where create_using_definesystem() fails. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 336c6f965bae -r 0647d0742640 suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py --- a/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Wed May 07 09:54:57 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystemIndication/01_created_indication.py Sun May 11 19:31:47 2008 -0700 @@ -63,7 +63,13 @@ else: sys.exit(0) else: - create_using_definesystem(test_dom, options.ip, None, None, options.virt) + status = create_using_definesystem(test_dom, options.ip, None, None, options.virt) + if status != PASS: + sub.unsubscribe(dict['default_auth']) + logger.info("Cancelling subscription for %s" % indication_name) + os.kill(pid, signal.SIGKILL) + return status + for i in range(0,100): pw = os.waitpid(pid, os.WNOHANG)[1] if pw == 0:

2 1

[PATCH] Make ReferencedConfiguration optional
by Kaitlin Rupert 13 May '08

13 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1210633918 25200 # Node ID b9ddfef54aa7b51515efea27b95faf00edc5ace7 # Parent 1a31955ae3975f88582287fd1c3bbb7a57da3ed9 Make ReferencedConfiguration optional. The profile states that this parameter can be NULL. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 1a31955ae397 -r b9ddfef54aa7 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon May 12 09:21:07 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon May 12 16:11:58 2008 -0700 @@ -1373,7 +1373,7 @@ .handler = define_system, .args = {{"SystemSettings", CMPI_instance, false}, {"ResourceSettings", CMPI_instanceA, false}, - {"ReferenceConfiguration", CMPI_ref, false}, + {"ReferenceConfiguration", CMPI_ref, true}, ARG_END } };

1 0

[PATCH] [CU] url should be options.url in indication_tester.py
by Kaitlin Rupert 13 May '08

13 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1210633243 25200 # Node ID ea4548b7afe19e8d186246f4cce405565a1eb8c2 # Parent 79873958006140bbcd14122f9c7e1e80c00d9eef [CU] url should be options.url in indication_tester.py Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 798739580061 -r ea4548b7afe1 tools/indication_tester.py --- a/tools/indication_tester.py Fri May 02 11:32:27 2008 -0600 +++ b/tools/indication_tester.py Mon May 12 16:00:43 2008 -0700 @@ -413,7 +413,7 @@ if ":" in options.url: (sysname, port) = options.url.split(":") else: - sysname = url + sysname = options.url if options.dump: dump_xml(options.name, args[0], options.ns, sysname)

1 0

[PATCH] [TEST] #3 Updating 01_forward.py of SDC
by Deepti B. Kalakeri 12 May '08

12 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210587792 25200 # Node ID cdcf642c493a548d2deb499f223bb9a1f414cb3c # Parent 336c6f965baed9b56b484507171ad940e09e6096 [TEST] #3 Updating 01_forward.py of SDC. 1) To make use of the lib fn conf_file(), cleanup_restore() and create_diskpool_file(). 2) To use the lib fn print_field_error. 3) To retain the PropertyPolicy, ValueRole, ValueRange depending on the revision no. 4) Tested on rpm based libvirt-cim KVM machine, latest libvirt-cim for KVM and Xen, XenFV. 5) This tc will fail on latest libvirt-cim for KVM, need storage pool to make test case work. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 336c6f965bae -r cdcf642c493a suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed May 07 09:54:57 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Mon May 12 03:23:12 2008 -0700 @@ -55,205 +55,189 @@ import sys import sys import os from distutils.file_util import move_file -from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import enumclass -from CimTest import Globals -from CimTest.Globals import do_main from XenKvmLib.test_xml import netxml from XenKvmLib.test_doms import create_vnet from VirtLib.live import net_list from CimTest.ReturnCodes import PASS, FAIL, SKIP +from CimTest.Globals import do_main, platform_sup, logger, \ +CIM_ERROR_GETINSTANCE, CIM_ERROR_ASSOCIATORS +from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file +from XenKvmLib.common_util import print_field_error +from XenKvmLib.const import CIM_REV -sup_types = ['Xen'] - -status = PASS -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "SSDC_01_forward" diskid = "%s/%s" % ("DiskPool", test_dpath) memid = "%s/%s" % ("MemoryPool", 0) procid = "%s/%s" % ("ProcessorPool", 0) +libvirtcim_sdc_rasd_rev = 571 -def conf_file(): + +def get_or_bail(virt, ip, id, pool_class): """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = SKIP - sys.exit(status) - -def clean_up_restore(): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = SKIP - sys.exit(status) - - -def get_or_bail(ip, id, pool_class): - """ - Getinstance for the CLass and return instance on success, otherwise + Getinstance for the Class and return instance on success, otherwise exit after cleanup_restore . """ key_list = { 'InstanceID' : id } - try: - instance = enumclass.getInstance(ip, pool_class, key_list) + instance = enumclass.getInstance(ip, pool_class, key_list, virt) except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, '%s' % pool_class) - Globals.logger.error("Exception: %s", detail) - clean_up_restore() - status = FAIL - sys.exit(status) + logger.error(CIM_ERROR_GETINSTANCE, '%s' % pool_class) + logger.error("Exception: %s", detail) + cleanup_restore() + sys.exit(FAIL) return instance -def init_list(disk, mem, net, proc): +def init_list(virt, dpool, npool, mpool, ppool): """ Creating the lists that will be used for comparisons. """ instlist = [ - disk.InstanceID, \ - mem.InstanceID, \ - net.InstanceID, \ - proc.InstanceID - ] + dpool.InstanceID, + mpool.InstanceID, + npool.InstanceID, + ppool.InstanceID + ] cllist = [ - "Xen_DiskResourceAllocationSettingData", \ - "Xen_MemResourceAllocationSettingData", \ - "Xen_NetResourceAllocationSettingData", \ - "Xen_ProcResourceAllocationSettingData" + get_typed_class(virt, "DiskResourceAllocationSettingData"), + get_typed_class(virt, "MemResourceAllocationSettingData"), + get_typed_class(virt, "NetResourceAllocationSettingData"), + get_typed_class(virt, "ProcResourceAllocationSettingData") ] rtype = { - "Xen_DiskResourceAllocationSettingData" : 17, \ - "Xen_MemResourceAllocationSettingData" : 4, \ - "Xen_NetResourceAllocationSettingData" : 10, \ - "Xen_ProcResourceAllocationSettingData" : 3 + get_typed_class(virt, "DiskResourceAllocationSettingData") : 17, + get_typed_class(virt, "MemResourceAllocationSettingData") : 4, + get_typed_class(virt, "NetResourceAllocationSettingData") : 10, + get_typed_class(virt, "ProcResourceAllocationSettingData") : 3 } rangelist = { - "Default" : 0, \ - "Minimum" : 1, \ - "Maximum" : 2, \ + "Default" : 0, + "Minimum" : 1, + "Maximum" : 2, "Increment" : 3 } return instlist, cllist, rtype, rangelist +def get_pool_info(virt, server, devid, poolname=""): + pool_cname = get_typed_class(virt, poolname) + pool_cn = eval("enumclass." + pool_cname) + return get_or_bail(virt, server, id=devid, pool_class=pool_cn) -def print_error(index, fieldname, assoc_info, exp_value): - ret_value = assoc_info[index][fieldname] - Globals.logger.error("%s Mismatch", fieldname) - Globals.logger.error("Returned %s instead of %s", ret_value, exp_value) +def get_pool_details(virt, server): + dpool = npool = mpool = ppool = None + try : + dpool = get_pool_info(virt, server, diskid, poolname="DiskPool") + mpool = get_pool_info(virt, server, memid, poolname= "MemoryPool") + ppool = get_pool_info(virt, server, procid, poolname= "ProcessorPool") - -@do_main(sup_types) -def main(): - options = main.options - global status - - cn = 'Xen_AllocationCapabilities' - loop = 0 - server = options.ip - - # Taking care of already existing diskconf file - # Creating diskpool.conf if it does not exist - # Otherwise backing up the prev file and create new one. - os.system("rm -f %s" % back_disk_file ) - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() - - try : - disk = get_or_bail(server, id=diskid, \ - pool_class=enumclass.Xen_DiskPool) - mem = get_or_bail(server, id = memid, \ - pool_class=enumclass.Xen_MemoryPool) - vir_network = net_list(server) + vir_network = net_list(server, virt) if len(vir_network) > 0: test_network = vir_network[0] else: bridgename = 'testbridge' test_network = 'default-net' net_xml, bridge = netxml(server, bridgename, test_network) - ret = create_vnet(server, net_xml) + ret = create_vnet(server, net_xml, virt) if not ret: - Globals.logger.error("Failed to create the Virtual Network '%s'", \ - test_network) + logger.error("Failed to create Virtual Network '%s'", + test_network) return SKIP + netid = "%s/%s" % ("NetworkPool", test_network) - net = get_or_bail(server, id = netid, \ - pool_class=enumclass.Xen_NetworkPool) - proc = get_or_bail(server, id = procid, \ - pool_class=enumclass.Xen_ProcessorPool) + npool = get_pool_info(virt, server, netid, poolname= "NetworkPool") except Exception, detail: - Globals.logger.error("Exception: %s", detail) - clean_up_restore() - status = FAIL - return status + logger.error("Exception: %s", detail) + return FAIL, dpool, npool, mpool, ppool - instlist, cllist, rtype, rangelist = init_list(disk, mem, net, proc ) + return PASS, dpool, npool, mpool, ppool +def verify_rasd_fields(loop, assoc_info, cllist, rtype, rangelist): + for inst in assoc_info: + if inst.classname != cllist[loop]: + print_field_error("Classname", inst.classname, cllist[loop]) + return FAIL + if inst['ResourceType'] != rtype[cllist[loop]]: + print_field_error("ResourceType", inst['ResourceType'], + rtype[cllist[loop]]) + return FAIL + + # The following properties have been removed in the patchset 571 + # but is present in the rpm libvirt-cim and hence retained it. + + if CIM_REV < libvirtcim_sdc_rasd_rev: + ppolicy = inst['PropertyPolicy'] + if ppolicy != 0 and ppolicy != 1: + print_field_error("PropertyPolicy", inst['PropertyPolicy'], + ppolicy) + return FAIL + + vrole = inst['ValueRole'] + if vrole < 0 or vrole > 4: + print_field_error("ValueRole", inst['ValueRole'], vrole) + return FAIL + + insid = inst['InstanceID'] + vrange = rangelist[insid] + if vrange != inst['ValueRange']: + print_field_error("ValueRange", inst['ValueRange'], vrange) + return FAIL + + return PASS + +def verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool): + loop = 0 + instlist, cllist, rtype, rangelist = init_list(virt, dpool, npool, mpool, + ppool) + assoc_cname = get_typed_class(virt, "SettingsDefineCapabilities") + cn = get_typed_class(virt, "AllocationCapabilities") for instid in sorted(instlist): try: - assoc_info = assoc.Associators(options.ip, \ - "Xen_SettingsDefineCapabilities", - cn, - InstanceID = instid) + assoc_info = assoc.Associators(server, assoc_cname, cn, + InstanceID = instid, virt=virt) if len(assoc_info) != 4: - Globals.logger.error("Xen_SettingsDefineCapabilities returned \ -%i ResourcePool objects instead 4", len(assoc_info)) + logger.error("%s returned %i ResourcePool objects" + "instead 4", assoc_cname, len(assoc_info)) status = FAIL break - for i in range(len(assoc_info)): - if assoc_info[i].classname != cllist[loop]: - print_error(i, "Classname", assoc_info, cllist[loop]) - status = FAIL - if assoc_info[i]['ResourceType'] != rtype[cllist[loop]]: - print_error(i, "ResourceType", assoc_info, rtype[cllist[loop]]) - status = FAIL - ppolicy = assoc_info[i]['PropertyPolicy'] - if ppolicy != 0 and ppolicy != 1: - print_error(i, "PropertyPolicy", assoc_info, ppolicy) - status = FAIL - vrole = assoc_info[i]['ValueRole'] - if vrole < 0 or vrole > 4: - print_error(i, "ValueRole", assoc_info, vrole) - status = FAIL - insid = assoc_info[i]['InstanceID'] - vrange = rangelist[insid] - if vrange != assoc_info[i]['ValueRange']: - print_error(i, "ValueRange", assoc_info, vrange) - status = FAIL - if status != 0: - break - if status != 0: + status = verify_rasd_fields(loop, assoc_info, cllist, rtype, + rangelist) + if status != PASS: break else: loop = loop + 1 + except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, \ - 'Xen_SettingsDefineCapabilities') - Globals.logger.error("Exception: %s", detail) - clean_up_restore() + logger.error(CIM_ERROR_ASSOCIATORS, assoc_cname) + logger.error("Exception: %s", detail) status = FAIL - clean_up_restore() + return status + +@do_main(platform_sup) +def main(): + options = main.options + + server = options.ip + virt = options.virt + + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + return status + + status, dpool, npool, mpool, ppool = get_pool_details(virt, server) + if status != PASS or dpool.InstanceID == None or mpool.InstanceID == None \ + or npool.InstanceID == None or ppool.InstanceID == None: + cleanup_restore() + return FAIL + + status = verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool) + cleanup_restore() return status if __name__ == "__main__":

1 0

KVM test report on Fedora 9 (05/12)
by Guo Lian Yun 12 May '08

12 May '08

stro: Fedora 9 Beta Kernel: 2.6.25-0.121.rc5.git4.fc9 Libvirt: 0.4.1-7.fc9 CIMOM: 2.7.0-6.fc9 PyWBEM: 0.6-1 libcmpiutil: 0.3-1.fc9 libvirt-cim: 0.3-4.fc9 cimtest: changeset-135 =================== FAIL ====================================== ComputerSystemIndication - 01_created_indication.py: FAIL ElementConforms - 02_reverse.py: FAIL NetworkPort - 03_user_netport.py: FAIL SettingsDefine - 02_reverse.py: FAIL VirtualSystemManagementService - 06_addresource.py: FAIL ========FULL CIMTEST REPORT=PASS(96)=FAIL(5)=SKIP(19)=XFAIL(9)=== AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 85769 ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 85769 ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: SKIP ComputerSystem - 27_define_suspend_errs.py: SKIP ComputerSystem - 32_start_reboot.py: SKIP ComputerSystem - 33_suspend_reboot.py: SKIP ComputerSystem - 35_start_reset.py: SKIP ComputerSystem - 40_RSC_start.py: XFAIL Bug: 91410 InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed Bug:<91410> ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: XFAIL Bug: 88651 ElementAllocatedFromPool - 04_forward_errs.py: XFAIL Bug: 88651 ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: FAIL ElementConforms - 03_ectp_fwd_errs.py: XFAIL Bug: 92642 Bug:<92642> Bug:<92642> Bug:<92642> ElementConforms - 04_ectp_rev_errs.py: XFAIL Bug: 92642 Bug:<92642> Bug:<92642> Bug:<92642> Bug:<92642> Bug:<92642> Bug:<92642> Bug:<92642> Bug:<92642> ElementSettingData - 01_forward.py: PASS ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS EnabledLogicalElementCapabilities - 01_enum.py: PASS EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: PASS HostSystem - 03_hs_to_settdefcap.py: PASS HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: PASS HostedDependency - 02_reverse.py: PASS HostedDependency - 03_enabledstate.py: PASS HostedDependency - 04_reverse_errs.py: PASS HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: PASS Memory - 01_memory.py: PASS Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: PASS NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: FAIL Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: PASS Profile - 02_profile_to_elec.py: SKIP Profile - 03_rprofile_gi_errs.py: SKIP RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: SKIP ReferencedProfile - 02_refprofile_errs.py: SKIP ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: PASS ResourcePool - 02_rp_gi_errors.py: PASS ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL Bug: 92173 InvokeMethod(AddResourcesToResourcePool): CIM_ERR_FAILED: Unknown Method Bug:<92173> ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: FAIL SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: SKIP SettingsDefineCapabilities - 03_forward_errs.py: PASS SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: SKIP VSSD - 03_vssd_gi_errs.py: PASS VSSD - 04_vssd_to_rasd.py: PASS VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: PASS VirtualSystemManagementService - 02_destroysystem.py: PASS VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: PASS VirtualSystemManagementService - 06_addresource.py: FAIL InvokeMethod(AddResourceSettings): CIM_ERR_FAILED: Failed to create domain VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: XFAIL Bug: 90853 InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Failed to create domain Bug:<90853> VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS Best, Regards Daisy (运国莲) IBM STG Greater China Development Lab, Shanghai E-mail: yunguol(a)cn.ibm.com TEL: (86)-21-60922144 Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

1 0

[PATCH] Add missing registration for LXC_DiskRASD
by Dan Smith 11 May '08

11 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1210268930 25200 # Node ID 6cbf201e90c5fd571e988d7be3e64a4bef4cbac4 # Parent eece298b820b031be45dc5aca525a43a7bb029dd Add missing registration for LXC_DiskRASD Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r eece298b820b -r 6cbf201e90c5 schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Thu May 08 10:21:03 2008 -0700 +++ b/schema/ResourceAllocationSettingData.registration Thu May 08 10:48:50 2008 -0700 @@ -9,3 +9,4 @@ KVM_ProcResourceAllocationSettingData ro KVM_ProcResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance KVM_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance LXC_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance +LXC_DiskResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance

2 1

[PATCH] Temporarily fall through on processor devices in DefineSystem()
by Dan Smith 10 May '08

10 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1210267263 25200 # Node ID eece298b820b031be45dc5aca525a43a7bb029dd # Parent 7d8223bceaf3206b13443db42e95d9e505ce5ff7 Temporarily fall through on processor devices in DefineSystem() This is breaking tests just because it refuses a domain with processors defined. This will be replaced with Jay's processor support when it's ready. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 7d8223bceaf3 -r eece298b820b src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Thu May 08 10:10:49 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Thu May 08 10:21:03 2008 -0700 @@ -457,6 +457,8 @@ static const char *_sysvirt_rasd_to_vdev return net_rasd_to_vdev(inst, dev); } else if (type == CIM_RES_TYPE_MEM) { return mem_rasd_to_vdev(inst, dev); + } else if (type == CIM_RES_TYPE_PROC) { + return NULL; /* FIXME: replace when processor is done */ } return "Resource type not supported on this platform";

2 1

[PATCH] Make BlockSize * NumberOfBlocks result in the correct number of bytes
by Dan Smith 10 May '08

10 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1210266649 25200 # Node ID 7d8223bceaf3206b13443db42e95d9e505ce5ff7 # Parent c2465f3f0a2472a45f90707ce9653ad2c59bb50b Make BlockSize * NumberOfBlocks result in the correct number of bytes Currently it adds up to kilobytes, so shift the size we get from libvirt appropriately before doing the calculation. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c2465f3f0a24 -r 7d8223bceaf3 src/Virt_Device.c --- a/src/Virt_Device.c Thu May 08 09:36:30 2008 -0700 +++ b/src/Virt_Device.c Thu May 08 10:10:49 2008 -0700 @@ -141,8 +141,8 @@ static int mem_set_size(CMPIInstance *in { uint64_t consumableblocks, numberofblocks; - consumableblocks = dev->size/XEN_MEM_BLOCKSIZE; - numberofblocks = dev->maxsize/XEN_MEM_BLOCKSIZE; + consumableblocks = (dev->size << 10) / XEN_MEM_BLOCKSIZE; + numberofblocks = (dev->maxsize << 10) / XEN_MEM_BLOCKSIZE; CMSetProperty(instance, "BlockSize", (CMPIValue *)&XEN_MEM_BLOCKSIZE, CMPI_uint64);

2 1

[PATCH] Change VirtualQuantity to uint64 in all sample RASDs
by Dan Smith 10 May '08

10 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1210350149 25200 # Node ID 874639813fb34a80455efc4c886a52672734943d # Parent 1eef845c77d096d65b256384423b93cda19fb8db Change VirtualQuantity to uint64 in all sample RASDs Changes: - Remove unneeded additional variable in disk case Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 1eef845c77d0 -r 874639813fb3 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Thu May 08 09:23:56 2008 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Fri May 09 09:22:29 2008 -0700 @@ -403,13 +403,13 @@ static struct sdc_rasd_prop *proc_min(co CMPIStatus *s) { bool ret; - uint16_t num_procs = 1; + uint64_t num_procs = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Minimum", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -428,7 +428,7 @@ static struct sdc_rasd_prop *proc_max(co { bool ret; virConnectPtr conn; - uint16_t num_procs = 0; + uint64_t num_procs = 0; struct sdc_rasd_prop *rasd = NULL; CU_DEBUG("In proc_max()"); @@ -447,7 +447,7 @@ static struct sdc_rasd_prop *proc_max(co struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Maximum", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -466,13 +466,13 @@ static struct sdc_rasd_prop *proc_def(co CMPIStatus *s) { bool ret; - uint16_t num_procs = 1; + uint64_t num_procs = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Default", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -490,13 +490,13 @@ static struct sdc_rasd_prop *proc_inc(co CMPIStatus *s) { bool ret; - uint16_t num_procs = 1; + uint64_t num_procs = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Increment", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -514,38 +514,38 @@ static struct sdc_rasd_prop *net_min(con CMPIStatus *s) { bool ret; - uint16_t num_nics = 0; + uint64_t num_nics = 0; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Minimum", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, - PROP_END - }; - - ret = dup_rasd_prop_list(tmp, &rasd); - if (!ret) { - cu_statusf(_BROKER, s, - CMPI_RC_ERR_FAILED, - "Could not copy RASD"); - } - - return rasd; -} - -static uint16_t net_max_kvm(const CMPIObjectPath *ref, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, + PROP_END + }; + + ret = dup_rasd_prop_list(tmp, &rasd); + if (!ret) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Could not copy RASD"); + } + + return rasd; +} + +static uint64_t net_max_kvm(const CMPIObjectPath *ref, CMPIStatus *s) { /* This appears to not require anything dynamic. */ return KVM_MAX_NICS; } -static uint16_t net_max_xen(const CMPIObjectPath *ref, +static uint64_t net_max_xen(const CMPIObjectPath *ref, CMPIStatus *s) { int rc; virConnectPtr conn; unsigned long version; - uint16_t num_nics = -1; + uint64_t num_nics = -1; conn = connect_by_classname(_BROKER, CLASSNAME(ref), s); if (s->rc != CMPI_RC_OK) { @@ -579,7 +579,7 @@ static struct sdc_rasd_prop *net_max(con { bool ret; char *prefix; - uint16_t num_nics; + uint64_t num_nics; struct sdc_rasd_prop *rasd = NULL; prefix = class_prefix_name(CLASSNAME(ref)); @@ -611,7 +611,7 @@ static struct sdc_rasd_prop *net_max(con struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Maximum", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, PROP_END }; @@ -630,11 +630,11 @@ static struct sdc_rasd_prop *net_def(con CMPIStatus *s) { bool ret; - uint16_t num_nics = 1; + uint64_t num_nics = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Default", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, PROP_END }; @@ -652,12 +652,12 @@ static struct sdc_rasd_prop *net_inc(con CMPIStatus *s) { bool ret; - uint16_t num_nics = 1; + uint64_t num_nics = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Increment", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, PROP_END }; @@ -675,13 +675,13 @@ static struct sdc_rasd_prop *disk_min(co CMPIStatus *s) { bool ret; - uint16_t disk_size = SDC_DISK_MIN; + uint64_t disk_size = SDC_DISK_MIN; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Minimum", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint64}, PROP_END }; @@ -701,8 +701,7 @@ static struct sdc_rasd_prop *disk_max(co bool ret; const char *inst_id; CMPIrc prop_ret; - uint16_t free_space; - uint64_t free_64; + uint64_t free_space; virConnectPtr conn; CMPIInstance *pool_inst; struct sdc_rasd_prop *rasd = NULL; @@ -728,20 +727,19 @@ static struct sdc_rasd_prop *disk_max(co if (s->rc != CMPI_RC_OK) goto out; - prop_ret = cu_get_u64_prop(pool_inst, "Capacity", &free_64); + prop_ret = cu_get_u64_prop(pool_inst, "Capacity", &free_space); if (prop_ret != CMPI_RC_OK) { cu_statusf(_BROKER, s, CMPI_RC_ERR_FAILED, "Could not get capacity from instance"); goto out; } - CU_DEBUG("Got capacity from pool_inst: %lld", free_64); - - free_space = (uint16_t)free_64; + CU_DEBUG("Got capacity from pool_inst: %lld", free_space); + struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Maximum", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&free_space, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&free_space, CMPI_uint64}, PROP_END }; @@ -760,13 +758,13 @@ static struct sdc_rasd_prop *disk_def(co CMPIStatus *s) { bool ret; - uint16_t disk_size = SDC_DISK_DEF; + uint64_t disk_size = SDC_DISK_DEF; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Default", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint64}, PROP_END }; @@ -784,13 +782,13 @@ static struct sdc_rasd_prop *disk_inc(co CMPIStatus *s) { bool ret; - uint16_t disk_size = SDC_DISK_INC; + uint64_t disk_size = SDC_DISK_INC; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Increment", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint64}, PROP_END };

2 1

[PATCH] Change VirtualQuantity to uint64 in all sample RASDs
by Dan Smith 10 May '08

10 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1210264590 25200 # Node ID c2465f3f0a2472a45f90707ce9653ad2c59bb50b # Parent 1eef845c77d096d65b256384423b93cda19fb8db Change VirtualQuantity to uint64 in all sample RASDs Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 1eef845c77d0 -r c2465f3f0a24 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Thu May 08 09:23:56 2008 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Thu May 08 09:36:30 2008 -0700 @@ -403,13 +403,13 @@ static struct sdc_rasd_prop *proc_min(co CMPIStatus *s) { bool ret; - uint16_t num_procs = 1; + uint64_t num_procs = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Minimum", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -428,7 +428,7 @@ static struct sdc_rasd_prop *proc_max(co { bool ret; virConnectPtr conn; - uint16_t num_procs = 0; + uint64_t num_procs = 0; struct sdc_rasd_prop *rasd = NULL; CU_DEBUG("In proc_max()"); @@ -447,7 +447,7 @@ static struct sdc_rasd_prop *proc_max(co struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Maximum", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -466,13 +466,13 @@ static struct sdc_rasd_prop *proc_def(co CMPIStatus *s) { bool ret; - uint16_t num_procs = 1; + uint64_t num_procs = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Default", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -490,13 +490,13 @@ static struct sdc_rasd_prop *proc_inc(co CMPIStatus *s) { bool ret; - uint16_t num_procs = 1; + uint64_t num_procs = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Increment", CMPI_chars}, {"AllocationUnits", (CMPIValue *)"Processors", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_procs, CMPI_uint64}, PROP_END }; @@ -514,38 +514,38 @@ static struct sdc_rasd_prop *net_min(con CMPIStatus *s) { bool ret; - uint16_t num_nics = 0; + uint64_t num_nics = 0; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Minimum", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, - PROP_END - }; - - ret = dup_rasd_prop_list(tmp, &rasd); - if (!ret) { - cu_statusf(_BROKER, s, - CMPI_RC_ERR_FAILED, - "Could not copy RASD"); - } - - return rasd; -} - -static uint16_t net_max_kvm(const CMPIObjectPath *ref, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, + PROP_END + }; + + ret = dup_rasd_prop_list(tmp, &rasd); + if (!ret) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Could not copy RASD"); + } + + return rasd; +} + +static uint64_t net_max_kvm(const CMPIObjectPath *ref, CMPIStatus *s) { /* This appears to not require anything dynamic. */ return KVM_MAX_NICS; } -static uint16_t net_max_xen(const CMPIObjectPath *ref, +static uint64_t net_max_xen(const CMPIObjectPath *ref, CMPIStatus *s) { int rc; virConnectPtr conn; unsigned long version; - uint16_t num_nics = -1; + uint64_t num_nics = -1; conn = connect_by_classname(_BROKER, CLASSNAME(ref), s); if (s->rc != CMPI_RC_OK) { @@ -579,7 +579,7 @@ static struct sdc_rasd_prop *net_max(con { bool ret; char *prefix; - uint16_t num_nics; + uint64_t num_nics; struct sdc_rasd_prop *rasd = NULL; prefix = class_prefix_name(CLASSNAME(ref)); @@ -611,7 +611,7 @@ static struct sdc_rasd_prop *net_max(con struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Maximum", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, PROP_END }; @@ -630,11 +630,11 @@ static struct sdc_rasd_prop *net_def(con CMPIStatus *s) { bool ret; - uint16_t num_nics = 1; + uint64_t num_nics = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Default", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, PROP_END }; @@ -652,12 +652,12 @@ static struct sdc_rasd_prop *net_inc(con CMPIStatus *s) { bool ret; - uint16_t num_nics = 1; + uint64_t num_nics = 1; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Increment", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&num_nics, CMPI_uint64}, PROP_END }; @@ -675,13 +675,13 @@ static struct sdc_rasd_prop *disk_min(co CMPIStatus *s) { bool ret; - uint16_t disk_size = SDC_DISK_MIN; + uint64_t disk_size = SDC_DISK_MIN; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Minimum", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint64}, PROP_END }; @@ -701,7 +701,7 @@ static struct sdc_rasd_prop *disk_max(co bool ret; const char *inst_id; CMPIrc prop_ret; - uint16_t free_space; + uint64_t free_space; uint64_t free_64; virConnectPtr conn; CMPIInstance *pool_inst; @@ -737,11 +737,11 @@ static struct sdc_rasd_prop *disk_max(co } CU_DEBUG("Got capacity from pool_inst: %lld", free_64); - free_space = (uint16_t)free_64; + free_space = free_64; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Maximum", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&free_space, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&free_space, CMPI_uint64}, PROP_END }; @@ -760,13 +760,13 @@ static struct sdc_rasd_prop *disk_def(co CMPIStatus *s) { bool ret; - uint16_t disk_size = SDC_DISK_DEF; + uint64_t disk_size = SDC_DISK_DEF; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Default", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint64}, PROP_END }; @@ -784,13 +784,13 @@ static struct sdc_rasd_prop *disk_inc(co CMPIStatus *s) { bool ret; - uint16_t disk_size = SDC_DISK_INC; + uint64_t disk_size = SDC_DISK_INC; struct sdc_rasd_prop *rasd = NULL; struct sdc_rasd_prop tmp[] = { {"InstanceID", (CMPIValue *)"Increment", CMPI_chars}, {"AllocationQuantity", (CMPIValue *)"MegaBytes", CMPI_chars}, - {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint16}, + {"VirtualQuantity", (CMPIValue *)&disk_size, CMPI_uint64}, PROP_END };

2 2

[PATCH] Add PoolID into DevicePool instances
by Dan Smith 09 May '08

09 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1210263836 25200 # Node ID 1eef845c77d096d65b256384423b93cda19fb8db # Parent a46dd9e2e4efbea37e7e5d2cf8c285e1a56bd726 Add PoolID into DevicePool instances Changes: - Consolidate the setting of common ResourcePool attributes Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r a46dd9e2e4ef -r 1eef845c77d0 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Thu May 08 08:25:23 2008 -0700 +++ b/src/Virt_DevicePool.c Thu May 08 09:23:56 2008 -0700 @@ -561,13 +561,28 @@ static bool procpool_set_total(CMPIInsta return procs != 0; } -static bool set_units(CMPIInstance *inst, - const char *units) -{ - CMSetProperty(inst, "AllocationUnits", - (CMPIValue *)units, CMPI_chars); - - return true; +static void set_params(CMPIInstance *inst, + uint16_t type, + const char *id, + const char *units, + const char *caption) +{ + CMSetProperty(inst, "InstanceID", + (CMPIValue *)id, CMPI_chars); + + CMSetProperty(inst, "PoolID", + (CMPIValue *)id, CMPI_chars); + + CMSetProperty(inst, "ResourceType", + (CMPIValue *)&type, CMPI_uint16); + + if (units != NULL) + CMSetProperty(inst, "AllocationUnits", + (CMPIValue *)units, CMPI_chars); + + if (caption != NULL) + CMSetProperty(inst, "Caption", + (CMPIValue *)caption, CMPI_chars); } static CMPIStatus mempool_instance(virConnectPtr conn, @@ -577,7 +592,6 @@ static CMPIStatus mempool_instance(virCo const CMPIBroker *broker) { const char *id = "MemoryPool/0"; - uint16_t type = CIM_RES_TYPE_MEM; CMPIInstance *inst; CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -595,13 +609,8 @@ static CMPIStatus mempool_instance(virCo mempool_set_total(inst, conn); mempool_set_reserved(inst, conn); - set_units(inst, "KiloBytes"); - - CMSetProperty(inst, "InstanceID", - (CMPIValue *)id, CMPI_chars); - - CMSetProperty(inst, "ResourceType", - (CMPIValue *)&type, CMPI_uint16); + + set_params(inst, CIM_RES_TYPE_MEM, id, "KiloBytes", NULL); inst_list_add(list, inst); @@ -615,7 +624,6 @@ static CMPIStatus procpool_instance(virC const CMPIBroker *broker) { const char *id = "ProcessorPool/0"; - uint16_t type = CIM_RES_TYPE_PROC; CMPIInstance *inst; CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -632,13 +640,8 @@ static CMPIStatus procpool_instance(virC ns); procpool_set_total(inst, conn); - set_units(inst, "Processors"); - - CMSetProperty(inst, "InstanceID", - (CMPIValue *)id, CMPI_chars); - - CMSetProperty(inst, "ResourceType", - (CMPIValue *)&type, CMPI_uint16); + + set_params(inst, CIM_RES_TYPE_PROC, id, "Processors", NULL); inst_list_add(list, inst); @@ -653,9 +656,9 @@ static CMPIStatus _netpool_for_network(s const CMPIBroker *broker) { CMPIStatus s = {CMPI_RC_OK, NULL}; - char *str = NULL; + char *id = NULL; + char *cap = NULL; char *bridge = NULL; - uint16_t type = CIM_RES_TYPE_NET; CMPIInstance *inst; virNetworkPtr network = NULL; @@ -681,36 +684,27 @@ static CMPIStatus _netpool_for_network(s goto out; } - if (asprintf(&str, "NetworkPool/%s", netname) == -1) { + if (asprintf(&id, "NetworkPool/%s", netname) == -1) { cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, ""); goto out; } - CMSetProperty(inst, "InstanceID", - (CMPIValue *)str, CMPI_chars); - free(str); - bridge = virNetworkGetBridgeName(network); - if (asprintf(&str, "Bridge: %s", bridge) == -1) { + if (asprintf(&cap, "Bridge: %s", bridge) == -1) { cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, ""); goto out; } - CMSetProperty(inst, "Caption", - (CMPIValue *)str, CMPI_chars); - free(str); + set_params(inst, CIM_RES_TYPE_NET, id, NULL, cap); + free(id); + free(cap); free(bridge); - CMSetProperty(inst, "ResourceType", - (CMPIValue *)&type, CMPI_uint16); - - inst_list_add(list, inst); - out: virNetworkFree(network); @@ -778,24 +772,13 @@ static CMPIInstance *diskpool_from_path( { CMPIInstance *inst; char *poolid = NULL; - const uint16_t type = CIM_RES_TYPE_DISK; inst = get_typed_instance(broker, refcn, "DiskPool", ns); if (asprintf(&poolid, "DiskPool/%s", pool->tag) == -1) return NULL; - CMSetProperty(inst, "InstanceID", - (CMPIValue *)poolid, CMPI_chars); - - CMSetProperty(inst, "ResourceType", - (CMPIValue *)&type, CMPI_uint16); - - CMSetProperty(inst, "AllocationUnits", - (CMPIValue *)"Megabytes", CMPI_chars); - - CMSetProperty(inst, "Caption", - (CMPIValue *)pool->tag, CMPI_chars); + set_params(inst, CIM_RES_TYPE_DISK, poolid, "Megabytes", pool->tag); if (!diskpool_set_capacity(conn, inst, pool)) CU_DEBUG("Failed to set capacity for disk pool: %s",

2 1

[PATCH] [TEST] #2 Updating 01_forward.py of SDC to support XenFV, KVM
by Deepti B. Kalakeri 09 May '08

09 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210164893 25200 # Node ID adcbedf23f1d58e809fb4d91d6c40f83f21b776c # Parent 88d20825a9ba6dd3d070e02f698a7846b7e3a2c8 [TEST] #2 Updating 01_forward.py of SDC to support XenFV, KVM. 1) To make use of the lib fn conf_file(), cleanup_restore() and create_diskpool_file(). 2) To use the lib fn print_field_error. 3) To retain the PropertyPolicy, ValueRole, ValueRange depending on the revision no. 4) Tested on rpm based libvirt-cim KVM machine, latest libvirt-cim for KVM and Xen, XenFV. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 88d20825a9ba -r adcbedf23f1d suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed May 07 05:34:23 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Wed May 07 05:54:53 2008 -0700 @@ -55,135 +55,86 @@ import sys import sys import os from distutils.file_util import move_file -from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import enumclass -from CimTest import Globals -from CimTest.Globals import do_main from XenKvmLib.test_xml import netxml from XenKvmLib.test_doms import create_vnet from VirtLib.live import net_list from CimTest.ReturnCodes import PASS, FAIL, SKIP +from CimTest.Globals import do_main, platform_sup, logger, \ +CIM_ERROR_GETINSTANCE, CIM_ERROR_ASSOCIATORS +from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file +from XenKvmLib.common_util import print_field_error +from XenKvmLib.const import CIM_REV -sup_types = ['Xen'] - -status = PASS -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "SSDC_01_forward" diskid = "%s/%s" % ("DiskPool", test_dpath) memid = "%s/%s" % ("MemoryPool", 0) procid = "%s/%s" % ("ProcessorPool", 0) +libvirtcim_rev = 571 -def conf_file(): + +def get_or_bail(virt, ip, id, pool_class): """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = SKIP - sys.exit(status) - -def clean_up_restore(): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = SKIP - sys.exit(status) - - -def get_or_bail(ip, id, pool_class): - """ - Getinstance for the CLass and return instance on success, otherwise + Getinstance for the Class and return instance on success, otherwise exit after cleanup_restore . """ key_list = { 'InstanceID' : id } - try: - instance = enumclass.getInstance(ip, pool_class, key_list) + instance = enumclass.getInstance(ip, pool_class, key_list, virt) except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, '%s' % pool_class) - Globals.logger.error("Exception: %s", detail) - clean_up_restore() - status = FAIL - sys.exit(status) + logger.error(CIM_ERROR_GETINSTANCE, '%s' % pool_class) + logger.error("Exception: %s", detail) + cleanup_restore() + sys.exit(FAIL) return instance -def init_list(disk, mem, net, proc): +def init_list(virt, dpool, npool, mpool, ppool): """ Creating the lists that will be used for comparisons. """ instlist = [ - disk.InstanceID, \ - mem.InstanceID, \ - net.InstanceID, \ - proc.InstanceID - ] + dpool.InstanceID, + mpool.InstanceID, + npool.InstanceID, + ppool.InstanceID + ] cllist = [ - "Xen_DiskResourceAllocationSettingData", \ - "Xen_MemResourceAllocationSettingData", \ - "Xen_NetResourceAllocationSettingData", \ - "Xen_ProcResourceAllocationSettingData" + get_typed_class(virt, "DiskResourceAllocationSettingData"), + get_typed_class(virt, "MemResourceAllocationSettingData"), + get_typed_class(virt, "NetResourceAllocationSettingData"), + get_typed_class(virt, "ProcResourceAllocationSettingData") ] rtype = { - "Xen_DiskResourceAllocationSettingData" : 17, \ - "Xen_MemResourceAllocationSettingData" : 4, \ - "Xen_NetResourceAllocationSettingData" : 10, \ - "Xen_ProcResourceAllocationSettingData" : 3 + get_typed_class(virt, "DiskResourceAllocationSettingData") : 17, + get_typed_class(virt, "MemResourceAllocationSettingData") : 4, + get_typed_class(virt, "NetResourceAllocationSettingData") : 10, + get_typed_class(virt, "ProcResourceAllocationSettingData") : 3 } rangelist = { - "Default" : 0, \ - "Minimum" : 1, \ - "Maximum" : 2, \ + "Default" : 0, + "Minimum" : 1, + "Maximum" : 2, "Increment" : 3 } return instlist, cllist, rtype, rangelist +def get_pool_info(virt, server, devid, poolname=""): + pool_cname = get_typed_class(virt, poolname) + pool_cn = eval("enumclass." + pool_cname) + return get_or_bail(virt, server, id=devid, pool_class=pool_cn) -def print_error(index, fieldname, assoc_info, exp_value): - ret_value = assoc_info[index][fieldname] - Globals.logger.error("%s Mismatch", fieldname) - Globals.logger.error("Returned %s instead of %s", ret_value, exp_value) +def get_pool_details(virt, server): + dpool = npool = mpool = ppool = None + try : + dpool = get_pool_info(virt, server, diskid, poolname="DiskPool") + mpool = get_pool_info(virt, server, memid, poolname= "MemoryPool") + ppool = get_pool_info(virt, server, procid, poolname= "ProcessorPool") - -@do_main(sup_types) -def main(): - options = main.options - global status - - cn = 'Xen_AllocationCapabilities' - loop = 0 - server = options.ip - - # Taking care of already existing diskconf file - # Creating diskpool.conf if it does not exist - # Otherwise backing up the prev file and create new one. - os.system("rm -f %s" % back_disk_file ) - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() - - try : - disk = get_or_bail(server, id=diskid, \ - pool_class=enumclass.Xen_DiskPool) - mem = get_or_bail(server, id = memid, \ - pool_class=enumclass.Xen_MemoryPool) - vir_network = net_list(server) + vir_network = net_list(server, virt) if len(vir_network) > 0: test_network = vir_network[0] else: @@ -192,68 +143,102 @@ def main(): net_xml, bridge = netxml(server, bridgename, test_network) ret = create_vnet(server, net_xml) if not ret: - Globals.logger.error("Failed to create the Virtual Network '%s'", \ - test_network) - return SKIP + logger.error("Failed to create Virtual Network '%s'", + test_network) + return SKIP, dpool, npool, mpool, ppool + netid = "%s/%s" % ("NetworkPool", test_network) - net = get_or_bail(server, id = netid, \ - pool_class=enumclass.Xen_NetworkPool) - proc = get_or_bail(server, id = procid, \ - pool_class=enumclass.Xen_ProcessorPool) + npool = get_pool_info(virt, server, netid, poolname= "NetworkPool") except Exception, detail: - Globals.logger.error("Exception: %s", detail) - clean_up_restore() - status = FAIL - return status + logger.error("Exception: %s", detail) + return FAIL, dpool, npool, mpool, ppool - instlist, cllist, rtype, rangelist = init_list(disk, mem, net, proc ) + return PASS, dpool, npool, mpool, ppool +def verify_rasd_fields(loop, assoc_info, cllist, rtype, rangelist): + for inst in assoc_info: + if inst.classname != cllist[loop]: + print_field_error("Classname", inst.classname, cllist[loop]) + return FAIL + if inst['ResourceType'] != rtype[cllist[loop]]: + print_field_error("ResourceType", inst['ResourceType'], + rtype[cllist[loop]]) + return FAIL + + # The following properties have been removed in the patchset 571 + # but is present in the rpm libvirt-cim and hence retained it. + + if CIM_REV < libvirtcim_rev: + ppolicy = inst['PropertyPolicy'] + if ppolicy != 0 and ppolicy != 1: + print_field_error("PropertyPolicy", inst['PropertyPolicy'], + ppolicy) + return FAIL + + vrole = inst['ValueRole'] + if vrole < 0 or vrole > 4: + print_field_error("ValueRole", inst['ValueRole'], vrole) + return FAIL + + insid = inst['InstanceID'] + vrange = rangelist[insid] + if vrange != inst['ValueRange']: + print_field_error("ValueRange", inst['ValueRange'], vrange) + return FAIL + + return PASS + +def verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool): + loop = 0 + instlist, cllist, rtype, rangelist = init_list(virt, dpool, npool, mpool, + ppool) + assoc_cname = get_typed_class(virt, "SettingsDefineCapabilities") + cn = get_typed_class(virt, "AllocationCapabilities") for instid in sorted(instlist): try: - assoc_info = assoc.Associators(options.ip, \ - "Xen_SettingsDefineCapabilities", - cn, - InstanceID = instid) + assoc_info = assoc.Associators(server, assoc_cname, cn, + InstanceID = instid, virt=virt) if len(assoc_info) != 4: - Globals.logger.error("Xen_SettingsDefineCapabilities returned \ -%i ResourcePool objects instead 4", len(assoc_info)) + logger.error("%s returned %i ResourcePool objects" + "instead 4", assoc_cname, len(assoc_info)) status = FAIL break - for i in range(len(assoc_info)): - if assoc_info[i].classname != cllist[loop]: - print_error(i, "Classname", assoc_info, cllist[loop]) - status = FAIL - if assoc_info[i]['ResourceType'] != rtype[cllist[loop]]: - print_error(i, "ResourceType", assoc_info, rtype[cllist[loop]]) - status = FAIL - ppolicy = assoc_info[i]['PropertyPolicy'] - if ppolicy != 0 and ppolicy != 1: - print_error(i, "PropertyPolicy", assoc_info, ppolicy) - status = FAIL - vrole = assoc_info[i]['ValueRole'] - if vrole < 0 or vrole > 4: - print_error(i, "ValueRole", assoc_info, vrole) - status = FAIL - insid = assoc_info[i]['InstanceID'] - vrange = rangelist[insid] - if vrange != assoc_info[i]['ValueRange']: - print_error(i, "ValueRange", assoc_info, vrange) - status = FAIL - if status != 0: - break - if status != 0: + + status = verify_rasd_fields(loop, assoc_info, cllist, rtype, + rangelist) + if status != PASS: break else: loop = loop + 1 + except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, \ - 'Xen_SettingsDefineCapabilities') - Globals.logger.error("Exception: %s", detail) - clean_up_restore() + logger.error(CIM_ERROR_ASSOCIATORS, assoc_cname) + logger.error("Exception: %s", detail) status = FAIL - clean_up_restore() + return status + +@do_main(platform_sup) +def main(): + options = main.options + + server = options.ip + virt = options.virt + + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + return status + + status, dpool, npool, mpool, ppool = get_pool_details(virt, server) + if status != PASS or dpool.InstanceID == None or mpool.InstanceID == None \ + or npool.InstanceID == None or ppool.InstanceID == None: + cleanup_restore() + return FAIL + + status = verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool) + cleanup_restore() return status if __name__ == "__main__":

3 4