May 2008 - CIM - libvirt List Archives

[PATCH] [TEST] 3# big patch for LXC support
by yunguol＠cn.ibm.com 22 May '08

22 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211469390 -28800 # Node ID 2845b58769cbe46f646c6f173c30945187f04778 # Parent b2b2bb6cc8d87ba0eeddcf3d361d3085104d3492 [TEST] 3# big patch for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r b2b2bb6cc8d8 -r 2845b58769cb lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Mon May 19 10:43:33 2008 -0700 +++ b/lib/CimTest/Globals.py Thu May 22 23:16:30 2008 +0800 @@ -49,7 +49,7 @@ CIM_IP = os.getenv("CIM_IP") CIM_PORT = "5988" NM = "TEST LOG" -platform_sup = ["Xen", "KVM", "XenFV"] +platform_sup = ["Xen", "KVM", "XenFV", "LXC"] logging.basicConfig(filename='/dev/null') logger = logging.getLogger(NM) logging.PRINT = logging.DEBUG + 50 @@ -67,7 +67,7 @@ help="IP address of machine to test, default: localhost") parser.add_option("-v", "--virt", dest="virt", type="choice", choices=platform_sup, default="Xen", - help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV', default: Xen") + help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV' & 'LXC', default: Xen") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr") diff -r b2b2bb6cc8d8 -r 2845b58769cb lib/VirtLib/utils.py --- a/lib/VirtLib/utils.py Mon May 19 10:43:33 2008 -0700 +++ b/lib/VirtLib/utils.py Thu May 22 23:16:30 2008 +0800 @@ -161,5 +161,7 @@ return "xen:///" if virt == "KVM": return "qemu:///system" + if virt == "LXC": + return "lxc:///system" return "" diff -r b2b2bb6cc8d8 -r 2845b58769cb suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Thu May 22 23:16:30 2008 +0800 @@ -27,15 +27,17 @@ # 26-Sep-2007 import sys +import os from XenKvmLib import computersystem from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import LXC_init_path from VirtLib import utils from CimTest import Globals from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domU1" @do_main(sup_types) @@ -76,6 +78,7 @@ Globals.logger.error("Error: property values are not set for VS %s" % test_dom) cxml.undefine(options.ip) + os.remove(LXC_init_path) return status if __name__ == "__main__": diff -r b2b2bb6cc8d8 -r 2845b58769cb suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Thu May 22 23:16:30 2008 +0800 @@ -19,7 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -virt_types = ['Xen', 'KVM', 'XenFV'] +virt_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def get_typed_class(virt, basename): if virt not in virt_types: diff -r b2b2bb6cc8d8 -r 2845b58769cb suites/libvirt-cim/lib/XenKvmLib/computersystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Thu May 22 23:16:30 2008 +0800 @@ -69,6 +69,9 @@ class KVM_ComputerSystem(CIM_System): pass +class LXC_ComputerSystem(CIM_System): + pass + def get_cs_class(virt): if virt in virt_types: return eval(get_typed_class(virt, 'ComputerSystem')) diff -r b2b2bb6cc8d8 -r 2845b58769cb suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Thu May 22 23:16:30 2008 +0800 @@ -81,3 +81,7 @@ XenFV_default_disk_dev = 'hda' XenFV_default_mac = '00:16:3e:5d:c7:9e' XenFV_default_net_type = 'bridge' + +#vxml.LXCXML +LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init') +LXC_default_tty = '/dev/ptmx' diff -r b2b2bb6cc8d8 -r 2845b58769cb suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu May 22 23:16:30 2008 +0800 @@ -141,6 +141,8 @@ self.vuri = 'xen:///' elif vir_type == 'kvm': self.vuri = 'qemu:///system' + elif vir_type == 'lxc': + self.vuri = 'lxc:///system' def run(self, ip, vcmd, param): file_arg_cmds = ['define', 'create', 'net-create', 'pool-create', 'pool-destroy'] @@ -280,7 +282,7 @@ raise NotImplementedError('virtual method, implement your own') def issubinstance(self): - return isinstance(self, (XenXML, KVMXML, XenFVXML)) + return isinstance(self, (XenXML, KVMXML, XenFVXML, LXCXML)) def set_memory(self, mem): self.set_cdata('/domain/memory', mem * 1024) @@ -627,6 +629,37 @@ def set_vbridge(self, ip): return self._set_vbridge(ip, 'XenFV') +class LXCXML(VirtXML): + + def __init__(self, test_dom=const.default_domname, + mem=const.default_memory, + vcpus=const.default_vcpus, + tty=const.LXC_default_tty): + VirtXML.__init__(self, 'lxc', test_dom, set_uuid(), mem, vcpus) + self._os(const.LXC_init_path) + self._devices(const.LXC_default_tty) + self.create_lxc_file(CIM_IP, const.LXC_init_path) + + def _os(self, os_init): + os = self.get_node('/domain/os') + self.add_sub_node(os, 'init', os_init) + + def _devices(self, tty): + devices = self.get_node('/domain/devices') + + interface = self.add_sub_node(devices, 'console', tty) + + def create_lxc_file(self, ip, lxc_file): + try: + f = open(lxc_file, 'w') + f.write('%s' % 'exec /bin/sh') + cmd = 'chmod +x %s' % lxc_file + s, o = utils.run_remote(ip, cmd) + f.close() + except Exception: + logger.error("Creation of LXC file Failed") + return False + def get_class(virt): if virt in virt_types: diff -r b2b2bb6cc8d8 -r 2845b58769cb suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/main.py Thu May 22 23:16:30 2008 +0800 @@ -51,7 +51,7 @@ help="Will remove existing log files before test run") parser.add_option("-v", "--virt", dest="virt", type="choice", choices=platform_sup, default="Xen", - help="Virt type, select from 'Xen' & 'KVM' & 'XenFV'(default: Xen). ") + help="Virt type, select from 'Xen' & 'KVM' & 'XenFV' & 'LXC'(default: Xen). ") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr")

2 1

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

22 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 : 79 LibVirtCIM : 592 CIMTEST : 146 ======================================================= PASS : 102 FAIL : 7 XFAIL : 4 SKIP : 16 ----------------- Total : 129 ======================================================= List of tc that are failing HostSystem - 02_hostsystem_to_rasd.py: FAIL NetworkPort - 03_user_netport.py: FAIL SettingsDefine - 01_forward.py: FAIL VSSD - 03_vssd_gi_errs.py: FAIL VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL VirtualSystemManagementService - 06_addresource.py: FAIL Please find the complete report attached with the mail. Thanks and Regards, Deepti. 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: 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: PASS 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: 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: FAIL ERROR - InstanceID Mismatch ERROR - Returned CrossClass_GuestDom/proc instead of CrossClass_GuestDom/0 ERROR - Mistmatching association values 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 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: 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: 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: FAIL ERROR - InstanceID Mismatch ERROR - Returned domu1/proc instead of domu1/0 SettingsDefine - 02_reverse.py: PASS 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: FAIL ERROR - Unexpected rc code 0 and description The web server returned a bad status line: '' ERROR - ------ FAILED: INVALID_InstID_Keyval ------ 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: 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 VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL ERROR - Unexpected rc code 0 and description The web server returned a bad status line: '' ERROR - ------ FAILED: KVM_VirtualSystemSettingData INVALID_InstID_Keyval------ 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

2 1

[PATCH] [TEST] change helpers function for LXC support
by yunguol＠cn.ibm.com 22 May '08

22 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211376761 -28800 # Node ID 02203222a4281881f470fd98049cbaaefc41f97b # Parent b2b2bb6cc8d87ba0eeddcf3d361d3085104d3492 [TEST] change helpers function for LXC support diff -r b2b2bb6cc8d8 -r 02203222a428 lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Mon May 19 10:43:33 2008 -0700 +++ b/lib/CimTest/Globals.py Wed May 21 21:32:41 2008 +0800 @@ -49,7 +49,7 @@ CIM_IP = os.getenv("CIM_IP") CIM_PORT = "5988" NM = "TEST LOG" -platform_sup = ["Xen", "KVM", "XenFV"] +platform_sup = ["Xen", "KVM", "XenFV", "LXC"] logging.basicConfig(filename='/dev/null') logger = logging.getLogger(NM) logging.PRINT = logging.DEBUG + 50 @@ -67,7 +67,7 @@ help="IP address of machine to test, default: localhost") parser.add_option("-v", "--virt", dest="virt", type="choice", choices=platform_sup, default="Xen", - help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV', default: Xen") + help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV' & 'LXC', default: Xen") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr") diff -r b2b2bb6cc8d8 -r 02203222a428 lib/VirtLib/utils.py --- a/lib/VirtLib/utils.py Mon May 19 10:43:33 2008 -0700 +++ b/lib/VirtLib/utils.py Wed May 21 21:32:41 2008 +0800 @@ -161,5 +161,7 @@ return "xen:///" if virt == "KVM": return "qemu:///system" + if virt == "LXC": + return "lxc:///system" return "" diff -r b2b2bb6cc8d8 -r 02203222a428 suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Wed May 21 21:32:41 2008 +0800 @@ -19,7 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -virt_types = ['Xen', 'KVM', 'XenFV'] +virt_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def get_typed_class(virt, basename): if virt not in virt_types: diff -r b2b2bb6cc8d8 -r 02203222a428 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/main.py Wed May 21 21:32:41 2008 +0800 @@ -51,7 +51,7 @@ help="Will remove existing log files before test run") parser.add_option("-v", "--virt", dest="virt", type="choice", choices=platform_sup, default="Xen", - help="Virt type, select from 'Xen' & 'KVM' & 'XenFV'(default: Xen). ") + help="Virt type, select from 'Xen' & 'KVM' & 'XenFV' & 'LXC'(default: Xen). ") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr")

2 1

[PATCH] [TEST]Fixing 03_ectp_fwd_errs.py tc of ElementConforms
by Deepti B. Kalakeri 22 May '08

22 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211373279 25200 # Node ID f8e46a162b44e421f2638035aa98f8861f846455 # Parent b2b2bb6cc8d87ba0eeddcf3d361d3085104d3492 [TEST]Fixing 03_ectp_fwd_errs.py tc of ElementConforms. Passing the missing virt parameter to try_invalid_assoc() the function call. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r b2b2bb6cc8d8 -r f8e46a162b44 suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Wed May 21 05:34:39 2008 -0700 @@ -106,7 +106,7 @@ def main(): tc_scen = ['INVALID_InstID_Keyname', 'INVALID_InstID_Keyvalue'] for i in range(len(tc_scen)): - retval = try_invalid_assoc(sv_name_val, i, tc_scen[i]) + retval = try_invalid_assoc(sv_name_val, i, tc_scen[i], options.virt) if retval != PASS: status = retval

2 1

[PATCH] [TEST]Fixing 02_hostsystem_to_rasd.py tc of HostSystem
by Deepti B. Kalakeri 21 May '08

21 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211377067 25200 # Node ID 2039130968f0c4e19234dcfbba9940eddbcd7325 # Parent 9b9ca7b60c72f3efb3262dda68bfd327f8ed44bb [TEST]Fixing 02_hostsystem_to_rasd.py tc of HostSystem. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 9b9ca7b60c72 -r 2039130968f0 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Wed May 21 06:35:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Wed May 21 06:37:47 2008 -0700 @@ -68,6 +68,7 @@ test_mem = 128 test_mem = 128 test_mac = "00:11:22:33:44:aa" rev = 529 +proc_instid_rev = 590 def init_list(vsxml, virt="Xen"): """ @@ -81,7 +82,7 @@ def init_list(vsxml, virt="Xen"): rasd_values = { proc_cn : { - "InstanceID" : '%s/%s' %(test_dom, "0"), + "InstanceID" : '%s/%s' %(test_dom, "proc"), "ResourceType" : 3, }, disk_cn : { @@ -104,6 +105,9 @@ def init_list(vsxml, virt="Xen"): } if CIM_REV < rev: rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes" + + if CIM_REV < proc_instid_rev: + rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0) return rasd_values

1 0

[PATCH] [TEST] Fixing 01_forward.py tc of SettingsDefine
by Deepti B. Kalakeri 21 May '08

21 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211376912 25200 # Node ID 9b9ca7b60c72f3efb3262dda68bfd327f8ed44bb # Parent f8e46a162b44e421f2638035aa98f8861f846455 [TEST] Fixing 01_forward.py tc of SettingsDefine. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r f8e46a162b44 -r 9b9ca7b60c72 suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Wed May 21 05:34:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Wed May 21 06:35:12 2008 -0700 @@ -32,6 +32,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib import devices from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import CIM_REV from CimTest import Globals from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -41,6 +42,7 @@ test_dom = "domu1" test_dom = "domu1" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 +proc_instid_rev = 590 def print_error(cn, detail): @@ -83,12 +85,18 @@ def main(): 'NetworkPort' : test_mac, 'Processor' : test_vcpus -1 } + devlist = {} logelelst = {} exp_inst_id_val = {} for cn in cn_id.keys(): key_list = get_keys(cn, cn_id[cn], 'ComputerSystem', options.virt) - exp_inst_id_val[cn] = key_list['DeviceID'] + + if CIM_REV >= proc_instid_rev and cn == 'Processor': + exp_inst_id_val[cn] = "%s/%s" % (test_dom, "proc") + else: + exp_inst_id_val[cn] = key_list['DeviceID'] + try: dev_class = devices.get_class(get_typed_class(options.virt, cn)) devlist[cn] = dev_class(options.ip, key_list) @@ -98,7 +106,6 @@ def main(): cxml.destroy(options.ip) cxml.undefine(options.ip) return FAIL - sccn = get_typed_class(options.virt, 'ComputerSystem') for cn in logelelst.keys(): try:

1 0

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

21 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 : 76 LibVirtCIM : 580 CIMTEST : 130 ======================================================= PASS : 94 FAIL : 14 XFAIL : 4 SKIP : 17 ----------------- 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 ElementSettingData - 01_forward.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL Memory - 02_defgetmem.py: FAIL NetworkPort - 03_user_netport.py: FAIL Processor - 02_definesys_get_procs.py: FAIL SettingsDefine - 02_reverse.py: FAIL 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 - Unexpected rc code 1 and description: CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform ERROR - Exception: ('Unable create domain %s using DefineSystem()', 'test_domain') InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: FAIL ERROR - error : (110, 'Connection timed out') 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: FAIL ERROR - ElementSettingData returned 0 ProcResourceAllocationSettingData instances ERROR - Unable to get associated ResourceAllocationSettingData from ElementSettingData CIM_ERR_NOT_FOUND: No such instance (domu/proc) 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 - Error checking RASD attribute values 'propertypolicy' 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: FAIL ERROR - Unexpected rc code 1 and description: CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform ERROR - Exception: Unable to create domain domu using DefineSys() InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform 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 - Unexpected rc code 1 and description: CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform ERROR - Exception: Unable create domain test_domain using DefineSystem() InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform 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: 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 - 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 - Unexpected rc code 1 and description: CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error: Resource type not supported on this platform 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

2 6

[PATCH] [TEST] changed ComputerSystem.03 tc for LXC support as an example
by Guo Lian Yun 21 May '08

21 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211270175 25200 # Node ID 4fc59e7a047e9b662979c6bcd7267f1201663280 # Parent b2b2bb6cc8d87ba0eeddcf3d361d3085104d3492 [TEST] changed ComputerSystem.03 tc for LXC support as an example Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r b2b2bb6cc8d8 -r 4fc59e7a047e suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Tue May 20 00:56:15 2008 -0700 @@ -30,12 +30,14 @@ from XenKvmLib import computersystem from XenKvmLib import computersystem from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import LXC_init_path from VirtLib import utils +from XenKvmLib.common_util import create_lxc_file from CimTest import Globals from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domU1" @do_main(sup_types) @@ -43,6 +45,7 @@ def main(): options = main.options status = FAIL + create_lxc_file(LXC_init_path) cxml = vxml.get_class(options.virt)(test_dom) rc = cxml.define(options.ip) if not rc: diff -r b2b2bb6cc8d8 -r 4fc59e7a047e suites/libvirt-cim/lib/XenKvmLib/computersystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Mon May 19 10:43:33 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Tue May 20 00:56:15 2008 -0700 @@ -69,6 +69,9 @@ class KVM_ComputerSystem(CIM_System): class KVM_ComputerSystem(CIM_System): pass +class LXC_ComputerSystem(CIM_System): + pass + def get_cs_class(virt): if virt in virt_types: return eval(get_typed_class(virt, 'ComputerSystem'))

2 1

[PATCH 0 of 3] [TEST] #2 resubmit LXC support for cimtest, mainly modified LXCXML description based on Kaitlin's suggestion
by Guo Lian Yun 21 May '08

21 May '08

2 4

Release 0.4
by Dan Smith 21 May '08

21 May '08

Hi all, I just posted and tagged libvirt-cim-0.4 as well as libcmpiutil-0.4. Both are available in the downloads section on the website. They represent the latest set of features and fixes for both packages. I will update the Fedora RPMs soon, which should make our test reports on F9 look a lot better. Thanks! -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms(a)us.ibm.com

1 0

[PATCH] (#4) ProcessorRASD, the class that won't go away
by Jay Gagnon 21 May '08

21 May '08

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1211297079 14400 # Node ID f00dd77c664c258551c5f884a0bee5d842241e4e # Parent c949b1845113e11e01329abb5aa81ca6ade8e3ec (#4) 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. Changes from 1 to 2: Close brace on if block. That one is really embarrassing; I have no idea what happened there. I mean that crap won't even compile. Removed unnecessary proc_found boolean. That was me being lazy after changing my mind on something. Cleaned up a couple leftover CU_DEBUG calls. Addition of vcpu_inst function, which is similar to vcpu_instances but always only works on one instance and takes a dev_id. This is to prevent all instances from being given a dev_id of zero. It is unfortunately similar to vcpu_instances in other regards, but I'm not sure if it's worth the overhead of trying to combine the similar parts. Fixed quantity v number problem in xml_parse_test that I appear to have been failing to address for about six years. Changes from 2 to 3: Actually include changes needed for associations. Make vcpu_instances use vcpu_inst. Changes from 3 to 4: Rename list_devs to something more meaningful Fix misplaced free. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c949b1845113 -r f00dd77c664c libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/device_parsing.c Tue May 20 11:24:39 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 c949b1845113 -r f00dd77c664c libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/device_parsing.h Tue May 20 11:24:39 2008 -0400 @@ -50,7 +50,7 @@ struct mem_device { }; struct vcpu_device { - uint64_t number; + uint64_t quantity; }; struct emu_device { diff -r c949b1845113 -r f00dd77c664c libxkutil/xml_parse_test.c --- a/libxkutil/xml_parse_test.c Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/xml_parse_test.c Tue May 20 11:24:39 2008 -0400 @@ -96,7 +96,7 @@ static void print_dev_vcpu(struct virt_d static void print_dev_vcpu(struct virt_device *dev, FILE *d) { - print_u64(d, "Virtual CPU", dev->dev.vcpu.number); + print_u64(d, "Virtual CPU", dev->dev.vcpu.quantity); } static void print_dev_emu(struct virt_device *dev, diff -r c949b1845113 -r f00dd77c664c src/Virt_Device.c --- a/src/Virt_Device.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_Device.c Tue May 20 11:24:39 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,127 @@ 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) +static char *get_vcpu_inst_id(const virDomainPtr dom, + int proc_num) { - CMPIInstance *instance; + int rc; + char *id_num = NULL; + char *dev_id = NULL; - 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; + 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); - if (!instance) - return NULL; + out: + return dev_id; +} - device_set_devid(instance, dev, dom); - device_set_systemname(instance, dom); +static bool vcpu_inst(const CMPIBroker *broker, + const virDomainPtr dom, + const char *ns, + int dev_id_num, + struct inst_list *list) +{ + char *dev_id; + CMPIInstance *inst; + virConnectPtr conn = NULL; - return instance; + 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, dev_id_num); + 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 vcpu_instances(const CMPIBroker *broker, + const virDomainPtr dom, + const char *ns, + uint64_t proc_count, + struct inst_list *list) +{ + int i; + bool rc; + + for (i = 0; i < proc_count; i++) { + rc = vcpu_inst(broker, dom, ns, i, list); + if (!rc) + return false; + } + + 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; + 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_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 +357,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; + rc = device_instances(broker, + devs, + count, + dom, + NAMESPACE(reference), + list); - dev = device_instance(broker, - &devs[i], - dom, - NAMESPACE(reference)); - if (dev) - inst_list_add(list, dev); + if (!rc) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Couldn't get device instances"); + } - cleanup_virt_device(&devs[i]); - } + cleanup_virt_devices(&devs, count); out: free(devs); @@ -427,6 +496,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 +531,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 +565,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 +607,30 @@ CMPIStatus get_device_by_name(const CMPI goto err; } - instance = device_instance(broker, - dev, - dom, - NAMESPACE(reference)); + if (type == CIM_RES_TYPE_PROC) { + int ret; + int dev_id_num; + + ret = sscanf(dev->id, "%d", &dev_id_num); + + rc = vcpu_inst(broker, + dom, + NAMESPACE(reference), + dev_id_num, + &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]; err: virDomainFree(dom); @@ -515,6 +638,7 @@ CMPIStatus get_device_by_name(const CMPI free(device); out: + inst_list_free(&tmp_list); virConnectClose(conn); return s; diff -r c949b1845113 -r f00dd77c664c src/Virt_RASD.c --- a/src/Virt_RASD.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_RASD.c Tue May 20 11:24:39 2008 -0400 @@ -31,7 +31,6 @@ #include <libcmpiutil/libcmpiutil.h> #include <libcmpiutil/std_instance.h> -#include "device_parsing.h" #include "misc_util.h" #include "cs_util.h" @@ -56,10 +55,10 @@ static struct virt_device *_find_dev(str return NULL; } -static int list_devs(virConnectPtr conn, - const uint16_t type, - const char *host, - struct virt_device **list) +int list_rasds(virConnectPtr conn, + const uint16_t type, + const char *host, + struct virt_device **list) { virDomainPtr dom; @@ -79,7 +78,7 @@ static struct virt_device *find_dev(virC struct virt_device *list = NULL; struct virt_device *dev = NULL; - count = list_devs(conn, type, host, &list); + count = list_rasds(conn, type, host, &list); if (count > 0) { dev = _find_dev(list, count, devid); cleanup_virt_devices(&list, count); @@ -173,10 +172,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 */ diff -r c949b1845113 -r f00dd77c664c src/Virt_RASD.h --- a/src/Virt_RASD.h Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_RASD.h Tue May 20 11:24:39 2008 -0400 @@ -20,6 +20,8 @@ */ #ifndef __VIRT_RASD_H #define __VIRT_RASD_H + +#include "device_parsing.h" char *rasd_to_xml(CMPIInstance *rasd); @@ -55,6 +57,10 @@ CMPIStatus get_rasd_by_ref(const CMPIBro const char **properties, CMPIInstance **_inst); +int list_rasds(virConnectPtr conn, + const uint16_t type, + const char *host, + struct virt_device **list); #endif /* diff -r c949b1845113 -r f00dd77c664c src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_SettingsDefineState.c Tue May 20 11:24:39 2008 -0400 @@ -39,13 +39,95 @@ const static CMPIBroker *_BROKER; +static int get_proc_dev_count(const char *name, + const char *cn, + uint16_t type, + char *host, + CMPIStatus *s) +{ + virConnectPtr conn = NULL; + struct virt_device *list = NULL; + struct virt_device *dev = NULL; + int dev_count = -1; + int count = -1; + + conn = connect_by_classname(_BROKER, cn, s); + if (conn == NULL) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance (%s)", + name); + goto out; + } + + dev_count = list_rasds(conn, type, host, &list); + if (dev_count <= 0) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Unable to get list of processors"); + goto out; + } + + dev = &list[0]; + count = dev->dev.vcpu.quantity; + + cleanup_virt_devices(&list, dev_count); + + out: + virConnectClose(conn); + return count; +} + +static char *get_rasd_id(const CMPIInstance *inst, uint16_t type) +{ + char *id = NULL; + int ret; + const char *tmp; + + if (type == CIM_RES_TYPE_PROC) { + ret = cu_get_str_prop(inst, "SystemName", &tmp); + if (ret != CMPI_RC_OK) { + CU_DEBUG("No SystemName in device instance"); + goto out; + } + + ret = asprintf(&id, "%s/proc", tmp); + if (ret == -1) { + id = NULL; + goto out; + } + } else { + ret = cu_get_str_prop(inst, "DeviceID", &tmp); + if (ret != CMPI_RC_OK) { + CU_DEBUG("No DeviceID in device instance"); + id = NULL; + goto out; + } + + id = strdup(tmp); + } + + out: + return id; +} + +static char *get_dev_id(const char *host, int devid) +{ + char *id = NULL; + + if (asprintf(&id, "%s/%d", host, devid) == -1) + id = NULL; + + return id; +} + static CMPIStatus dev_to_rasd(const CMPIObjectPath *ref, struct std_assoc_info *info, struct inst_list *list) { CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst = NULL; - const char *name = NULL; + char *id = NULL; if (!match_hypervisor_prefix(ref, info)) return s; @@ -54,16 +136,18 @@ static CMPIStatus dev_to_rasd(const CMPI if (s.rc != CMPI_RC_OK) goto out; - if (cu_get_str_path(ref, "DeviceID", &name) != CMPI_RC_OK) { + id = get_rasd_id(inst, + res_type_from_device_classname(CLASSNAME(ref))); + if (id == NULL) { cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing DeviceID"); + CMPI_RC_ERR_NOT_FOUND, + "Unable to get RASD id from DeviceID"); goto out; - } + } s = get_rasd_by_name(_BROKER, ref, - name, + id, res_type_from_device_classname(CLASSNAME(ref)), NULL, &inst); @@ -73,6 +157,7 @@ static CMPIStatus dev_to_rasd(const CMPI inst_list_add(list, inst); out: + free(id); return s; } @@ -83,7 +168,12 @@ static CMPIStatus rasd_to_dev(const CMPI CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst = NULL; const char *name = NULL; + char *host = NULL; + char *devid = NULL; + char *id = NULL; uint16_t type; + int count = 1; + int i; if (!match_hypervisor_prefix(ref, info)) return s; @@ -92,6 +182,13 @@ static CMPIStatus rasd_to_dev(const CMPI if (s.rc != CMPI_RC_OK) goto out; + if (res_type_from_rasd_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing ResourceType"); + goto out; + } + if (cu_get_str_path(ref, "InstanceID", &name) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -99,20 +196,48 @@ static CMPIStatus rasd_to_dev(const CMPI goto out; } - if (res_type_from_rasd_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceType"); - goto out; + if (type == CIM_RES_TYPE_PROC) { + if (parse_fq_devid((char *)name, &host, &devid) != 1) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance (%s)", + name); + goto out; + } + + count = get_proc_dev_count(name, + CLASSNAME(ref), + type, + host, + &s); + if (count <= 0) + goto out; } - s = get_device_by_name(_BROKER, ref, name, type, &inst); - if (s.rc != CMPI_RC_OK) - goto out; + for (i = 0; i < count; i++) { + if (type == CIM_RES_TYPE_PROC) + id = get_dev_id(host, i); + else + id = strdup(name); - inst_list_add(list, inst); + if (id == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "Unable to get RASD id from DeviceID"); + goto out; + } + + s = get_device_by_name(_BROKER, ref, id, type, &inst); + if (s.rc != CMPI_RC_OK) + goto out; + + inst_list_add(list, inst); + free(id); + } out: + free(host); + free(devid); return s; }

2 1

[PATCH] (#3) ProcessorRASD, the class that won't go away
by Jay Gagnon 20 May '08

20 May '08

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1211291977 14400 # Node ID d18a3d2d57a9402f9db8993212ed24316e05d657 # Parent c949b1845113e11e01329abb5aa81ca6ade8e3ec (#3) 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. Changes from 1 to 2: Close brace on if block. That one is really embarrassing; I have no idea what happened there. I mean that crap won't even compile. Removed unnecessary proc_found boolean. That was me being lazy after changing my mind on something. Cleaned up a couple leftover CU_DEBUG calls. Addition of vcpu_inst function, which is similar to vcpu_instances but always only works on one instance and takes a dev_id. This is to prevent all instances from being given a dev_id of zero. It is unfortunately similar to vcpu_instances in other regards, but I'm not sure if it's worth the overhead of trying to combine the similar parts. Fixed quantity v number problem in xml_parse_test that I appear to have been failing to address for about six years. Changes from 2 to 3: Actually include changes needed for associations. Make vcpu_instances use vcpu_inst. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c949b1845113 -r d18a3d2d57a9 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/device_parsing.c Tue May 20 09:59:37 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 c949b1845113 -r d18a3d2d57a9 libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/device_parsing.h Tue May 20 09:59:37 2008 -0400 @@ -50,7 +50,7 @@ struct mem_device { }; struct vcpu_device { - uint64_t number; + uint64_t quantity; }; struct emu_device { diff -r c949b1845113 -r d18a3d2d57a9 libxkutil/xml_parse_test.c --- a/libxkutil/xml_parse_test.c Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/xml_parse_test.c Tue May 20 09:59:37 2008 -0400 @@ -96,7 +96,7 @@ static void print_dev_vcpu(struct virt_d static void print_dev_vcpu(struct virt_device *dev, FILE *d) { - print_u64(d, "Virtual CPU", dev->dev.vcpu.number); + print_u64(d, "Virtual CPU", dev->dev.vcpu.quantity); } static void print_dev_emu(struct virt_device *dev, diff -r c949b1845113 -r d18a3d2d57a9 src/Virt_Device.c --- a/src/Virt_Device.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_Device.c Tue May 20 09:59:37 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,127 @@ 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) +static char *get_vcpu_inst_id(const virDomainPtr dom, + int proc_num) { - CMPIInstance *instance; + int rc; + char *id_num = NULL; + char *dev_id = NULL; - 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; + 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); - if (!instance) - return NULL; + out: + return dev_id; +} - device_set_devid(instance, dev, dom); - device_set_systemname(instance, dom); +static bool vcpu_inst(const CMPIBroker *broker, + const virDomainPtr dom, + const char *ns, + int dev_id_num, + struct inst_list *list) +{ + char *dev_id; + CMPIInstance *inst; + virConnectPtr conn = NULL; - return instance; + 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, dev_id_num); + 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 vcpu_instances(const CMPIBroker *broker, + const virDomainPtr dom, + const char *ns, + uint64_t proc_count, + struct inst_list *list) +{ + int i; + bool rc; + + for (i = 0; i < proc_count; i++) { + rc = vcpu_inst(broker, dom, ns, i, list); + if (!rc) + return false; + } + + 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; + 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_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 +357,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; + rc = device_instances(broker, + devs, + count, + dom, + NAMESPACE(reference), + list); - dev = device_instance(broker, - &devs[i], - dom, - NAMESPACE(reference)); - if (dev) - inst_list_add(list, dev); + if (!rc) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Couldn't get device instances"); + } - cleanup_virt_device(&devs[i]); - } + cleanup_virt_devices(&devs, count); out: free(devs); @@ -427,6 +496,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 +531,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 +565,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 +607,30 @@ CMPIStatus get_device_by_name(const CMPI goto err; } - instance = device_instance(broker, - dev, - dom, - NAMESPACE(reference)); + if (type == CIM_RES_TYPE_PROC) { + int ret; + int dev_id_num; + + ret = sscanf(dev->id, "%d", &dev_id_num); + + rc = vcpu_inst(broker, + dom, + NAMESPACE(reference), + dev_id_num, + &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]; err: virDomainFree(dom); @@ -515,6 +638,7 @@ CMPIStatus get_device_by_name(const CMPI free(device); out: + inst_list_free(&tmp_list); virConnectClose(conn); return s; diff -r c949b1845113 -r d18a3d2d57a9 src/Virt_RASD.c --- a/src/Virt_RASD.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_RASD.c Tue May 20 09:59:37 2008 -0400 @@ -31,7 +31,6 @@ #include <libcmpiutil/libcmpiutil.h> #include <libcmpiutil/std_instance.h> -#include "device_parsing.h" #include "misc_util.h" #include "cs_util.h" @@ -56,10 +55,10 @@ static struct virt_device *_find_dev(str return NULL; } -static int list_devs(virConnectPtr conn, - const uint16_t type, - const char *host, - struct virt_device **list) +int list_devs(virConnectPtr conn, + const uint16_t type, + const char *host, + struct virt_device **list) { virDomainPtr dom; @@ -173,10 +172,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 */ diff -r c949b1845113 -r d18a3d2d57a9 src/Virt_RASD.h --- a/src/Virt_RASD.h Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_RASD.h Tue May 20 09:59:37 2008 -0400 @@ -20,6 +20,8 @@ */ #ifndef __VIRT_RASD_H #define __VIRT_RASD_H + +#include "device_parsing.h" char *rasd_to_xml(CMPIInstance *rasd); @@ -55,6 +57,10 @@ CMPIStatus get_rasd_by_ref(const CMPIBro const char **properties, CMPIInstance **_inst); +int list_devs(virConnectPtr conn, + const uint16_t type, + const char *host, + struct virt_device **list); #endif /* diff -r c949b1845113 -r d18a3d2d57a9 src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_SettingsDefineState.c Tue May 20 09:59:37 2008 -0400 @@ -39,13 +39,95 @@ const static CMPIBroker *_BROKER; +static int get_proc_dev_count(const char *name, + const char *cn, + uint16_t type, + char *host, + CMPIStatus *s) +{ + virConnectPtr conn = NULL; + struct virt_device *list = NULL; + struct virt_device *dev = NULL; + int dev_count = -1; + int count = -1; + + conn = connect_by_classname(_BROKER, cn, s); + if (conn == NULL) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance (%s)", + name); + goto out; + } + + dev_count = list_devs(conn, type, host, &list); + if (dev_count <= 0) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Unable to get list of processors"); + goto out; + } + + dev = &list[0]; + count = dev->dev.vcpu.quantity; + + cleanup_virt_devices(&list, dev_count); + + out: + virConnectClose(conn); + return count; +} + +static char *get_rasd_id(const CMPIInstance *inst, uint16_t type) +{ + char *id = NULL; + int ret; + const char *tmp; + + if (type == CIM_RES_TYPE_PROC) { + ret = cu_get_str_prop(inst, "SystemName", &tmp); + if (ret != CMPI_RC_OK) { + CU_DEBUG("No SystemName in device instance"); + goto out; + } + + ret = asprintf(&id, "%s/proc", tmp); + if (ret == -1) { + id = NULL; + goto out; + } + } else { + ret = cu_get_str_prop(inst, "DeviceID", &tmp); + if (ret != CMPI_RC_OK) { + CU_DEBUG("No DeviceID in device instance"); + id = NULL; + goto out; + } + + id = strdup(tmp); + } + + out: + return id; +} + +static char *get_dev_id(const char *host, int devid) +{ + char *id = NULL; + + if (asprintf(&id, "%s/%d", host, devid) == -1) + id = NULL; + + return id; +} + static CMPIStatus dev_to_rasd(const CMPIObjectPath *ref, struct std_assoc_info *info, struct inst_list *list) { CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst = NULL; - const char *name = NULL; + char *id = NULL; if (!match_hypervisor_prefix(ref, info)) return s; @@ -54,16 +136,18 @@ static CMPIStatus dev_to_rasd(const CMPI if (s.rc != CMPI_RC_OK) goto out; - if (cu_get_str_path(ref, "DeviceID", &name) != CMPI_RC_OK) { + id = get_rasd_id(inst, + res_type_from_device_classname(CLASSNAME(ref))); + if (id == NULL) { cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing DeviceID"); + CMPI_RC_ERR_NOT_FOUND, + "Unable to get RASD id from DeviceID"); goto out; - } + } s = get_rasd_by_name(_BROKER, ref, - name, + id, res_type_from_device_classname(CLASSNAME(ref)), NULL, &inst); @@ -73,6 +157,7 @@ static CMPIStatus dev_to_rasd(const CMPI inst_list_add(list, inst); out: + free(id); return s; } @@ -83,7 +168,12 @@ static CMPIStatus rasd_to_dev(const CMPI CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst = NULL; const char *name = NULL; + char *host = NULL; + char *devid = NULL; + char *id = NULL; uint16_t type; + int count = 1; + int i; if (!match_hypervisor_prefix(ref, info)) return s; @@ -92,6 +182,13 @@ static CMPIStatus rasd_to_dev(const CMPI if (s.rc != CMPI_RC_OK) goto out; + if (res_type_from_rasd_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing ResourceType"); + goto out; + } + if (cu_get_str_path(ref, "InstanceID", &name) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -99,20 +196,48 @@ static CMPIStatus rasd_to_dev(const CMPI goto out; } - if (res_type_from_rasd_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceType"); - goto out; + if (type == CIM_RES_TYPE_PROC) { + if (parse_fq_devid((char *)name, &host, &devid) != 1) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance (%s)", + name); + goto out; + } + + count = get_proc_dev_count(name, + CLASSNAME(ref), + type, + host, + &s); + if (count <= 0) + goto out; } - s = get_device_by_name(_BROKER, ref, name, type, &inst); - if (s.rc != CMPI_RC_OK) - goto out; + for (i = 0; i < count; i++) { + if (type == CIM_RES_TYPE_PROC) + id = get_dev_id(host, i); + else + id = strdup(name); - inst_list_add(list, inst); + if (id == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "Unable to get RASD id from DeviceID"); + goto out; + } + + s = get_device_by_name(_BROKER, ref, id, type, &inst); + if (s.rc != CMPI_RC_OK) + goto out; + + inst_list_add(list, inst); + } out: + free(id); + free(host); + free(devid); return s; }

1 0

[PATCH] (#2) ProcessorRASD, the class that won't go away
by Jay Gagnon 20 May '08

20 May '08

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1211234740 14400 # Node ID d9042b4ea61771df5110e97872c9e504f71859e7 # Parent c949b1845113e11e01329abb5aa81ca6ade8e3ec (#2) 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. Changes from 1 to 2: Close brace on if block. That one is really embarrassing; I have no idea what happened there. I mean that crap won't even compile. Removed unnecessary proc_found boolean. That was me being lazy after changing my mind on something. Cleaned up a couple leftover CU_DEBUG calls. Addition of vcpu_inst function, which is similar to vcpu_instances but always only works on one instance and takes a dev_id. This is to prevent all instances from being given a dev_id of zero. It is unfortunately similar to vcpu_instances in other regards, but I'm not sure if it's worth the overhead of trying to combine the similar parts. Fixed quantity v number problem in xml_parse_test that I appear to have been failing to address for about six years. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c949b1845113 -r d9042b4ea617 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/device_parsing.c Mon May 19 18:05:40 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 c949b1845113 -r d9042b4ea617 libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/device_parsing.h Mon May 19 18:05:40 2008 -0400 @@ -50,7 +50,7 @@ struct mem_device { }; struct vcpu_device { - uint64_t number; + uint64_t quantity; }; struct emu_device { diff -r c949b1845113 -r d9042b4ea617 libxkutil/xml_parse_test.c --- a/libxkutil/xml_parse_test.c Thu May 15 17:56:39 2008 -0700 +++ b/libxkutil/xml_parse_test.c Mon May 19 18:05:40 2008 -0400 @@ -96,7 +96,7 @@ static void print_dev_vcpu(struct virt_d static void print_dev_vcpu(struct virt_device *dev, FILE *d) { - print_u64(d, "Virtual CPU", dev->dev.vcpu.number); + print_u64(d, "Virtual CPU", dev->dev.vcpu.quantity); } static void print_dev_emu(struct virt_device *dev, diff -r c949b1845113 -r d9042b4ea617 src/Virt_Device.c --- a/src/Virt_Device.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_Device.c Mon May 19 18:05:40 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,141 @@ 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) +static char *get_vcpu_inst_id(const virDomainPtr dom, + int proc_num) { - CMPIInstance *instance; + int rc; + char *id_num = NULL; + char *dev_id = NULL; - 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; + 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); - if (!instance) - return NULL; + out: + return dev_id; +} - device_set_devid(instance, dev, dom); - device_set_systemname(instance, dom); +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 = NULL; - return instance; + 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 vcpu_inst(const CMPIBroker *broker, + const virDomainPtr dom, + const char *ns, + int dev_id_num, + struct inst_list *list) +{ + char *dev_id; + CMPIInstance *inst; + virConnectPtr conn = NULL; + + 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, dev_id_num); + 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; + 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_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 +371,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; + rc = device_instances(broker, + devs, + count, + dom, + NAMESPACE(reference), + list); - dev = device_instance(broker, - &devs[i], - dom, - NAMESPACE(reference)); - if (dev) - inst_list_add(list, dev); + if (!rc) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Couldn't get device instances"); + } - cleanup_virt_device(&devs[i]); - } + cleanup_virt_devices(&devs, count); out: free(devs); @@ -427,6 +510,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 +545,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 +579,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 +621,30 @@ CMPIStatus get_device_by_name(const CMPI goto err; } - instance = device_instance(broker, - dev, - dom, - NAMESPACE(reference)); + if (type == CIM_RES_TYPE_PROC) { + int ret; + int dev_id_num; + + ret = sscanf(dev->id, "%d", &dev_id_num); + + rc = vcpu_inst(broker, + dom, + NAMESPACE(reference), + dev_id_num, + &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]; err: virDomainFree(dom); @@ -515,6 +652,7 @@ CMPIStatus get_device_by_name(const CMPI free(device); out: + inst_list_free(&tmp_list); virConnectClose(conn); return s; diff -r c949b1845113 -r d9042b4ea617 src/Virt_RASD.c --- a/src/Virt_RASD.c Thu May 15 17:56:39 2008 -0700 +++ b/src/Virt_RASD.c Mon May 19 18:05:40 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 */

1 1

[PATCH] [TEST]Fixing 03_hs_to_settdefcap.py tc to accomadate the ValueRole/ValueRange changes in RASDs
by Deepti B. Kalakeri 20 May '08

20 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211219013 25200 # Node ID 509c5b7c0923e1b56defa1f9f9bf04e20703d6e1 # Parent 1650b84084a49965c2088f56248d6018b470e60c [TEST]Fixing 03_hs_to_settdefcap.py tc to accomadate the ValueRole/ValueRange changes in RASDs. Tested with KVM, XenFV, Xen with latest and rpm libvirt-cim. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 1650b84084a4 -r 509c5b7c0923 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Mon May 19 09:31:22 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Mon May 19 10:43:33 2008 -0700 @@ -48,11 +48,13 @@ from CimTest.Globals import logger, CIM_ from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES, do_main from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.test_xml import testxml -from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all +from XenKvmLib.test_doms import destroy_and_undefine_all +from XenKvmLib.const import CIM_REV sup_types = ['Xen', 'KVM', 'XenFV'] test_dom = "domgst" test_vcpus = 1 +libvirtcim_sdc_rasd_rev = 571 def setup_env(server, virt="Xen"): status = PASS @@ -64,7 +66,7 @@ def setup_env(server, virt="Xen"): logger.error("Failed to define the dom: %s", test_dom) status = FAIL - return status + return status, vsxml def print_err(err, detail, cn): logger.error(err % cn) @@ -154,7 +156,7 @@ def get_alloccap(server, devpool, virt=" '%s_MemoryPool' % virt : 4, '%s_DiskPool' % virt : 17 , '%s_NetworkPool' % virt : 10 } - + for inst in devpool: try: assoc_info = Associators(server, @@ -240,22 +242,26 @@ def check_rasd_vals(inst, cn, rt, rangel if inst['ResourceType'] != rt: logger.error("In ResourceType for %s " % rt) return FAIL + + # The following properties have been removed in the patchset 571 + # but is present in the rpm libvirt-cim and hence retained it. - ppolicy = inst['PropertyPolicy'] - if ppolicy != 0 and ppolicy != 1: - logger.error("In PropertyPolicy for %s " % ppolicy) - return FAIL + if CIM_REV < libvirtcim_sdc_rasd_rev: + ppolicy = inst['PropertyPolicy'] + if ppolicy != 0 and ppolicy != 1: + logger.error("In PropertyPolicy for %s " % ppolicy) + return FAIL - vrole = inst['ValueRole'] - if vrole < 0 or vrole > 4: - logger.error("In ValueRole %s " % vrole) - return FAIL + vrole = inst['ValueRole'] + if vrole < 0 or vrole > 4: + logger.error("In ValueRole %s " % vrole) + return FAIL - insid = inst['InstanceID'] - vrange = rangelist[insid] - if vrange != inst['ValueRange']: - logger.error("In ValueRange for %s " % vrange) - return FAIL + insid = inst['InstanceID'] + vrange = rangelist[insid] + if vrange != inst['ValueRange']: + logger.error("In ValueRange for %s " % vrange) + return FAIL except Exception, detail: logger.error("Error checking RASD attribute values %s" % detail) @@ -263,40 +269,40 @@ def check_rasd_vals(inst, cn, rt, rangel return PASS -def clean_up(server, status): - """ - Removing the guest and returning status - """ - test_domain_function(test_dom, server, "undefine") - sys.exit(status) - @do_main(sup_types) def main(): options = main.options status = PASS - if options.virt == 'XenFV': - options.virt = 'Xen' + server = options.ip + virt = options.virt - status = setup_env(options.ip, options.virt) + if virt == 'XenFV': + virt = 'Xen' + + status, vsxml = setup_env(server, virt) if status != PASS: return status - status, hs, clsname = get_hostsys(options.ip, options.virt) + status, hs, clsname = get_hostsys(server, virt) if status != PASS or hs == None: - clean_up(options.ip, status) + vsxml.undefine(server) + return status - status, devpool = get_hostrespool(options.ip, hs, clsname, options.virt) + status, devpool = get_hostrespool(server, hs, clsname, virt) if status != PASS or devpool == None: - clean_up(options.ip, status) + vsxml.undefine(server) + return status - status, alloccap = get_alloccap(options.ip, devpool, options.virt) + status, alloccap = get_alloccap(server, devpool, virt) if status != PASS or alloccap == None: - clean_up(options.ip, status) + vsxml.undefine(server) + return status - status = get_rasddetails(options.ip, alloccap, options.virt) + status = get_rasddetails(server, alloccap, virt) - clean_up(options.ip, status) + vsxml.undefine(server) + return status if __name__ == "__main__": sys.exit(main())

1 0

[PATCH] [TEST]Fixing 01_memory.py tc to accomdate the memory changes
by Deepti B. Kalakeri 20 May '08

20 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211214682 25200 # Node ID 1650b84084a49965c2088f56248d6018b470e60c # Parent 80682d57c067810c97a92fce162c29dab2ea5451 [TEST]Fixing 01_memory.py tc to accomdate the memory changes. Tested with KVM, XenFV, Xen with latest and rpm libvirt-cim. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 80682d57c067 -r 1650b84084a4 suites/libvirt-cim/cimtest/Memory/01_memory.py --- a/suites/libvirt-cim/cimtest/Memory/01_memory.py Mon May 19 08:36:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/Memory/01_memory.py Mon May 19 09:31:22 2008 -0700 @@ -31,11 +31,13 @@ from XenKvmLib.vxml import XenXML, KVMXM from XenKvmLib.vxml import XenXML, KVMXML, get_class from CimTest.Globals import logger from CimTest.Globals import do_main +from XenKvmLib.const import CIM_REV sup_types = ['Xen', 'KVM', 'XenFV'] test_dom = "test_domain" mem = 256 #MB +mem_change_version=585 @do_main(sup_types) def main(): @@ -43,7 +45,11 @@ def main(): vsxml = get_class(options.virt)(test_dom, mem) vsxml.define(options.ip) - + if CIM_REV >= mem_change_version: + alloc_mem = int(vsxml.xml_get_mem()) + else: + alloc_mem = int(vsxml.xml_get_mem())/1024 + devid = "%s/mem" % test_dom key_list = { 'DeviceID' : devid, 'CreationClassName' : get_typed_class(options.virt, "Memory"), @@ -60,8 +66,8 @@ def main(): capacity = dev.ConsumableBlocks * dev.BlockSize / 1024 - if capacity != mem: - logger.error("Capacity should be %i MB instead of %i MB" % (mem, capacity)) + if capacity != alloc_mem: + logger.error("Capacity should be %i MB instead of %i MB" % (alloc_mem, capacity)) status = 1 if status == 0:

1 0

[PATCH] [TEST] #2 Updating the cleanup_restore() function call in the tc to pass the server and virt parameters
by Deepti B. Kalakeri 20 May '08

20 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211211376 25200 # Node ID 80682d57c067810c97a92fce162c29dab2ea5451 # Parent d013f73cf783cac1b458cec6dbc0c0308786f1e9 [TEST] #2 Updating the cleanup_restore() function call in the tc to pass the server and virt parameters. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r d013f73cf783 -r 80682d57c067 suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py --- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Mon May 19 08:36:16 2008 -0700 @@ -76,6 +76,7 @@ def main(): options = main.options server = options.ip + virt = options.virt # Verify DiskPool on machine status = create_diskpool_file() if status != PASS: @@ -130,7 +131,7 @@ def main(): status = ret_value if status != PASS: break - cleanup_restore() + cleanup_restore(server, virt) return status if __name__ == "__main__": sys.exit(main()) diff -r d013f73cf783 -r 80682d57c067 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Mon May 19 08:36:16 2008 -0700 @@ -170,9 +170,9 @@ def err_invalid_keyvalue(): break return status -def clean_and_exit(server, msg): +def clean_and_exit(server, virt, msg): logger.error("------FAILED: Invalid %s.------", msg) - cleanup_restore() + cleanup_restore(server, virt) vsxml.undefine(server) @do_main(platform_sup) @@ -207,20 +207,20 @@ def main(): assoc_classname = get_typed_class(virt, "ElementAllocatedFromPool") ret = err_invalid_keyname() if ret != PASS: - clean_and_exit(options.ip, "KeyName") + clean_and_exit(options.ip, virt, "KeyName") return ret ret = err_invalid_keyvalue() if ret != PASS: - clean_and_exit(options.ip, "KeyValue") + clean_and_exit(options.ip, virt, "KeyValue") return ret ret = err_invalid_ccname() if ret != PASS: - clean_and_exit(options.ip, "CCName") + clean_and_exit(options.ip, virt, "CCName") return ret - cleanup_restore() + cleanup_restore(options.ip, virt) vsxml.undefine(options.ip) return PASS if __name__ == "__main__": diff -r d013f73cf783 -r 80682d57c067 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Mon May 19 08:36:16 2008 -0700 @@ -477,9 +477,9 @@ def err_invalid_syscreationclassname_key return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) -def clean_and_exit(server, msg): +def clean_and_exit(server, virt, msg): logger.error("------FAILED: Invalid %s.------", msg) - cleanup_restore() + cleanup_restore(server, virt) vsxml.undefine(server) @do_main(platform_sup) @@ -519,50 +519,50 @@ def main(): ret = err_invalid_sysname_keyname(conn, exp_list[0]) if ret != PASS: - clean_and_exit(options.ip, "SystemName KeyName") + clean_and_exit(options.ip, virt, "SystemName KeyName") return ret ret = err_invalid_sysname_keyvalue(conn, exp_list[0]) if ret != PASS: - clean_and_exit(options.ip, "SystemName Key Value") + clean_and_exit(options.ip, virt, "SystemName Key Value") return ret ret = err_invalid_devid_keyname(conn, exp_list[1]) if ret != PASS: - clean_and_exit(options.ip, "DeviceID Keyname") + clean_and_exit(options.ip, virt, "DeviceID Keyname") return ret ret = err_invalid_devid_keyvalue(conn, exp_list[2]) if ret != PASS: - clean_and_exit(options.ip, "DeviceID Keyvalue") + clean_and_exit(options.ip, virt, "DeviceID Keyvalue") return ret ret = err_invalid_classname(conn, exp_list[3]) if ret != PASS: - clean_and_exit(options.ip, "classname Keyname") + clean_and_exit(options.ip, virt, "classname Keyname") return ret ret = err_invalid_creationclassname_keyname(conn, exp_list[4]) if ret != PASS: - clean_and_exit(options.ip, "creationclassname Keyname") + clean_and_exit(options.ip, virt, "creationclassname Keyname") return ret ret = err_invalid_creationclassname_keyvalue(conn, exp_list[4]) if ret != PASS: - clean_and_exit(options.ip, "creationclassname Keyvalue") + clean_and_exit(options.ip, virt, "creationclassname Keyvalue") return ret ret = err_invalid_syscreationclassname_keyname(conn, exp_list[5]) if ret != PASS: - clean_and_exit(options.ip, "System creationclassname Keyname") + clean_and_exit(options.ip, virt, "System creationclassname Keyname") return ret ret = err_invalid_syscreationclassname_keyvalue(conn, exp_list[5]) if ret != PASS: - clean_and_exit(options.ip, "System creationclassname Keyvalue") + clean_and_exit(options.ip, virt, "System creationclassname Keyvalue") return ret - cleanup_restore() + cleanup_restore(options.ip, virt) vsxml.undefine(options.ip) return PASS if __name__ == "__main__": diff -r d013f73cf783 -r 80682d57c067 suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Mon May 19 08:36:16 2008 -0700 @@ -179,7 +179,7 @@ def get_assocname_info(server, cn, an, q status = FAIL if status != PASS: - cleanup_restore() + cleanup_restore(server, virt='Xen') test_domain_function(test_dom, server, "destroy") return status, assoc_info @@ -221,7 +221,7 @@ def verify_eafp_values(server, in_pllist except Exception, detail: logger.error(CIM_ERROR_ASSOCIATORS, an) logger.error("Exception: %s", detail) - cleanup_restore() + cleanup_restore(server, virt='Xen') status = FAIL return status @@ -229,7 +229,7 @@ def main(): def main(): options= main.options server = options.ip - + virt=options.virt # Get the host info status, host_name, classname = get_host_info(server) if status != PASS: @@ -256,14 +256,14 @@ def main(): status = setup_env(server) if status != PASS: - cleanup_restore() + cleanup_restore(server, vir=virt) test_domain_function(test_dom, server, cmd = "destroy") return status in_pllist = pool_init_list(pool) status = verify_eafp_values(server, in_pllist) ret = test_domain_function(test_dom, server, cmd = "destroy") - cleanup_restore() + cleanup_restore(server, virt=virt) return status if __name__ == "__main__": sys.exit(main()) diff -r d013f73cf783 -r 80682d57c067 suites/libvirt-cim/cimtest/ResourcePool/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Mon May 19 08:36:16 2008 -0700 @@ -141,7 +141,7 @@ def main(): return FAIL status = verify_fields(pool_list, netpool, get_typed_class(virt, np_cn)) - cleanup_restore() + cleanup_restore(ip, virt) return status if __name__ == "__main__": diff -r d013f73cf783 -r 80682d57c067 suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Mon May 19 08:36:16 2008 -0700 @@ -109,7 +109,7 @@ def main(): if not ret: logger.error("Failed to create the Virtual Network '%s'", test_network) - cleanup_restore() + cleanup_restore(ip, virt) return SKIP netid = "%s/%s" % ("NetworkPool", test_network) @@ -124,16 +124,16 @@ def main(): ret_value = err_invalid_instid_keyname(conn, cn, instid) if ret_value != PASS: logger.error("------ FAILED: Invalid InstanceID Key Name.------") - cleanup_restore() + cleanup_restore(ip, virt) return ret_value ret_value = err_invalid_instid_keyvalue(conn, cn) if ret_value != PASS: logger.error("------ FAILED: Invalid InstanceID Key Value.------") - cleanup_restore() + cleanup_restore(ip, virt) return ret_value - cleanup_restore() + cleanup_restore(ip, virt) return PASS if __name__ == "__main__":

1 0

[PATCH 0 of 3] [TEST] bundles of LXC support
by Guo Lian Yun 19 May '08

19 May '08

patch 1 includes all the helper function changes for LXC tc running patch 2 adds LXCXML class, you can use it to define a lxc domain, also you can add more functions in it to support more devices patch 3 changes ComputerSystem.01&03 and related lib to reflect the lxc changes Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

2 7

[PATCH] [TEST] Updating the cleanup_restore() function call in the tc to pass the server and virt parameters
by Deepti B. Kalakeri 19 May '08

19 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210858387 25200 # Node ID c778e1b632afb62c95f05e663199cdf2d24af562 # Parent fa608cfd2be35b4170e14620253f95a9b0e016ed [TEST] Updating the cleanup_restore() function call in the tc to pass the server and virt parameters. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r fa608cfd2be3 -r c778e1b632af suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py --- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Thu May 15 06:33:07 2008 -0700 @@ -76,6 +76,7 @@ def main(): options = main.options server = options.ip + virt = options.virt # Verify DiskPool on machine status = create_diskpool_file() if status != PASS: @@ -130,7 +131,7 @@ def main(): status = ret_value if status != PASS: break - cleanup_restore() + cleanup_restore(server, virt) return status if __name__ == "__main__": sys.exit(main()) diff -r fa608cfd2be3 -r c778e1b632af suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Thu May 15 06:33:07 2008 -0700 @@ -170,9 +170,9 @@ def err_invalid_keyvalue(): break return status -def clean_and_exit(server, msg): +def clean_and_exit(server, virt, msg): logger.error("------FAILED: Invalid %s.------", msg) - cleanup_restore() + cleanup_restore(server, virt) vsxml.undefine(server) @do_main(platform_sup) @@ -207,20 +207,20 @@ def main(): assoc_classname = get_typed_class(virt, "ElementAllocatedFromPool") ret = err_invalid_keyname() if ret != PASS: - clean_and_exit(options.ip, "KeyName") + clean_and_exit(options.ip, virt, "KeyName") return ret ret = err_invalid_keyvalue() if ret != PASS: - clean_and_exit(options.ip, "KeyValue") + clean_and_exit(options.ip, virt, "KeyValue") return ret ret = err_invalid_ccname() if ret != PASS: - clean_and_exit(options.ip, "CCName") + clean_and_exit(options.ip, virt, "CCName") return ret - cleanup_restore() + cleanup_restore(options.ip, virt) vsxml.undefine(options.ip) return PASS if __name__ == "__main__": diff -r fa608cfd2be3 -r c778e1b632af suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Thu May 15 06:33:07 2008 -0700 @@ -477,9 +477,9 @@ def err_invalid_syscreationclassname_key return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) -def clean_and_exit(server, msg): +def clean_and_exit(server, virt, msg): logger.error("------FAILED: Invalid %s.------", msg) - cleanup_restore() + cleanup_restore(server, virt) vsxml.undefine(server) @do_main(platform_sup) @@ -519,50 +519,50 @@ def main(): ret = err_invalid_sysname_keyname(conn, exp_list[0]) if ret != PASS: - clean_and_exit(options.ip, "SystemName KeyName") + clean_and_exit(options.ip, virt, "SystemName KeyName") return ret ret = err_invalid_sysname_keyvalue(conn, exp_list[0]) if ret != PASS: - clean_and_exit(options.ip, "SystemName Key Value") + clean_and_exit(options.ip, virt, "SystemName Key Value") return ret ret = err_invalid_devid_keyname(conn, exp_list[1]) if ret != PASS: - clean_and_exit(options.ip, "DeviceID Keyname") + clean_and_exit(options.ip, virt, "DeviceID Keyname") return ret ret = err_invalid_devid_keyvalue(conn, exp_list[2]) if ret != PASS: - clean_and_exit(options.ip, "DeviceID Keyvalue") + clean_and_exit(options.ip, virt, "DeviceID Keyvalue") return ret ret = err_invalid_classname(conn, exp_list[3]) if ret != PASS: - clean_and_exit(options.ip, "classname Keyname") + clean_and_exit(options.ip, virt, "classname Keyname") return ret ret = err_invalid_creationclassname_keyname(conn, exp_list[4]) if ret != PASS: - clean_and_exit(options.ip, "creationclassname Keyname") + clean_and_exit(options.ip, virt, "creationclassname Keyname") return ret ret = err_invalid_creationclassname_keyvalue(conn, exp_list[4]) if ret != PASS: - clean_and_exit(options.ip, "creationclassname Keyvalue") + clean_and_exit(options.ip, virt, "creationclassname Keyvalue") return ret ret = err_invalid_syscreationclassname_keyname(conn, exp_list[5]) if ret != PASS: - clean_and_exit(options.ip, "System creationclassname Keyname") + clean_and_exit(options.ip, virt, "System creationclassname Keyname") return ret ret = err_invalid_syscreationclassname_keyvalue(conn, exp_list[5]) if ret != PASS: - clean_and_exit(options.ip, "System creationclassname Keyvalue") + clean_and_exit(options.ip, virt, "System creationclassname Keyvalue") return ret - cleanup_restore() + cleanup_restore(options.ip, virt) vsxml.undefine(options.ip) return PASS if __name__ == "__main__": diff -r fa608cfd2be3 -r c778e1b632af suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Thu May 15 06:33:07 2008 -0700 @@ -179,7 +179,7 @@ def get_assocname_info(server, cn, an, q status = FAIL if status != PASS: - cleanup_restore() + cleanup_restore(server, virt='Xen') test_domain_function(test_dom, server, "destroy") return status, assoc_info @@ -221,7 +221,7 @@ def verify_eafp_values(server, in_pllist except Exception, detail: logger.error(CIM_ERROR_ASSOCIATORS, an) logger.error("Exception: %s", detail) - cleanup_restore() + cleanup_restore(server, virt='Xen') status = FAIL return status @@ -229,7 +229,7 @@ def main(): def main(): options= main.options server = options.ip - + virt=options.virt # Get the host info status, host_name, classname = get_host_info(server) if status != PASS: @@ -256,14 +256,14 @@ def main(): status = setup_env(server) if status != PASS: - cleanup_restore() + cleanup_restore(server, vir=tvirt) test_domain_function(test_dom, server, cmd = "destroy") return status in_pllist = pool_init_list(pool) status = verify_eafp_values(server, in_pllist) ret = test_domain_function(test_dom, server, cmd = "destroy") - cleanup_restore() + cleanup_restore(server, virt=virt) return status if __name__ == "__main__": sys.exit(main()) diff -r fa608cfd2be3 -r c778e1b632af suites/libvirt-cim/cimtest/ResourcePool/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Thu May 15 06:33:07 2008 -0700 @@ -141,7 +141,7 @@ def main(): return FAIL status = verify_fields(pool_list, netpool, get_typed_class(virt, np_cn)) - cleanup_restore() + cleanup_restore(ip, virt) return status if __name__ == "__main__": diff -r fa608cfd2be3 -r c778e1b632af suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Thu May 15 06:07:17 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Thu May 15 06:33:07 2008 -0700 @@ -109,7 +109,7 @@ def main(): if not ret: logger.error("Failed to create the Virtual Network '%s'", test_network) - cleanup_restore() + cleanup_restore(ip, virt) return SKIP netid = "%s/%s" % ("NetworkPool", test_network) @@ -124,16 +124,16 @@ def main(): ret_value = err_invalid_instid_keyname(conn, cn, instid) if ret_value != PASS: logger.error("------ FAILED: Invalid InstanceID Key Name.------") - cleanup_restore() + cleanup_restore(ip, virt) return ret_value ret_value = err_invalid_instid_keyvalue(conn, cn) if ret_value != PASS: logger.error("------ FAILED: Invalid InstanceID Key Value.------") - cleanup_restore() + cleanup_restore(ip, virt) return ret_value - cleanup_restore() + cleanup_restore(ip, virt) return PASS if __name__ == "__main__":

2 1

[PATCH] Add interop mofs to pkgdata_DATA
by Jim Fehlig 19 May '08

19 May '08

# HG changeset patch # User Jim Fehlig <jfehlig(a)novell.com> # Date 1210975875 21600 # Node ID 16f34df87c5b344961bbb9d16721c91081e9b7f2 # Parent b9ddfef54aa7b51515efea27b95faf00edc5ace7 Add interop mofs to pkgdata_DATA ReferencedProfile.mof was not being included in pkgdata_DATA since it is only listed in INTEROP_MOFS. Signed-off-by: Jim Fehlig <jfehlig(a)novell.com> diff -r b9ddfef54aa7 -r 16f34df87c5b Makefile.am --- a/Makefile.am Mon May 12 16:11:58 2008 -0700 +++ b/Makefile.am Fri May 16 16:11:15 2008 -0600 @@ -95,7 +95,7 @@ INTEROP_REGS = \ schema/ElementConformsToProfile.registration \ schema/ReferencedProfile.registration -pkgdata_DATA = $(MOFS) $(REGS) $(INTEROP_REGS) +pkgdata_DATA = $(MOFS) $(REGS) $(INTEROP_MOFS) $(INTEROP_REGS) pkgdata_SCRIPTS = provider-register.sh EXTRA_DIST = schema $(pkgdata_DATA) $(pkgdata_SCRIPTS) \

2 1

[PATCH] [TEST]Fixing 01_forward.py tc to incorporate the AC-to-Pool association with EC
by Deepti B. Kalakeri 19 May '08

19 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211189852 25200 # Node ID edb58c44c9ce3be425fceda5a67af18cf5243ce8 # Parent a8dbad0a9854623167932386e4bae8a737b46672 [TEST]Fixing 01_forward.py tc to incorporate the AC-to-Pool association with EC. Tested with KVM, XenFV, Xen with latest and rpm libvirt-cim. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r a8dbad0a9854 -r edb58c44c9ce suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Thu May 15 04:51:47 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Mon May 19 02:37:32 2008 -0700 @@ -27,69 +27,106 @@ from XenKvmLib import hostsystem from XenKvmLib import hostsystem from XenKvmLib.classes import get_typed_class from CimTest import Globals -from CimTest.Globals import do_main +from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORNAMES, \ +CIM_ERROR_ENUMERATE from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.const import CIM_REV +from XenKvmLib.enumclass import enumerate sup_types = ['Xen', 'XenFV', 'KVM'] +ac_to_pool_version = 561 + +def append_to_list(server, virt, poolname, valid_elc_id): + keys_list = ['InstanceID'] + pool_list = enumerate(server, poolname, keys_list, virt) + if len(pool_list) > 0: + for pool in pool_list: + valid_elc_id.append(pool.InstanceID) + return valid_elc_id + +def set_pool_info(server, virt, valid_elc_id): + try: + valid_elc_id = append_to_list(server, virt, "DiskPool", valid_elc_id) + valid_elc_id = append_to_list(server, virt, "MemoryPool", valid_elc_id) + valid_elc_id = append_to_list(server, virt, "ProcessorPool", valid_elc_id) + valid_elc_id = append_to_list(server, virt, "NetworkPool", valid_elc_id) + except Exception, details: + logger.error("Exception: In fn set_pool_info(): %s", details) + return FAIL, valid_elc_id + + return PASS, valid_elc_id + @do_main(sup_types) def main(): options = main.options + server = options.ip + virt = options.virt try: - host_sys = hostsystem.enumerate(options.ip, options.virt)[0] + host_sys = hostsystem.enumerate(server, virt)[0] except Exception: - Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, get_typed_class(options.virt, 'HostSystem')) + logger.error(CIM_ERROR_ENUMERATE, get_typed_class(virt, 'HostSystem')) return FAIL try: - elc = assoc.AssociatorNames(options.ip, + elc = assoc.AssociatorNames(server, "ElementCapabilities", "HostSystem", - options.virt, + virt, Name = host_sys.Name, CreationClassName = host_sys.CreationClassName) except Exception: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % host_sys.Name) + logger.error(CIM_ERROR_ASSOCIATORNAMES % host_sys.Name) return FAIL - valid_elc_name = [get_typed_class(options.virt, "VirtualSystemManagementCapabilities"), - get_typed_class(options.virt, "VirtualSystemMigrationCapabilities")] + valid_elc_name = [get_typed_class(virt, "VirtualSystemManagementCapabilities"), + get_typed_class(virt, "VirtualSystemMigrationCapabilities")] + valid_elc_id = ["ManagementCapabilities", "MigrationCapabilities"] + if CIM_REV >= ac_to_pool_version: + valid_elc_name.append(get_typed_class(virt, "AllocationCapabilities")) + status, valid_elc_id = set_pool_info(server, virt, valid_elc_id) + if status != PASS: + return status + if len(elc) == 0: - Globals.logger.error("ElementCapabilities association failed, excepted at least one instance") + logger.error("ElementCapabilities association failed, excepted at least one instance") return FAIL - for i in range(0,len(elc)): - if elc[i].classname not in valid_elc_name: - Globals.logger.error("ElementCapabilities association classname error") + + for i in elc: + if i.classname not in valid_elc_name: + logger.error("ElementCapabilities association classname error") return FAIL - elif elc[i].keybindings['InstanceID'] not in valid_elc_id: - Globals.logger.error("ElementCapabilities association InstanceID error") + if i['InstanceID'] not in valid_elc_id: + logger.error("ElementCapabilities association InstanceID error ") return FAIL - - cs = live.domain_list(options.ip, options.virt) + cs = live.domain_list(server, virt) + ccn = get_typed_class(virt, "ComputerSystem") for system in cs: try: - elec = assoc.AssociatorNames(options.ip, + elec = assoc.AssociatorNames(server, "ElementCapabilities", "ComputerSystem", - options.virt, + virt, Name = system, - CreationClassName = get_typed_class(options.virt, "ComputerSystem")) + CreationClassName = ccn) except Exception: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % system) + logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % system) return FAIL - - if elec[0].classname != get_typed_class(options.virt, "EnabledLogicalElementCapabilities"): - Globals.logger.error("ElementCapabilities association classname error") + cn = get_typed_class(virt, "EnabledLogicalElementCapabilities") + if elec[0].classname != cn: + logger.error("ElementCapabilities association classname error") return FAIL elif elec[0].keybindings['InstanceID'] != system: - Globals.logger.error("ElementCapabilities association InstanceID error") + logger.error("ElementCapabilities association InstanceID error") return FAIL + + return PASS if __name__ == "__main__": sys.exit(main())

1 0

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

19 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-139 =================== FAIL =========================================== ComputerSystemIndication - 01_created_indication.py: FAIL ElementConforms - 02_reverse.py: FAIL ElementSettingData - 03_esd_assoc_with_rasd_errs.py: FAIL NetworkPort - 03_user_netport.py: FAIL SettingsDefine - 02_reverse.py: FAIL VirtualSystemManagementService - 06_addresource.py: FAIL ========FULL CIMTEST REPORT=PASS(96)=FAIL(6)=SKIP(18)=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: FAIL 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: 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: 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] [TEST] 2# Adding create_diskpool() function
by Deepti B. Kalakeri 19 May '08

19 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1210856720 25200 # Node ID 3c476a21c4b4f95f5ff783a199a6feab9d9c66b1 # Parent a8dbad0a9854623167932386e4bae8a737b46672 [TEST] 2# Adding create_diskpool() function. Modified vxml to get the poolname and networkname . To create the storage pool on machine with libvirt >= 0.4.1 Addressed the review comment. Added logic to skip the removal of the diskconf file when libvirt >= 0.4.1 and CIM_REV > 558. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r a8dbad0a9854 -r 3c476a21c4b4 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Thu May 15 04:51:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Thu May 15 06:05:20 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 @@ -265,12 +268,20 @@ def conf_file(): return status -def cleanup_restore(): +def cleanup_restore(server, virt): """ Restoring back the original diskpool.conf file. """ status = PASS + libvirt_version = virsh_version(server, virt) + # The conf file is not present on the machine if + # libvirt_version >= 0.4.1 and CIM_REV > 558 + # Hence Skipping the logic to delete the new conf file + # and just returning PASS + if libvirt_version >= '0.4.1' and \ + CIM_REV > diskpoolconf_rev: + return status try: if os.path.exists(back_disk_file): os.remove(disk_file) @@ -294,3 +305,57 @@ def create_diskpool_file(): return conf_file() +def create_diskpool(server, virt='KVM'): + status = PASS + dpoolname = None + 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 + else: + 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 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 + test_network = None + 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 + else: + 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

3 3

[PATCH] [TEST] Adding missing xml_get_netpool_name() and xml_get_diskpool_name() function
by Deepti B. Kalakeri 19 May '08

19 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211170937 -19800 # Node ID 0555fb6ce718280349929a31724301e3b923abf9 # Parent a8dbad0a9854623167932386e4bae8a737b46672 [TEST] Adding missing xml_get_netpool_name() and xml_get_diskpool_name() function. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r a8dbad0a9854 -r 0555fb6ce718 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Thu May 15 04:51:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon May 19 09:52:17 2008 +0530 @@ -213,6 +213,11 @@ 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, @@ -235,6 +240,11 @@ 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"""

1 0

[PATCH] Verify migration type is supported VSMigrationService
by Kaitlin Rupert 16 May '08

16 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1210899399 25200 # Node ID 0455d746cfe9a3da08144d8e9c309de2e4ee6a3b # Parent b9ddfef54aa7b51515efea27b95faf00edc5ace7 Verify migration type is supported VSMigrationService. The check call doesn't verify that type supplied is one of the values we support. Also, allow for NULL in get_migration_type(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r b9ddfef54aa7 -r 0455d746cfe9 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Mon May 12 16:11:58 2008 -0700 +++ b/src/Virt_VSMigrationService.c Thu May 15 17:56:39 2008 -0700 @@ -109,14 +109,24 @@ uint16_t *type) { CMPIStatus s = {CMPI_RC_OK, NULL}; - int ret; + uint16_t _type; - ret = cu_get_u16_prop(msd, "MigrationType", type); - if (ret != CMPI_RC_OK) { + if (cu_get_u16_prop(msd, "MigrationType", &_type) != CMPI_RC_OK) { CU_DEBUG("Using default MigrationType: %d", CIM_MIGRATE_LIVE); - *type = CIM_MIGRATE_LIVE; + _type = CIM_MIGRATE_LIVE; } + if ((_type < CIM_MIGRATE_OTHER) || (_type > CIM_MIGRATE_RESTART)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported migration type %d", _type); + goto out; + } + + if (type != NULL) + *type = _type; + + out: return s; } @@ -543,7 +553,6 @@ virConnectPtr dconn = NULL; uint32_t retcode = CIM_SVPC_RETURN_COMPLETED; CMPIBoolean isMigratable = 0; - uint16_t type; virDomainPtr dom = NULL; CMPIInstance *dominst; const char *domain; @@ -556,7 +565,7 @@ goto out; } - s = get_msd_values(ref, destination, argsin, &type, &dconn); + s = get_msd_values(ref, destination, argsin, NULL, &dconn); if (s.rc != CMPI_RC_OK) goto out;

1 0

[PATCH] [TEST] #3 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 1210856837 25200 # Node ID fa608cfd2be35b4170e14620253f95a9b0e016ed # Parent 3c476a21c4b4f95f5ff783a199a6feab9d9c66b1 [TEST] #3 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. Update the cleanup_restore() function parameters. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 3c476a21c4b4 -r fa608cfd2be3 suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Thu May 15 06:05:20 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefineCapabilities/01_forward.py Thu May 15 06:07:17 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 @@ -86,7 +83,7 @@ def get_or_bail(virt, ip, id, pool_class except Exception, detail: logger.error(CIM_ERROR_GETINSTANCE, '%s' % pool_class) logger.error("Exception: %s", detail) - cleanup_restore() + cleanup_restore(ip, virt) sys.exit(FAIL) return instance @@ -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,19 +217,14 @@ 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: - cleanup_restore() + cleanup_restore(server, virt) return FAIL status = verify_sdc_with_ac(virt, server, dpool, npool, mpool, ppool) - cleanup_restore() + cleanup_restore(server, virt) return status if __name__ == "__main__":

1 0