- CIM - libvirt List Archives

[PATCH] Fixed Storage Volume RASD template path
by Richard Maciel 11 Sep '09

11 Sep '09

# HG changeset patch # User Richard Maciel <rmaciel(a)linux.vnet.ibm.com> # Date 1252693562 10800 # Node ID 53acca5af901b37e1818c161ca00ff3b937b910c # Parent 697757e558c1f6fde30288d762fd86a4dabdc8f8 Fixed Storage Volume RASD template path Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com> diff -r 697757e558c1 -r 53acca5af901 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Fri Sep 04 14:12:46 2009 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Fri Sep 11 15:26:02 2009 -0300 @@ -1089,7 +1089,7 @@ name = "tmp.img"; CMSetProperty(inst, "VolumeName", (CMPIValue *)name, CMPI_chars); - path = "/var/lib/libvirt/images/"; + path = pool->pool_info.disk.path; CMSetProperty(inst, "Path", (CMPIValue *)path, CMPI_chars); alloc = 0;

1 0

[PATCH 0 of 6] Add support for resource indication provider.
by Sharad Mishra 11 Sep '09

11 Sep '09

Add support for resource indication provider. This provider add support for raising resource indication whenever resource (s) are created, deleted or modified. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com>

3 2

Test Run Summary (Sep 10 2009): KVM on Fedora release 11 (Leonidas) with sfcb
by Kaitlin Rupert 11 Sep '09

11 Sep '09

================================================= Test Run Summary (Sep 10 2009): KVM on Fedora release 11 (Leonidas) with sfcb ================================================= Distro: Fedora release 11 (Leonidas) Kernel: 2.6.30.5-28.rc2.fc11.x86_64 libvirt: 0.6.2 Hypervisor: QEMU 0.10.6 CIMOM: sfcb sfcbd 1.3.5preview Libvirt-cim revision: 973 Libvirt-cim changeset: 9c8eb2dfae84 Cimtest revision: 776 Cimtest changeset: 9e08670a3c37 ================================================= FAIL : 33 XFAIL : 5 SKIP : 10 PASS : 121 ----------------- Total : 169 ================================================= FAIL Test Summary: ReferencedProfile - 01_verify_refprof.py: FAIL ReferencedProfile - 02_refprofile_errs.py: FAIL ResourceAllocationFromPool - 01_forward.py: FAIL ResourceAllocationFromPool - 02_reverse.py: FAIL ResourceAllocationFromPool - 03_forward_errs.py: FAIL ResourceAllocationFromPool - 04_reverse_errs.py: FAIL ResourceAllocationFromPool - 05_RAPF_err.py: FAIL ResourcePoolConfigurationCapabilities - 01_enum.py: FAIL ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: FAIL ResourcePoolConfigurationService - 01_enum.py: FAIL ResourcePoolConfigurationService - 02_rcps_gi_errors.py: FAIL ResourcePoolConfigurationService - 03_CreateResourcePool.py: FAIL ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: FAIL ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL ResourcePoolConfigurationService - 08_CreateDiskResourcePool.py: FAIL ResourcePoolConfigurationService - 09_DeleteDiskPool.py: FAIL ResourcePoolConfigurationService - 10_create_storagevolume.py: FAIL ServiceAccessBySAP - 02_reverse.py: FAIL ServiceAffectsElement - 01_forward.py: FAIL ServiceAffectsElement - 02_reverse.py: FAIL VSSD - 03_vssd_gi_errs.py: FAIL VirtualSystemManagementCapabilities - 01_enum.py: FAIL VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: FAIL VirtualSystemMigrationCapabilities - 01_enum.py: FAIL VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: FAIL VirtualSystemMigrationSettingData - 01_enum.py: FAIL VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: FAIL VirtualSystemSnapshotService - 01_enum.py: FAIL VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: FAIL VirtualSystemSnapshotService - 03_create_snapshot.py: FAIL VirtualSystemSnapshotServiceCapabilities - 01_enum.py: FAIL VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 32_start_reboot.py: XFAIL ComputerSystem - 33_suspend_reboot.py: XFAIL ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL VirtualSystemManagementService - 16_removeresource.py: XFAIL VirtualSystemManagementService - 22_addmulti_brg_interface.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP ComputerSystemMigrationJobIndication - 01_csmig_ind_for_offline_mig.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: XFAIL ERROR - Got CIM error Unable to reboot domain: this function is not supported by the hypervisor: virDomainReboot with return code 1 ERROR - Exception: Unable reboot dom 'cs_test_domain' InvokeMethod(RequestStateChange): Unable to reboot domain: this function is not supported by the hypervisor: virDomainReboot Bug:<00005> -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: XFAIL ERROR - Got CIM error State not supported with return code 7 ERROR - Exception: Unable Suspend dom 'test_domain' InvokeMethod(RequestStateChange): State not supported Bug:<00012> -------------------------------------------------------------------- ComputerSystem - 34_start_disable.py: PASS -------------------------------------------------------------------- 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 -------------------------------------------------------------------- ComputerSystemMigrationJobIndication - 01_csmig_ind_for_offline_mig.py: SKIP -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- RASD - 06_parent_net_pool.py: PASS -------------------------------------------------------------------- RASD - 07_parent_disk_pool.py: PASS -------------------------------------------------------------------- RedirectionService - 01_enum_crs.py: PASS -------------------------------------------------------------------- RedirectionService - 02_enum_crscap.py: PASS -------------------------------------------------------------------- RedirectionService - 03_RedirectionSAP_errs.py: PASS -------------------------------------------------------------------- ReferencedProfile - 01_verify_refprof.py: FAIL ERROR - KVM_ReferencedProfile returned 0 Profiles objects, expected atleast 1 Provider not found or not loadable -------------------------------------------------------------------- ReferencedProfile - 02_refprofile_errs.py: FAIL ERROR - Unexpected rc code 6 and description Provider not found or not loadable ERROR - ------ FAILED: to verify INVALID_Instid_KeyName.------ -------------------------------------------------------------------- ResourceAllocationFromPool - 01_forward.py: FAIL ERROR - No RASD associated with GraphicsPool/0 Provider not found or not loadable -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: FAIL ERROR - No associated pool with RAFP_dom/hda Provider not found or not loadable -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: FAIL ERROR - Unexpected rc code 6 and description Provider not found or not loadable -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: FAIL ERROR - Unexpected rc code 6 and description Provider not found or not loadable -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: FAIL ERROR - Unexpected rc code 6 and description Provider not found or not loadable ERROR - ------FAILED: to verify the RAFP.------ -------------------------------------------------------------------- ResourcePool - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePool - 02_rp_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 01_enum.py: FAIL ERROR - KVM_ResourcePoolConfigurationCapabilities return 0 instances, excepted only 1 instance Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: FAIL ERROR - Unexpected errno 6 and desc Provider not found or not loadable ERROR - Expected No such instance (InstanceID) 6 ERROR - ------ FAILED: Invalid InstanceID Key Value.------ -------------------------------------------------------------------- ResourcePoolConfigurationService - 01_enum.py: FAIL ERROR - Too many service error Class not found Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 02_rcps_gi_errors.py: FAIL ERROR - No KVM_ResourcePoolConfigurationService instances returned Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 03_CreateResourcePool.py: FAIL ERROR - Unexpected rc code 6 and description Provider not found or not loadable InvokeMethod(CreateResourcePool): Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL ERROR - Exception in create_pool() ERROR - Exception details: (6, u'Provider not found or not loadable') ERROR - Error in networkpool creation InvokeMethod(CreateChildResourcePool): Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: XFAIL ERROR - Unexpected rc code 6 and description Provider not found or not loadable InvokeMethod(AddResourcesToResourcePool): Provider not found or not loadable Provider not found or not loadable Bug:<92173> -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: FAIL ERROR - Unexpected rc code 6 and description Provider not found or not loadable InvokeMethod(RemoveResourcesFromResourcePool): Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: FAIL ERROR - Exception in create_pool() ERROR - Exception details: (6, u'Provider not found or not loadable') ERROR - Error in networkpool creation InvokeMethod(CreateChildResourcePool): Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 08_CreateDiskResourcePool.py: FAIL ERROR - Exception in create_pool() ERROR - Exception details: (6, u'Provider not found or not loadable') ERROR - Exception details: Failed to create 'DISK_POOL_NETFS' type diskpool 'DISK_POOL_NETFS' InvokeMethod(CreateChildResourcePool): Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 09_DeleteDiskPool.py: FAIL ERROR - Exception in create_pool() ERROR - Exception details: (6, u'Provider not found or not loadable') ERROR - Failed to create diskpool 'dp_pool' InvokeMethod(CreateChildResourcePool): Provider not found or not loadable -------------------------------------------------------------------- ResourcePoolConfigurationService - 10_create_storagevolume.py: FAIL ERROR - Exception details: (6, u'Provider not found or not loadable') InvokeMethod(CreateResourceInPool): Provider not found or not loadable -------------------------------------------------------------------- ServiceAccessBySAP - 01_forward.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 02_reverse.py: FAIL ERROR - Association didn't return any redirection service instance Traceback (most recent call last): File "/usr/lib64/python2.6/logging/__init__.py", line 754, in emit msg = self.format(record) File "/usr/lib64/python2.6/logging/__init__.py", line 637, in format return fmt.format(record) File "/usr/lib64/python2.6/logging/__init__.py", line 425, in format record.message = record.getMessage() File "/usr/lib64/python2.6/logging/__init__.py", line 295, in getMessage msg = msg % self.args TypeError: not all arguments converted during string formatting Traceback (most recent call last): File "/usr/lib64/python2.6/logging/__init__.py", line 754, in emit msg = self.format(record) File "/usr/lib64/python2.6/logging/__init__.py", line 637, in format return fmt.format(record) File "/usr/lib64/python2.6/logging/__init__.py", line 425, in format record.message = record.getMessage() File "/usr/lib64/python2.6/logging/__init__.py", line 295, in getMessage msg = msg % self.args TypeError: not all arguments converted during string formatting Traceback (most recent call last): File "/usr/lib64/python2.6/logging/__init__.py", line 754, in emit msg = self.format(record) File "/usr/lib64/python2.6/logging/__init__.py", line 637, in format return fmt.format(record) File "/usr/lib64/python2.6/logging/__init__.py", line 425, in format record.message = record.getMessage() File "/usr/lib64/python2.6/logging/__init__.py", line 295, in getMessage msg = msg % self.args TypeError: not all arguments converted during string formatting Provider not found or not loadable -------------------------------------------------------------------- ServiceAffectsElement - 01_forward.py: FAIL 01_forward.py:51: DeprecationWarning: the sets module is deprecated from sets import Set ERROR - Exception in fn verify_assoc() ERROR - Exception details: Failed to get insts for domain SAE_dom Provider not found or not loadable -------------------------------------------------------------------- ServiceAffectsElement - 02_reverse.py: FAIL 02_reverse.py:47: DeprecationWarning: the sets module is deprecated from sets import Set ERROR - Exception : Got '0' records for 'KVM_ServiceAffectsElement' association with 'KVM_ComputerSystem',expected 1 Provider not found or not loadable -------------------------------------------------------------------- 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: 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 errno 6 and desc Provider not found or not loadable ERROR - Expected No such instance (InstanceID) 6 ERROR - ------ FAILED: Invalid InstanceID Key Value.------ -------------------------------------------------------------------- VSSD - 04_vssd_to_rasd.py: PASS -------------------------------------------------------------------- VSSD - 05_set_uuid.py: PASS -------------------------------------------------------------------- VSSD - 06_duplicate_uuid.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 01_enum.py: FAIL 01_enum.py:26: DeprecationWarning: the sets module is deprecated from sets import Set ERROR - 'KVM_VirtualSystemManagementCapabilities' returned '0' instance, excepted only 1 Provider not found or not loadable -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: FAIL ERROR - Unexpected errno 6 and desc Provider not found or not loadable ERROR - Expected No such instance (InstanceID) 6 ERROR - ------ FAILED: Invalid InstanceID Key Value.------ -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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 No such instance (no device domain/mouse:ps2) Bug:<00014> -------------------------------------------------------------------- VirtualSystemManagementService - 17_removeresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 18_define_sys_bridge.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 19_definenetwork_ers.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 20_verify_vnc_password.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 21_createVS_verifyMAC.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 22_addmulti_brg_interface.py: XFAIL ERROR - Error invoking AddRS: add_net_res ERROR - (1, u"Unable to change (0) device: this function is not supported by the hypervisor: device type 'interface' cannot be attached") ERROR - Failed to destroy Virtual Network 'my_network1' InvokeMethod(AddResourceSettings): Unable to change (0) device: this function is not supported by the hypervisor: device type 'interface' cannot be attached Bug:<00015> -------------------------------------------------------------------- VirtualSystemManagementService - 23_verify_duplicate_mac_err.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: FAIL ERROR - KVM_VirtualSystemMigrationCapabilities return 0 instances, excepted only 1 instance Provider not found or not loadable -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: FAIL ERROR - Unexpected errno 6 and desc Provider not found or not loadable ERROR - Expected No such instance (InstanceID) 6 ERROR - ------ FAILED: Invalid InstanceID Key Value.------ -------------------------------------------------------------------- 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: FAIL ERROR - KVM_VirtualSystemMigrationSettingData return 0 instances, excepted only 1 instance Provider not found or not loadable -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: FAIL ERROR - Unexpected errno 6 and desc Provider not found or not loadable ERROR - Expected No such instance (InstanceID) 6 ERROR - ------ FAILED: Invalid InstanceID Key Value.------ -------------------------------------------------------------------- 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: FAIL ERROR - KVM_VirtualSystemSnapshotService return 0 instances, excepted only 1 instance Class not found Provider not found or not loadable -------------------------------------------------------------------- VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: FAIL ERROR - list index out of range Provider not found or not loadable -------------------------------------------------------------------- VirtualSystemSnapshotService - 03_create_snapshot.py: FAIL ERROR - Exp at least one KVM_VirtualSystemSnapshotServiceCapabilities ERROR - Exception: Unable to get VSSSC instance ERROR - Failed to remove snapshot file for snapshot_vm Provider not found or not loadable -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: FAIL ERROR - KVM_VirtualSystemSnapshotServiceCapabilities return 0 instances, excepted only 1 instance Provider not found or not loadable -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: FAIL ERROR - Unexpected errno 6 and desc Provider not found or not loadable ERROR - Expected No such instance (InstanceID) 6 ERROR - ------ FAILED: Invalid InstanceID Key Value.------ --------------------------------------------------------------------

1 1

[PATCH 1 of 6] Add resource indication feature Makefile changes.
by Sharad Mishra 11 Sep '09

11 Sep '09

# HG changeset patch # User snmishra(a)us.ibm.com # Date 1252482482 25200 # Node ID cba20af2b6748dbd0bf32fad6941ae69425694dd # Parent 234141bf7f0368531c884334b1da5b94cc038758 Add resource indication feature Makefile changes. MOF and Registration files for the new indication provider were added. Changes were made to src/Makefile.am to build new resource indication provider. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 234141bf7f03 -r cba20af2b674 Makefile.am --- a/Makefile.am Thu Sep 03 12:52:47 2009 -0700 +++ b/Makefile.am Wed Sep 09 00:48:02 2009 -0700 @@ -27,6 +27,7 @@ schema/RegisteredProfile.mof \ schema/ElementConformsToProfile.mof \ schema/ComputerSystemIndication.mof \ + schema/ResourceAllocationSettingDataIndication.mof \ schema/ComputerSystemMigrationIndication.mof \ schema/Virt_ResourceAllocationSettingData.mof \ schema/ResourceAllocationSettingData.mof \ @@ -101,6 +102,7 @@ schema/DiskPool.registration \ schema/HostedResourcePool.registration \ schema/ComputerSystemIndication.registration \ + schema/ResourceAllocationSettingDataIndication.registration \ schema/ComputerSystemMigrationIndication.registration \ schema/ResourceAllocationSettingData.registration \ schema/ResourcePoolConfigurationService.registration \ diff -r 234141bf7f03 -r cba20af2b674 src/Makefile.am --- a/src/Makefile.am Thu Sep 03 12:52:47 2009 -0700 +++ b/src/Makefile.am Wed Sep 09 00:48:02 2009 -0700 @@ -48,6 +48,7 @@ libVirt_VirtualSystemSnapshotServiceCapabilities.la \ libVirt_SystemDevice.la \ libVirt_ComputerSystemIndication.la \ + libVirt_ResourceAllocationSettingDataIndication.la \ libVirt_ComputerSystemMigrationIndication.la \ libVirt_VirtualSystemManagementCapabilities.la \ libVirt_AllocationCapabilities.la \ @@ -86,6 +87,10 @@ libVirt_ComputerSystemIndication_la_SOURCES = Virt_ComputerSystemIndication.c libVirt_ComputerSystemIndication_la_LIBADD = -lVirt_ComputerSystem -lVirt_HostSystem -lpthread -lrt +libVirt_ResourceAllocationSettingDataIndication_la_DEPENDENCIES = libVirt_ComputerSystem.la +libVirt_ResourceAllocationSettingDataIndication_la_SOURCES = Virt_ResourceAllocationSettingDataIndication.c +libVirt_ResourceAllocationSettingDataIndication_la_LIBADD = -lVirt_ComputerSystem + libVirt_ComputerSystemMigrationIndication_la_DEPENDENCIES = libVirt_ComputerSystem.la libVirt_ComputerSystemMigrationIndication_la_SOURCES = Virt_ComputerSystemMigrationIndication.c libVirt_ComputerSystemMigrationIndication_la_LIBADD = -lVirt_ComputerSystem

1 0

[PATCH 2 of 6] Add resource indication mof and registration files.
by Sharad Mishra 11 Sep '09

11 Sep '09

# HG changeset patch # User snmishra(a)us.ibm.com # Date 1252482482 25200 # Node ID 639d5782a9f3f195b0ca88878ee169cc0efd0f18 # Parent cba20af2b6748dbd0bf32fad6941ae69425694dd Add resource indication mof and registration files. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r cba20af2b674 -r 639d5782a9f3 schema/ResourceAllocationSettingDataIndication.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/ResourceAllocationSettingDataIndication.mof Wed Sep 09 00:48:02 2009 -0700 @@ -0,0 +1,66 @@ +// Copyright IBM Corp. 2007 + +[Description ("Xen_ResourceAllocationSettingData created"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class Xen_ResourceAllocationSettingDataCreatedIndication : CIM_InstCreation +{ +}; + +[Description ("Xen_ResourceAllocationSettingData deleted"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class Xen_ResourceAllocationSettingDataDeletedIndication : CIM_InstDeletion +{ +}; + +[Description ("Xen_ResourceAllocationSettingData modified"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class Xen_ResourceAllocationSettingDataModifiedIndication : CIM_InstModification +{ +}; + + +[Description ("KVM_ResourceAllocationSettingData created"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class KVM_ResourceAllocationSettingDataCreatedIndication : CIM_InstCreation +{ +}; + +[Description ("KVM_ResourceAllocationSettingData deleted"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class KVM_ResourceAllocationSettingDataDeletedIndication : CIM_InstDeletion +{ +}; + +[Description ("KVM_ResourceAllocationSettingData modified"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class KVM_ResourceAllocationSettingDataModifiedIndication : CIM_InstModification +{ +}; + + +[Description ("LXC_ResourceAllocationSettingData created"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class LXC_ResourceAllocationSettingDataCreatedIndication : CIM_InstCreation +{ +}; + +[Description ("LXC_ResourceAllocationSettingData deleted"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class LXC_ResourceAllocationSettingDataDeletedIndication : CIM_InstDeletion +{ +}; + +[Description ("LXC_ResourceAllocationSettingData modified"), + Provider("cmpi::Virt_ResourceAllocationSettingDataIndication") +] +class LXC_ResourceAllocationSettingDataModifiedIndication : CIM_InstModification +{ +}; diff -r cba20af2b674 -r 639d5782a9f3 schema/ResourceAllocationSettingDataIndication.registration --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/ResourceAllocationSettingDataIndication.registration Wed Sep 09 00:48:02 2009 -0700 @@ -0,0 +1,11 @@ +# Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes +Xen_ResourceAllocationSettingDataCreatedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +Xen_ResourceAllocationSettingDataDeletedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +Xen_ResourceAllocationSettingDataModifiedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +KVM_ResourceAllocationSettingDataCreatedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +KVM_ResourceAllocationSettingDataDeletedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +KVM_ResourceAllocationSettingDataModifiedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +LXC_ResourceAllocationSettingDataCreatedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +LXC_ResourceAllocationSettingDataDeletedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method +LXC_ResourceAllocationSettingDataModifiedIndication root/virt Virt_ResourceAllocationSettingDataIndicationProvider Virt_ResourceAllocationSettingDataIndication indication method

1 0

[PATCH 3 of 6] Modify Virt_CS so set_source_inst_props() can be used by other providers.
by Sharad Mishra 11 Sep '09

11 Sep '09

# HG changeset patch # User snmishra(a)us.ibm.com # Date 1252482482 25200 # Node ID 2632c5204a9a6a485f5406ea016957340895f69f # Parent 639d5782a9f3f195b0ca88878ee169cc0efd0f18 Modify Virt_CS so set_source_inst_props() can be used by other providers Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 639d5782a9f3 -r 2632c5204a9a src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Wed Sep 09 00:48:02 2009 -0700 +++ b/src/Virt_ComputerSystemIndication.c Wed Sep 09 00:48:02 2009 -0700 @@ -192,9 +192,9 @@ return ret; } -static void set_source_inst_props(const CMPIBroker *broker, +void set_source_inst_props(const CMPIBroker *broker, const CMPIContext *context, - CMPIObjectPath *ref, + const CMPIObjectPath *ref, CMPIInstance *ind) { const char *host; diff -r 639d5782a9f3 -r 2632c5204a9a src/Virt_ComputerSystemIndication.h --- a/src/Virt_ComputerSystemIndication.h Wed Sep 09 00:48:02 2009 -0700 +++ b/src/Virt_ComputerSystemIndication.h Wed Sep 09 00:48:02 2009 -0700 @@ -29,6 +29,10 @@ const CMPIObjectPath *newsystem, char *type); +void set_source_inst_props(const CMPIBroker *broker, + const CMPIContext *context, + const CMPIObjectPath *ref, + CMPIInstance *ind); #endif /*

1 0

[PATCH 4 of 6] Modify Virt_RASD so that rasd_from_vdev() can be used by other providers.
by Sharad Mishra 11 Sep '09

11 Sep '09

# HG changeset patch # User snmishra(a)us.ibm.com # Date 1252482482 25200 # Node ID 14910082e1d791b092dcb43e067d91b400e09aa2 # Parent 2632c5204a9a6a485f5406ea016957340895f69f Modify Virt_RASD so that rasd_from_vdev() can be used by other providers Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 2632c5204a9a -r 14910082e1d7 src/Virt_RASD.c --- a/src/Virt_RASD.c Wed Sep 09 00:48:02 2009 -0700 +++ b/src/Virt_RASD.c Wed Sep 09 00:48:02 2009 -0700 @@ -368,7 +368,7 @@ return s; } -static CMPIInstance *rasd_from_vdev(const CMPIBroker *broker, +CMPIInstance *rasd_from_vdev(const CMPIBroker *broker, struct virt_device *dev, const char *host, const CMPIObjectPath *ref, diff -r 2632c5204a9a -r 14910082e1d7 src/Virt_RASD.h --- a/src/Virt_RASD.h Wed Sep 09 00:48:02 2009 -0700 +++ b/src/Virt_RASD.h Wed Sep 09 00:48:02 2009 -0700 @@ -66,6 +66,13 @@ const uint16_t type, const char *host, struct virt_device **list); + +CMPIInstance *rasd_from_vdev(const CMPIBroker *broker, + struct virt_device *dev, + const char *host, + const CMPIObjectPath *ref, + const char **properties); + #endif /*

1 0

[PATCH 5 of 6] Add resource indication provider.
by Sharad Mishra 11 Sep '09

11 Sep '09

# HG changeset patch # User snmishra(a)us.ibm.com # Date 1252482482 25200 # Node ID 430f148ad7035083035f4ba3a0975e0f43a88196 # Parent 14910082e1d791b092dcb43e067d91b400e09aa2 Add resource indication provider Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 14910082e1d7 -r 430f148ad703 src/Virt_ResourceAllocationSettingDataIndication.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Virt_ResourceAllocationSettingDataIndication.c Wed Sep 09 00:48:02 2009 -0700 @@ -0,0 +1,155 @@ +/* + * Copyright IBM Corp. 2007 + * + * Authors: + * Sharad Mishra <snmishra(a)us.ibm.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include <stdio.h> +#include <string.h> + +#include <cmpidt.h> +#include <cmpift.h> +#include <cmpimacs.h> + +#include <libvirt/libvirt.h> +#include <libcmpiutil/libcmpiutil.h> +#include <libcmpiutil/std_indication.h> +#include <misc_util.h> +#include <cs_util.h> + +static const CMPIBroker *_BROKER; + +DECLARE_FILTER(xen_created, + "Xen_ResourceAllocationSettingDataCreatedIndication"); +DECLARE_FILTER(xen_deleted, + "Xen_ResourceAllocationSettingDataDeletedIndication"); +DECLARE_FILTER(xen_modified, + "Xen_ResourceAllocationSettingDataModifiedIndication"); +DECLARE_FILTER(kvm_created, + "KVM_ResourceAllocationSettingDataCreatedIndication"); +DECLARE_FILTER(kvm_deleted, + "KVM_ResourceAllocationSettingDataDeletedIndication"); +DECLARE_FILTER(kvm_modified, + "KVM_ResourceAllocationSettingDataModifiedIndication"); +DECLARE_FILTER(lxc_created, + "LXC_ResourceAllocationSettingDataCreatedIndication"); +DECLARE_FILTER(lxc_deleted, + "LXC_ResourceAllocationSettingDataDeletedIndication"); +DECLARE_FILTER(lxc_modified, + "LXC_ResourceAllocationSettingDataModifiedIndication"); + +static struct std_ind_filter *filters[] = { + &xen_created, + &xen_deleted, + &xen_modified, + &kvm_created, + &kvm_deleted, + &kvm_modified, + &lxc_created, + &lxc_deleted, + &lxc_modified, + NULL, +}; + + +static CMPIStatus raise_indication(const CMPIBroker *broker, + const CMPIContext *ctx, + const CMPIInstance *ind) +{ + struct std_indication_ctx *_ctx = NULL; + CMPIStatus s = {CMPI_RC_OK, NULL}; + struct ind_args *args = NULL; + CMPIObjectPath *ref = NULL; + + _ctx = malloc(sizeof(struct std_indication_ctx)); + if (_ctx == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Unable to allocate indication context"); + goto out; + } + + _ctx->brkr = broker; + _ctx->handler = NULL; + _ctx->filters = filters; + _ctx->enabled = 1; + + args = malloc(sizeof(struct ind_args)); + if (args == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Unable to allocate ind_args"); + goto out; + } + + ref = CMGetObjectPath(ind, &s); + if (ref == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Got a null object path"); + goto out; + } + + /* FIXME: This is a Pegasus work around. Pegsus loses the namespace + when an ObjectPath is pulled from an instance */ + + + CMSetNameSpace(ref, "root/virt"); + args->ns = strdup(NAMESPACE(ref)); + args->classname = strdup(CLASSNAME(ref)); + args->_ctx = _ctx; + + s = stdi_deliver(broker, ctx, args, (CMPIInstance *)ind); + if (s.rc == CMPI_RC_OK) { + CU_DEBUG("Indication delivered"); + } else { + CU_DEBUG("Not delivered: %s", CMGetCharPtr(s.msg)); + } + + out: + return s; +} + +static struct std_indication_handler rasdi = { + .raise_fn = raise_indication, + .trigger_fn = NULL, + .activate_fn = NULL, + .deactivate_fn = NULL, + .enable_fn = NULL, + .disable_fn = NULL, +}; + +DEFAULT_IND_CLEANUP(); +DEFAULT_AF(); +DEFAULT_MP(); + +STDI_IndicationMIStub(, + Virt_ResourceAllocationSettingDataIndicationProvider, + _BROKER, + libvirt_cim_init(), + &rasdi, + filters); + +/* + * Local Variables: + * mode: C + * c-set-style: "K&R" + * tab-width: 8 + * c-basic-offset: 8 + * indent-tabs-mode: nil + * End: + */

1 0

[PATCH 6 of 6] Virt_VirtualSystemManagementService updated to add support for resource indication provider.
by Sharad Mishra 11 Sep '09

11 Sep '09

# HG changeset patch # User snmishra(a)us.ibm.com # Date 1252601888 25200 # Node ID c3163e536ea95f2b846eca4ca2a3cefd4ae6a4a7 # Parent 234141bf7f0368531c884334b1da5b94cc038758 Virt_VirtualSystemManagementService updated to add support for resource indication provider. Signed-off-by: Sharad Misrha <snmishra(a)us.ibm.com> diff -r 234141bf7f03 -r c3163e536ea9 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Thu Sep 03 12:52:47 2009 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Thu Sep 10 09:58:08 2009 -0700 @@ -63,6 +63,9 @@ #define BRIDGE_TYPE "bridge" #define NETWORK_TYPE "network" #define USER_TYPE "user" +#define CREATED "ResourceAllocationSettingDataCreatedIndication" +#define DELETED "ResourceAllocationSettingDataDeletedIndication" +#define MODIFIED "ResourceAllocationSettingDataModifiedIndication" const static CMPIBroker *_BROKER; @@ -442,7 +445,7 @@ ret = cu_get_str_prop(inst, "VirtualSystemIdentifier", &val); if (ret != CMPI_RC_OK) goto out; - + free(domain->name); domain->name = strdup(val); @@ -1416,7 +1419,69 @@ return s; } -static CMPIInstance *create_system(CMPIInstance *vssd, +static CMPIStatus raise_rasd_indication(const CMPIContext *context, + const char *base_type, + CMPIInstance *prev_inst, + const CMPIObjectPath *ref, + struct inst_list *list) +{ + char *type; + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *instc = NULL; + CMPIInstance *ind = NULL; + CMPIObjectPath *op = NULL; + int i; + + CU_DEBUG("raise_rasd_indication"); + + type = get_typed_class(CLASSNAME(ref), base_type); + ind = get_typed_instance(_BROKER, + CLASSNAME(ref), + base_type, + NAMESPACE(ref)); + if (ind == NULL) { + CU_DEBUG("Failed to get indication instance"); + s.rc = CMPI_RC_ERR_FAILED; + goto out; + } + + /* PreviousInstance is set only for modify case. */ + if (prev_inst != NULL) + CMSetProperty(ind, + "PreviousInstance", + (CMPIValue *)&prev_inst, + CMPI_instance); + + for (i=0; i < list->cur; i++) { + instc = list->list[i]; + op = CMGetObjectPath(instc, NULL); + CMPIString *str = CMGetClassName(op, NULL); + + CU_DEBUG("class name is %s\n", CMGetCharsPtr(str, NULL)); + + CMSetProperty(ind, + "SourceInstance", + (CMPIValue *)&instc, + CMPI_instance); + set_source_inst_props(_BROKER, context, ref, ind); + + s = stdi_raise_indication(_BROKER, + context, + type, + NAMESPACE(ref), + ind); + } + +out: + free(type); + return s; + +} + + + +static CMPIInstance *create_system(const CMPIContext *context, + CMPIInstance *vssd, CMPIArray *resources, const CMPIObjectPath *ref, const CMPIObjectPath *refconf, @@ -1427,6 +1492,9 @@ const char *msg = NULL; virConnectPtr conn = NULL; virDomainPtr dom = NULL; + struct inst_list list; + const char *props[] = {NULL}; struct domain *domain = NULL; + inst_list_init(&list); @@ -1477,18 +1544,40 @@ CU_DEBUG("System XML:\n%s", xml); inst = connect_and_create(xml, ref, s); - if (inst != NULL) + if (inst != NULL) { update_dominfo(domain, CLASSNAME(ref)); + + *s = enum_rasds(_BROKER, + ref, + domain->name, + CIM_RES_TYPE_ALL, + props, + &list); + + if (s->rc != CMPI_RC_OK) { + CU_DEBUG("Failed to enumerate rasd\n"); + goto out; + } + + raise_rasd_indication(context, + CREATED, + NULL, + ref, + &list); + } + out: cleanup_dominfo(&domain); free(xml); virDomainFree(dom); virConnectClose(conn); + inst_list_free(&list); return inst; } + static bool trigger_indication(const CMPIContext *context, const char *base_type, const CMPIObjectPath *ref) @@ -1530,7 +1620,7 @@ if (s.rc != CMPI_RC_OK) goto out; - sys = create_system(vssd, res, reference, refconf, &s); + sys = create_system(context, vssd, res, reference, refconf, &s); if (sys == NULL) goto out; @@ -1564,12 +1654,15 @@ CMPIObjectPath *sys; virConnectPtr conn = NULL; virDomainPtr dom = NULL; + struct inst_list list; + const char *props[] = {NULL}; + inst_list_init(&list); conn = connect_by_classname(_BROKER, CLASSNAME(reference), &status); if (conn == NULL) { - rc = -1; + rc = IM_RC_NOT_SUPPORTED; goto error; } @@ -1580,6 +1672,18 @@ if (dom_name == NULL) goto error; + status = enum_rasds(_BROKER, + reference, + dom_name, + CIM_RES_TYPE_ALL, + props, + &list); + + if (status.rc != CMPI_RC_OK) { + CU_DEBUG("Failed to enumerate rasd"); + goto error; + } + dom = virDomainLookupByName(conn, dom_name); if (dom == NULL) { CU_DEBUG("No such domain `%s'", dom_name); @@ -1605,11 +1710,17 @@ error: if (rc == IM_RC_SYS_NOT_FOUND) - virt_set_status(_BROKER, &status, + virt_set_status(_BROKER, + &status, CMPI_RC_ERR_NOT_FOUND, conn, "Referenced domain `%s' does not exist", dom_name); + else if (rc == IM_RC_NOT_SUPPORTED) + virt_set_status(_BROKER, &status, + CMPI_RC_ERR_NOT_FOUND, + conn, + "Unable to raise resource indication"); else if (rc == IM_RC_FAILED) virt_set_status(_BROKER, &status, CMPI_RC_ERR_NOT_FOUND, @@ -1617,6 +1728,7 @@ "Unable to retrieve domain name"); else if (rc == IM_RC_OK) { status = (CMPIStatus){CMPI_RC_OK, NULL}; + raise_rasd_indication(context, DELETED, NULL, reference, &list); trigger_indication(context, "ComputerSystemDeletedIndication", reference); @@ -1625,7 +1737,7 @@ virDomainFree(dom); virConnectClose(conn); CMReturnData(results, &rc, CMPI_uint32); - + inst_list_free(&list); return status; } @@ -2071,7 +2183,8 @@ return s; } -static CMPIStatus _update_resources_for(const CMPIObjectPath *ref, +static CMPIStatus _update_resources_for(const CMPIContext *context, + const CMPIObjectPath *ref, virDomainPtr dom, const char *devid, CMPIInstance *rasd, @@ -2081,7 +2194,14 @@ struct domain *dominfo = NULL; uint16_t type; char *xml = NULL; + char *indication = NULL; CMPIObjectPath *op; + struct inst_list list; + CMPIInstance *prev_inst = NULL; + const char *props[] = {NULL}; + const char *inst_id; + int i, ret; + inst_list_init(&list); if (!get_dominfo(dom, &dominfo)) { virt_set_status(_BROKER, &s, @@ -2106,6 +2225,7 @@ goto out; } + s = func(dominfo, rasd, type, devid, NAMESPACE(ref)); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Resource transform function failed"); @@ -2116,6 +2236,54 @@ if (xml != NULL) { CU_DEBUG("New XML:\n%s", xml); connect_and_create(xml, ref, &s); + + if (func == &resource_add) { + indication = strdup(CREATED); + } + else if (func == &resource_del) { + indication = strdup(DELETED); + } + else { + indication = strdup(MODIFIED); + + s = enum_rasds(_BROKER, + ref, + dominfo->name, + type, + props, + &list); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Failed to enumerate rasd"); + goto out; + } + + for(i=0; i < list.cur; i++) { + prev_inst = list.list[i]; + ret = cu_get_str_prop(prev_inst, + "InstanceID", + &inst_id); + + if (ret != CMPI_RC_OK) + continue; + + if (STREQ(inst_id, + get_fq_devid(dominfo->name, + (char *)devid))) + break; + } + + } + + inst_list_init(&list); + if (inst_list_add(&list, rasd) == 0) { + CU_DEBUG("Unable to add RASD instance to the list \n"); + goto out; + } + raise_rasd_indication(context, + indication, + prev_inst, + ref, + &list); } else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -2125,6 +2294,8 @@ out: cleanup_dominfo(&dominfo); free(xml); + free(indication); + inst_list_free(&list); return s; } @@ -2153,7 +2324,8 @@ return s; } -static CMPIStatus _update_resource_settings(const CMPIObjectPath *ref, +static CMPIStatus _update_resource_settings(const CMPIContext *context, + const CMPIObjectPath *ref, const char *domain, CMPIArray *resources, const CMPIResult *results, @@ -2208,9 +2380,14 @@ goto end; } - s = _update_resources_for(ref, dom, devid, inst, func); + s = _update_resources_for(context, + ref, + dom, + devid, + inst, + func); - end: + end: free(name); free(devid); virDomainFree(dom); @@ -2310,7 +2487,9 @@ return s; } - if (cu_get_ref_arg(argsin, "AffectedConfiguration", &sys) != CMPI_RC_OK) { + if (cu_get_ref_arg(argsin, + "AffectedConfiguration", + &sys) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_INVALID_PARAMETER, "Missing AffectedConfiguration parameter"); @@ -2324,11 +2503,13 @@ return s; } - s = _update_resource_settings(reference, + s = _update_resource_settings(context, + reference, domain, arr, results, resource_add); + free(domain); return s; @@ -2351,7 +2532,8 @@ return s; } - return _update_resource_settings(reference, + return _update_resource_settings(context, + reference, NULL, arr, results, @@ -2384,7 +2566,8 @@ if (s.rc != CMPI_RC_OK) goto out; - s = _update_resource_settings(reference, + s = _update_resource_settings(context, + reference, NULL, resource_arr, results,

1 0

[PATCH] get_disk_pool() is only valid for newer versions of libvirt
by Kaitlin Rupert 10 Sep '09

10 Sep '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1252098766 25200 # Node ID 2b627ddf93c9d303b87fd186a6d6334465a9a14c # Parent 23572a8bc37d425291732467773f46224f640b72 get_disk_pool() is only valid for newer versions of libvirt This patches fixes a compile issue with older versions of libvirt. diff -r 23572a8bc37d -r 2b627ddf93c9 src/Virt_DevicePool.h --- a/src/Virt_DevicePool.h Thu Sep 03 16:42:54 2009 -0700 +++ b/src/Virt_DevicePool.h Fri Sep 04 14:12:46 2009 -0700 @@ -28,6 +28,12 @@ #include "pool_parsing.h" +#if LIBVIR_VERSION_NUMBER > 4000 +# define VIR_USE_LIBVIRT_STORAGE 1 +#else +# define VIR_USE_LIBVIRT_STORAGE 0 +#endif + /** * Get the InstanceID of a pool that a given RASD id (for type) is in * @@ -135,6 +141,7 @@ uint16_t type, CMPIStatus *status); +#if VIR_USE_LIBVIRT_STORAGE /** * Get the configuration settings of a given storage pool * @@ -143,6 +150,7 @@ * @returns An int that indicates whether the function was successful */ int get_disk_pool(virStoragePoolPtr poolptr, struct virt_pool **pool); +#endif #endif

2 3