- CIM - libvirt List Archives

[PATCH 0 of 3] (#3) Add support for booting on multiple devices and for boot order
by Richard Maciel 05 Jun '09

05 Jun '09

1 3

[PATCH 0 of 3] (#2) Add support for booting on multiple devices and for boot order
by Richard Maciel 04 Jun '09

04 Jun '09

2 4

Test Run Summary (Jun 04 2009): KVM on Fedora release 10.90 (Rawhide) with Pegasus
by Kaitlin Rupert 04 Jun '09

04 Jun '09

================================================= Test Run Summary (Jun 04 2009): KVM on Fedora release 10.90 (Rawhide) with Pegasus ================================================= Distro: Fedora release 10.90 (Rawhide) Kernel: 2.6.29-0.24.rc0.git13.fc11.x86_64 libvirt: 0.6.3 Hypervisor: QEMU 0.10.1 CIMOM: Pegasus 2.7.2 Libvirt-cim revision: 887 Libvirt-cim changeset: 849171d2fbc0 Cimtest revision: 700 Cimtest changeset: e5c8b6f156bb ================================================= FAIL : 7 XFAIL : 3 SKIP : 9 PASS : 139 ----------------- Total : 158 ================================================= FAIL Test Summary: HostSystem - 03_hs_to_settdefcap.py: FAIL RASD - 05_disk_rasd_emu_type.py: FAIL RASD - 07_parent_disk_pool.py: FAIL RedirectionService - 01_enum_crs.py: FAIL ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL SettingsDefineCapabilities - 01_forward.py: FAIL SystemDevice - 01_forward.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 33_suspend_reboot.py: XFAIL VirtualSystemManagementService - 09_procrasd_persist.py: XFAIL VirtualSystemManagementService - 16_removeresource.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP LogicalDisk - 02_nodevs.py: SKIP VSSD - 02_bootldr.py: SKIP VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationService - 06_remote_live_migration.py: SKIP VirtualSystemMigrationService - 07_remote_offline_migration.py: SKIP VirtualSystemMigrationService - 08_remote_restart_resume_migration.py: SKIP ================================================= Full report: -------------------------------------------------------------------- AllocationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- AllocationCapabilities - 02_alloccap_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 01_enum.py: PASS -------------------------------------------------------------------- ComputerSystem - 02_nosystems.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- ComputerSystem - 03_defineVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 04_defineStartVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 05_activate_defined_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 06_paused_active_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 22_define_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 23_pause_pause.py: PASS -------------------------------------------------------------------- ComputerSystem - 27_define_pause_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 32_start_reboot.py: PASS -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: XFAIL ERROR - Got CIM error CIM_ERR_NOT_SUPPORTED: State not supported with return code 7 ERROR - Exception: Unable Suspend dom 'test_domain' InvokeMethod(RequestStateChange): CIM_ERR_NOT_SUPPORTED: State not supported Bug:<00012> -------------------------------------------------------------------- ComputerSystem - 35_start_reset.py: PASS -------------------------------------------------------------------- ComputerSystem - 40_RSC_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 41_cs_to_settingdefinestate.py: PASS -------------------------------------------------------------------- ComputerSystem - 42_cs_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystemIndication - 01_created_indication.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - 'KVM_SettingsDefineCapabilities' returned 8 RASD objects instead of 4 CIM_ERR_INVALID_CLASS: Linux_ComputerSystem -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: PASS -------------------------------------------------------------------- HostSystem - 05_hs_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 06_hs_to_vsms.py: PASS -------------------------------------------------------------------- HostedAccessPoint - 01_forward.py: PASS -------------------------------------------------------------------- HostedAccessPoint - 02_reverse.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 -------------------------------------------------------------------- KVMRedirectionSAP - 01_enum_KVMredSAP.py: PASS -------------------------------------------------------------------- LogicalDisk - 01_disk.py: PASS -------------------------------------------------------------------- LogicalDisk - 02_nodevs.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- Profile - 03_rprofile_gi_errs.py: PASS -------------------------------------------------------------------- RASD - 01_verify_rasd_fields.py: PASS -------------------------------------------------------------------- RASD - 02_enum.py: PASS -------------------------------------------------------------------- RASD - 03_rasd_errs.py: PASS -------------------------------------------------------------------- RASD - 04_disk_rasd_size.py: PASS -------------------------------------------------------------------- RASD - 05_disk_rasd_emu_type.py: FAIL ERROR - Exception: EmulatedType Mismatch: got 0,expected 1 -------------------------------------------------------------------- RASD - 06_parent_net_pool.py: PASS -------------------------------------------------------------------- RASD - 07_parent_disk_pool.py: FAIL 07_parent_disk_pool.py:47: DeprecationWarning: the sets module is deprecated from sets import Set ERROR - Exception details: Got 5 recs instead of 3 -------------------------------------------------------------------- RedirectionService - 01_enum_crs.py: FAIL 01_enum_crs.py:29: DeprecationWarning: the sets module is deprecated from sets import Set ERROR - TypeError : __call__() takes exactly 1 argument (2 given) Traceback (most recent call last): File "./lib/XenKvmLib/const.py", line 139, in do_try File "01_enum_crs.py", line 108, in main if res_val != exp_val: TypeError: __call__() takes exactly 1 argument (2 given) ERROR - None CIM_ERR_INVALID_CLASS: Linux_ComputerSystem -------------------------------------------------------------------- RedirectionService - 02_enum_crscap.py: PASS -------------------------------------------------------------------- RedirectionService - 03_RedirectionSAP_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: FAIL ERROR - Exception in create_pool() ERROR - Exception details: (1, u'CIM_ERR_FAILED: Pool with that name already exists') ERROR - Error in networkpool creation InvokeMethod(CreateChildResourcePool): CIM_ERR_FAILED: Pool with that name already exists -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 08_CreateDiskResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 09_DeleteDiskPool.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 01_forward.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 02_reverse.py: PASS -------------------------------------------------------------------- ServiceAffectsElement - 01_forward.py: PASS -------------------------------------------------------------------- ServiceAffectsElement - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefine - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 03_sds_fwd_errs.py: PASS -------------------------------------------------------------------- SettingsDefine - 04_sds_rev_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 01_forward.py: FAIL ERROR - KVM_SettingsDefineCapabilities returned 8 ResourcePool objects instead of 4 -------------------------------------------------------------------- SettingsDefineCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS -------------------------------------------------------------------- SystemDevice - 01_forward.py: FAIL 01_forward.py:29: DeprecationWarning: the sets module is deprecated from sets import Set ERROR - DeviceID mismatch ERROR - Exception Expected DeviceID: ['test_domain/0', 'test_domain/1', 'test_domain/2'] Got: [u'test_domain/0'] -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 09_procrasd_persist.py: XFAIL -------------------------------------------------------------------- VirtualSystemManagementService - 10_hv_version.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 11_define_memrasdunits.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 12_referenced_config.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 14_define_sys_disk.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 15_mod_system_settings.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 16_removeresource.py: XFAIL ERROR - 0 RASD insts for domain/mouse:ps2 CIM_ERR_NOT_FOUND: No such instance (no device domain/mouse:ps2) Bug:<00014> -------------------------------------------------------------------- VirtualSystemManagementService - 17_removeresource_neg.py: PASS -------------------------------------------------------------------- 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 -------------------------------------------------------------------- VirtualSystemMigrationService - 06_remote_live_migration.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 07_remote_offline_migration.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 08_remote_restart_resume_migration.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 01_forward.py: PASS -------------------------------------------------------------------- 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 -------------------------------------------------------------------- VirtualSystemSnapshotService - 03_create_snapshot.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS --------------------------------------------------------------------

1 0

[PATCH] Be sure libvirt error message is returned to user
by Kaitlin Rupert 03 Jun '09

03 Jun '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1243890081 25200 # Node ID d1e566c62e287c8d98dad51e0b80ec7c6c850729 # Parent ffea3e262ba257e0e3f8cfe70daac6bba5ffc118 Be sure libvirt error message is returned to user If connect_and_create() fails because libvirt fails, we don't want to overwrite the error message. Instead, we should just return. This can be tested by attempting to create a pool that will definitely fail - something like a pool where the mountpoint doesn't exist. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ffea3e262ba2 -r d1e566c62e28 src/Virt_ResourcePoolConfigurationService.c --- a/src/Virt_ResourcePoolConfigurationService.c Mon Jun 01 13:25:03 2009 -0700 +++ b/src/Virt_ResourcePoolConfigurationService.c Mon Jun 01 14:01:21 2009 -0700 @@ -455,6 +455,9 @@ CU_DEBUG("Pool XML:\n%s", xml); inst = connect_and_create(xml, reference, full_id, pool->type, &s); + if (s.rc != CMPI_RC_OK) + goto out; + if (inst == NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED,

2 2

[PATCH] Update SDC to return template DiskPoolRASDs for disk and iscsi type pools
by Kaitlin Rupert 03 Jun '09

03 Jun '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1242695586 25200 # Node ID c127bb551eb81bfe3fe3a2ad0225d7307e4bd1ee # Parent 9ac4e06aa21334cf25b8096663dca6fea74dccd8 Update SDC to return template DiskPoolRASDs for disk and iscsi type pools Rearrange things to reduce duplicate code. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 9ac4e06aa213 -r c127bb551eb8 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Mon May 18 18:13:06 2009 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Mon May 18 18:13:06 2009 -0700 @@ -1239,11 +1239,12 @@ CMPIInstance *inst; CMPIStatus s = {CMPI_RC_OK, NULL}; const char *path = "/dev/null"; - const char *dev_path; - const char *host; - const char *src_dir; - int type[3] = {DISK_POOL_DIR, DISK_POOL_FS, DISK_POOL_NETFS}; - int pool_types = 3; + int type[5] = {DISK_POOL_DIR, + DISK_POOL_FS, + DISK_POOL_NETFS, + DISK_POOL_DISK, + DISK_POOL_ISCSI}; + int pool_types = 5; int i; switch (template_type) { @@ -1267,6 +1268,10 @@ } for (i = 0; i < pool_types; i++) { + const char *dev_path = NULL; + const char *host = NULL; + const char *src_dir = NULL; + inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_DISK, POOL_RASD); if ((inst == NULL) || (s.rc != CMPI_RC_OK)) goto out; @@ -1274,24 +1279,40 @@ CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); switch (type[i]) { + case DISK_POOL_DISK: + dev_path = "/dev/VolGroup00/LogVol100"; + + break; case DISK_POOL_FS: dev_path = "/dev/sda100"; - CMSetProperty(inst, "DevicePath", - (CMPIValue *)dev_path, CMPI_chars); + break; case DISK_POOL_NETFS: host = "host_sys.domain.com"; - CMSetProperty(inst, "Host", - (CMPIValue *)host, CMPI_chars); + src_dir = "/var/lib/images"; - src_dir = "/var/lib/images"; - CMSetProperty(inst, "SourceDirectory", - (CMPIValue *)src_dir, CMPI_chars); + break; + case DISK_POOL_ISCSI: + host = "host_sys.domain.com"; + dev_path = "iscsi-target"; + break; default: break; } + if (dev_path != NULL) + CMSetProperty(inst, "DevicePath", + (CMPIValue *)dev_path, CMPI_chars); + + if (host != NULL) + CMSetProperty(inst, "Host", + (CMPIValue *)host, CMPI_chars); + + if (src_dir != NULL) + CMSetProperty(inst, "SourceDirectory", + (CMPIValue *)src_dir, CMPI_chars); + CMSetProperty(inst, "Type", (CMPIValue *)&type[i], CMPI_uint16); CMSetProperty(inst, "Path", (CMPIValue *)path, CMPI_chars);

2 1

[PATCH 0 of 3] Add support for booting on multiple devices and for boot order
by Richard Maciel 03 Jun '09

03 Jun '09

2 6

[PATCH] Expose package release version in VirtualSystemManagementService
by Kaitlin Rupert 03 Jun '09

03 Jun '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1243887903 25200 # Node ID ffea3e262ba257e0e3f8cfe70daac6bba5ffc118 # Parent c127bb551eb81bfe3fe3a2ad0225d7307e4bd1ee Expose package release version in VirtualSystemManagementService The Revision and Changeset values don't always give a full picture of the provider version installed on the system. This patch adds a Reelase attribute which exposes the release version - this helps provide version baseline. Test query: wbemcli ei http://localhost/root/virt:KVM_VirtualSystemManagementService -nl You should see a "Release" attribute in the list Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c127bb551eb8 -r ffea3e262ba2 schema/VirtualSystemManagementService.mof --- a/schema/VirtualSystemManagementService.mof Mon May 18 18:13:06 2009 -0700 +++ b/schema/VirtualSystemManagementService.mof Mon Jun 01 13:25:03 2009 -0700 @@ -8,6 +8,9 @@ [Description("HG revision number of the providers")] string Revision; + + [Description("Package Version")] + string Release; }; [Provider("cmpi::Virt_VirtualSystemManagementService")] @@ -18,6 +21,9 @@ [Description("HG revision number of the providers")] string Revision; + + [Description("Package Version")] + string Release; }; [Provider("cmpi::Virt_VirtualSystemManagementService")] @@ -28,4 +34,7 @@ [Description("HG revision number of the providers")] string Revision; + + [Description("Package Version")] + string Release; }; diff -r c127bb551eb8 -r ffea3e262ba2 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon May 18 18:13:06 2009 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Jun 01 13:25:03 2009 -0700 @@ -2248,6 +2248,9 @@ CMSetProperty(inst, "Revision", (CMPIValue *)LIBVIRT_CIM_RV, CMPI_chars); + CMSetProperty(inst, "Release", + (CMPIValue *)PACKAGE_VERSION, CMPI_chars); + if (is_get_inst) { s = cu_validate_ref(broker, reference, inst); if (s.rc != CMPI_RC_OK)

2 1

[PATCH] [CU] Add support to read/write array of strings to properties which expect them
by Richard Maciel 03 Jun '09

03 Jun '09

# HG changeset patch # User Richard Maciel <rmaciel(a)linux.vnet.ibm.com> # Date 1243950914 10800 # Node ID 639fb266e1e6d657ba5a7c52c5acd2dc7d4ccb66 # Parent 1cb3975921d590d4dda4de197a4dc687e45d1840 [CU] Add support to read/write array of strings to properties which expect them. The lexer and the parser were changed recognize array strings and properly handle it to the provider which called the lexer/parser Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com> diff -r 1cb3975921d5 -r 639fb266e1e6 eo_parser.c --- a/eo_parser.c Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_parser.c Tue Jun 02 10:55:14 2009 -0300 @@ -169,6 +169,29 @@ return CMPI_sint8; } +inline CMPIStatus ins_chars_into_cmstr_arr(const CMPIBroker *broker, + CMPIArray *arr, + CMPICount index, + char *str) +{ + CMPIString *cm_str; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + cm_str = CMNewString(broker, str, &s); + if (s.rc != CMPI_RC_OK || CMIsNullObject(cm_str)) { + CU_DEBUG("Error creating CMPIString"); + goto out; + } + + s = CMSetArrayElementAt(arr, index, &cm_str, CMPI_string); + if (s.rc != CMPI_RC_OK) + CU_DEBUG("Error setting array element %u\n" + "Error code: %d", index, s.rc); + + out: + return s; +} + /* * Local Variables: * mode: C diff -r 1cb3975921d5 -r 639fb266e1e6 eo_parser_xml.h --- a/eo_parser_xml.h Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_parser_xml.h Tue Jun 02 10:55:14 2009 -0300 @@ -31,6 +31,11 @@ char *prop, CMPIInstance *inst); +inline CMPIStatus ins_chars_into_cmstr_arr(const CMPIBroker *broker, + CMPIArray *arr, + CMPICount index, + char *str); + #endif /* diff -r 1cb3975921d5 -r 639fb266e1e6 eo_util_lexer.l --- a/eo_util_lexer.l Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_util_lexer.l Tue Jun 02 10:55:14 2009 -0300 @@ -4,6 +4,7 @@ * Authors: * Gareth Bestor <bestorga(a)us.ibm.com> * Dan Smith <danms(a)us.ibm.com> + * Richard Maciel <richardm(a)br.ibm.com> * */ /*** WARNING - COMMENTS IN LEX MUST BE TAB INDENTED ***/ @@ -91,7 +92,18 @@ return(STRING); } - /* Classname */ +\{ { + return(OPENBRACKET); + } + +\} { + return(CLOSEBRACKET); + } + +\, { + return(COMMA); + } + /* NOTE - this rule only applies after a 'INSTANCE OF' has been read in */ <READCLASSNAME>[A-Za-z][A-Za-z0-9_]* { BEGIN INITIAL; /* Go back to normal parsing rules now */ diff -r 1cb3975921d5 -r 639fb266e1e6 eo_util_parser.y --- a/eo_util_parser.y Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_util_parser.y Tue Jun 02 10:55:14 2009 -0300 @@ -4,6 +4,7 @@ * Authors: * Gareth Bestor <bestorga(a)us.ibm.com> * Dan Smith <danms(a)us.ibm.com> + * Richard Maciel <richardm(a)br.ibm.com> */ /* DEFINITIONS SECTION */ @@ -29,6 +30,10 @@ static const CMPIBroker * _BROKER; static CMPIInstance ** _INSTANCE; static const char * _NAMESPACE; +static CMPICount stringarraysize; +static char **stringarray; +static char *stringarraypropname; + #ifdef EODEBUG #define EOTRACE(fmt, arg...) fprintf(stderr, fmt, ##arg) @@ -36,6 +41,7 @@ #define EOTRACE(fmt, arg...) #endif + int eo_parse_parseinstance(const CMPIBroker *broker, CMPIInstance **instance, const char *ns); @@ -52,7 +58,7 @@ } /* Define simple (untyped) lexical tokens */ -%token INSTANCE OF ENDOFFILE +%token INSTANCE OF ENDOFFILE OPENBRACKET CLOSEBRACKET COMMA /* Define lexical tokens that return a value and their return type */ %token <string> CLASS @@ -67,7 +73,7 @@ /* Rules section */ instance: /* empty */ - | INSTANCE OF CLASS '{' + | INSTANCE OF CLASS OPENBRACKET { EOTRACE("classname = %s\n",$3); CMPIObjectPath *op; @@ -82,7 +88,7 @@ return RC_INVALID_CLASS; free($3); } - properties '}' ';' + properties CLOSEBRACKET ';' { /* Return after reading in each instance */ return RC_OK; @@ -127,7 +133,17 @@ CMSetProperty(*_INSTANCE, $1, &($3), CMPI_boolean); free($1); } + | PROPERTYNAME '=' OPENBRACKET + { + EOTRACE("propertyname = %s\n" + "\ttype = CMPI_charsA\n", + $1); + stringarraysize = 0; + stringarraypropname = $1; + } + arrayofstrings CLOSEBRACKET ';' + | PROPERTYNAME '=' CIMNULL ';' { EOTRACE("propertyname = %s\n" @@ -136,6 +152,80 @@ } ; +arrayofstrings: STRING + { + EOTRACE("\t%s[%u]=%s\n", + propertyname, + stringarraysize, + $1); + + stringarraysize++; + stringarray = (char **)realloc(stringarray, + sizeof(char *) * + stringarraysize); + stringarray[stringarraysize-1] = $1; + } + COMMA arrayofstrings + + + | STRING + { + CMPIArray *arr; + CMPICount i; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + EOTRACE("\t%s[%u]=%s\n", + propertyname, + stringarraysize, + $1); + + stringarraysize++; + + arr = CMNewArray(_BROKER, + stringarraysize, + CMPI_string, + &s); + if (s.rc != CMPI_RC_OK || CMIsNullObject(arr)) { + EOTRACE("Error creating array\n"); + goto str_arr_out; + } + + // Values to stringarraysize - 2 are in the + // temporary array + for (i = 0; i < stringarraysize - 1; i++) { + s = ins_chars_into_cmstr_arr(_BROKER, + arr, + i, + stringarray[i]); + if (s.rc != CMPI_RC_OK) + goto str_arr_out; + } + + s = ins_chars_into_cmstr_arr(_BROKER, + arr, + stringarraysize - 1, + $1); + if (s.rc != CMPI_RC_OK) + goto str_arr_out; + + CMSetProperty(*_INSTANCE, + stringarraypropname, + &arr, + CMPI_stringA); + + str_arr_out: + free(stringarraypropname); + for (i = 0; i < stringarraysize - 1; i++) + free(stringarray[i]); + free($1); + + if (s.rc != CMPI_RC_OK) { + return RC_INVALID_CLASS; + } + + } + ; + /* END OF RULES SECTION */ %%

2 1

[PATCH] [TEST] Fixing the RPCS/04 tc
by Deepti B. Kalakeri 03 Jun '09

03 Jun '09

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1244038300 25200 # Node ID f2bbb86e5fec3ffe80b3716dc40e242aec3b0746 # Parent 7e1e9ac3a390df22b3fbd8f8c760dd13e41aff88 [TEST] Fixing the RPCS/04 tc Tested on F10 with KVM and current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 7e1e9ac3a390 -r f2bbb86e5fec suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Mon Jun 01 02:27:59 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Wed Jun 03 07:11:40 2009 -0700 @@ -98,6 +98,11 @@ logger.error("Unable to destroy networkpool %s", test_pool) return status + status = undefine_netpool(options.ip, options.virt, test_pool) + if status != PASS: + logger.error("Unable to undefine networkpool %s", test_pool) + return status + status = PASS return status

1 0

[PATCH] [CU] (#2) Add support to read/write array of strings to properties which expect them
by Richard Maciel 03 Jun '09

03 Jun '09

# HG changeset patch # User Richard Maciel <rmaciel(a)linux.vnet.ibm.com> # Date 1243950914 10800 # Node ID 0cbdf0dcd41651b7a4e6f1844bf567ced1106225 # Parent 1cb3975921d590d4dda4de197a4dc687e45d1840 [CU] (#2) Add support to read/write array of strings to properties which expect them. The lexer and the parser were changed recognize array strings and properly handle it to the provider which called the lexer/parser #2: - Parser now returns a specific error message when it cannot set a string array property Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com> diff -r 1cb3975921d5 -r 0cbdf0dcd416 eo_parser.c --- a/eo_parser.c Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_parser.c Tue Jun 02 10:55:14 2009 -0300 @@ -169,6 +169,29 @@ return CMPI_sint8; } +inline CMPIStatus ins_chars_into_cmstr_arr(const CMPIBroker *broker, + CMPIArray *arr, + CMPICount index, + char *str) +{ + CMPIString *cm_str; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + cm_str = CMNewString(broker, str, &s); + if (s.rc != CMPI_RC_OK || CMIsNullObject(cm_str)) { + CU_DEBUG("Error creating CMPIString"); + goto out; + } + + s = CMSetArrayElementAt(arr, index, &cm_str, CMPI_string); + if (s.rc != CMPI_RC_OK) + CU_DEBUG("Error setting array element %u\n" + "Error code: %d", index, s.rc); + + out: + return s; +} + /* * Local Variables: * mode: C diff -r 1cb3975921d5 -r 0cbdf0dcd416 eo_parser_xml.h --- a/eo_parser_xml.h Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_parser_xml.h Tue Jun 02 10:55:14 2009 -0300 @@ -31,6 +31,11 @@ char *prop, CMPIInstance *inst); +inline CMPIStatus ins_chars_into_cmstr_arr(const CMPIBroker *broker, + CMPIArray *arr, + CMPICount index, + char *str); + #endif /* diff -r 1cb3975921d5 -r 0cbdf0dcd416 eo_util_lexer.l --- a/eo_util_lexer.l Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_util_lexer.l Tue Jun 02 10:55:14 2009 -0300 @@ -4,6 +4,7 @@ * Authors: * Gareth Bestor <bestorga(a)us.ibm.com> * Dan Smith <danms(a)us.ibm.com> + * Richard Maciel <richardm(a)br.ibm.com> * */ /*** WARNING - COMMENTS IN LEX MUST BE TAB INDENTED ***/ @@ -91,7 +92,18 @@ return(STRING); } - /* Classname */ +\{ { + return(OPENBRACKET); + } + +\} { + return(CLOSEBRACKET); + } + +\, { + return(COMMA); + } + /* NOTE - this rule only applies after a 'INSTANCE OF' has been read in */ <READCLASSNAME>[A-Za-z][A-Za-z0-9_]* { BEGIN INITIAL; /* Go back to normal parsing rules now */ diff -r 1cb3975921d5 -r 0cbdf0dcd416 eo_util_parser.y --- a/eo_util_parser.y Mon Apr 27 16:11:32 2009 -0700 +++ b/eo_util_parser.y Tue Jun 02 10:55:14 2009 -0300 @@ -4,6 +4,7 @@ * Authors: * Gareth Bestor <bestorga(a)us.ibm.com> * Dan Smith <danms(a)us.ibm.com> + * Richard Maciel <richardm(a)br.ibm.com> */ /* DEFINITIONS SECTION */ @@ -24,11 +25,16 @@ #define RC_OK 0 #define RC_EOF EOF #define RC_INVALID_CLASS -1000 +#define RC_ARR_CREAT_FAILED -2000 /* DEFINE ANY GLOBAL VARS HERE */ static const CMPIBroker * _BROKER; static CMPIInstance ** _INSTANCE; static const char * _NAMESPACE; +static CMPICount stringarraysize; +static char **stringarray; +static char *stringarraypropname; + #ifdef EODEBUG #define EOTRACE(fmt, arg...) fprintf(stderr, fmt, ##arg) @@ -36,6 +42,7 @@ #define EOTRACE(fmt, arg...) #endif + int eo_parse_parseinstance(const CMPIBroker *broker, CMPIInstance **instance, const char *ns); @@ -52,7 +59,7 @@ } /* Define simple (untyped) lexical tokens */ -%token INSTANCE OF ENDOFFILE +%token INSTANCE OF ENDOFFILE OPENBRACKET CLOSEBRACKET COMMA /* Define lexical tokens that return a value and their return type */ %token <string> CLASS @@ -67,7 +74,7 @@ /* Rules section */ instance: /* empty */ - | INSTANCE OF CLASS '{' + | INSTANCE OF CLASS OPENBRACKET { EOTRACE("classname = %s\n",$3); CMPIObjectPath *op; @@ -82,7 +89,7 @@ return RC_INVALID_CLASS; free($3); } - properties '}' ';' + properties CLOSEBRACKET ';' { /* Return after reading in each instance */ return RC_OK; @@ -127,7 +134,17 @@ CMSetProperty(*_INSTANCE, $1, &($3), CMPI_boolean); free($1); } + | PROPERTYNAME '=' OPENBRACKET + { + EOTRACE("propertyname = %s\n" + "\ttype = CMPI_charsA\n", + $1); + stringarraysize = 0; + stringarraypropname = $1; + } + arrayofstrings CLOSEBRACKET ';' + | PROPERTYNAME '=' CIMNULL ';' { EOTRACE("propertyname = %s\n" @@ -136,6 +153,80 @@ } ; +arrayofstrings: STRING + { + EOTRACE("\t%s[%u]=%s\n", + propertyname, + stringarraysize, + $1); + + stringarraysize++; + stringarray = (char **)realloc(stringarray, + sizeof(char *) * + stringarraysize); + stringarray[stringarraysize-1] = $1; + } + COMMA arrayofstrings + + + | STRING + { + CMPIArray *arr; + CMPICount i; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + EOTRACE("\t%s[%u]=%s\n", + propertyname, + stringarraysize, + $1); + + stringarraysize++; + + arr = CMNewArray(_BROKER, + stringarraysize, + CMPI_string, + &s); + if (s.rc != CMPI_RC_OK || CMIsNullObject(arr)) { + EOTRACE("Error creating array\n"); + goto str_arr_out; + } + + // Values to stringarraysize - 2 are in the + // temporary array + for (i = 0; i < stringarraysize - 1; i++) { + s = ins_chars_into_cmstr_arr(_BROKER, + arr, + i, + stringarray[i]); + if (s.rc != CMPI_RC_OK) + goto str_arr_out; + } + + s = ins_chars_into_cmstr_arr(_BROKER, + arr, + stringarraysize - 1, + $1); + if (s.rc != CMPI_RC_OK) + goto str_arr_out; + + CMSetProperty(*_INSTANCE, + stringarraypropname, + &arr, + CMPI_stringA); + + str_arr_out: + free(stringarraypropname); + for (i = 0; i < stringarraysize - 1; i++) + free(stringarray[i]); + free($1); + + if (s.rc != CMPI_RC_OK) { + return RC_ARR_CREAT_FAILED; + } + + } + ; + /* END OF RULES SECTION */ %%

1 0