- CIM - libvirt List Archives

[PATCH] Add Emulator attribute so users can specify an emulator for the guest
by Kaitlin Rupert 18 Mar '09

18 Mar '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1237310504 25200 # Node ID 6195f98ebe5ef0bb1db1bb8ca946d5449393c21c # Parent 1aff0d0e9bf49e738827b7157c0df407b814ae7d Add Emulator attribute so users can specify an emulator for the guest. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 1aff0d0e9bf4 -r 6195f98ebe5e schema/VSSD.mof --- a/schema/VSSD.mof Wed Mar 04 15:25:33 2009 -0800 +++ b/schema/VSSD.mof Tue Mar 17 10:21:44 2009 -0700 @@ -29,6 +29,9 @@ "One of hd,fd,cdrom.")] string BootDevice; + [Description ("The emulator the guest should use during runtime.")] + string Emulator; + }; [Description ( @@ -42,6 +45,9 @@ [Description ("The device to boot from. One of hd,fd,cdrom.")] string BootDevice; + [Description ("The emulator the guest should use during runtime.")] + string Emulator; + }; [Description ( diff -r 1aff0d0e9bf4 -r 6195f98ebe5e src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Mar 04 15:25:33 2009 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Tue Mar 17 10:21:44 2009 -0700 @@ -148,9 +148,15 @@ return 1; } -static bool fv_default_emulator(struct domain *domain) +static bool fv_set_emulator(struct domain *domain, + const char *emu) { - const char *emul = XEN_EMULATOR; + if ((domain->type == DOMAIN_XENFV) && (emu == NULL)) + emu = XEN_EMULATOR; + + /* No emulator value to set */ + if (emu == NULL) + return true; cleanup_virt_device(domain->dev_emu); @@ -161,7 +167,7 @@ } domain->dev_emu->type = CIM_RES_TYPE_EMU; - domain->dev_emu->dev.emu.path = strdup(emul); + domain->dev_emu->dev.emu.path = strdup(emu); domain->dev_emu->id = strdup("emulator"); return true; @@ -178,8 +184,6 @@ domain->type = DOMAIN_KVM; } else if (STREQC(pfx, "Xen")) { domain->type = DOMAIN_XENFV; - if (!fv_default_emulator(domain)) - return 0; } else { CU_DEBUG("Unknown fullvirt domain type: %s", pfx); return 0; @@ -192,6 +196,17 @@ free(domain->os_info.fv.boot); domain->os_info.fv.boot = strdup(val); + ret = cu_get_str_prop(inst, "Emulator", &val); + if (ret != CMPI_RC_OK) + val = NULL; + else if (disk_type_from_file(val) == DISK_UNKNOWN) { + CU_DEBUG("Emulator path does not exist: %s", val); + return 0; + } + + if (!fv_set_emulator(domain, val)) + return 0; + return 1; }

2 1

Test Run Summary (Mar 16 2009): Xen on Red Hat Enterprise Linux Server release 5.3 (Tikanga) with Pegasus
by Deepti B Kalakeri 18 Mar '09

18 Mar '09

================================================= Test Run Summary (Mar 16 2009): Xen on Red Hat Enterprise Linux Server release 5.3 (Tikanga) with Pegasus ================================================= Distro: Red Hat Enterprise Linux Server release 5.3 (Tikanga) Kernel: 2.6.18-128.el5xen libvirt: 0.3.3 Hypervisor: Xen 3.1.0 CIMOM: Pegasus 2.7.1 Libvirt-cim revision: 613 Libvirt-cim changeset: 1fcf330fadf8+ Cimtest revision: 646 Cimtest changeset: b1e05c9de638 ================================================= FAIL : 8 XFAIL : 1 SKIP : 12 PASS : 125 ----------------- Total : 146 ================================================= FAIL Test Summary: RASD - 01_verify_rasd_fields.py: FAIL VirtualSystemManagementService - 14_define_sys_disk.py: FAIL VirtualSystemMigrationService - 01_migratable_host.py: FAIL VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL VirtualSystemMigrationService - 05_migratable_host_errs.py: FAIL VirtualSystemSettingDataComponent - 02_reverse.py: FAIL VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: FAIL VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 33_suspend_reboot.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP HostedAccessPoint - 01_forward.py: SKIP HostedAccessPoint - 02_reverse.py: SKIP KVMRedirectionSAP - 01_enum_KVMredSAP.py: SKIP LogicalDisk - 02_nodevs.py: SKIP NetworkPort - 03_user_netport.py: SKIP RASD - 05_disk_rasd_emu_type.py: SKIP RedirectionService - 01_enum_crs.py: SKIP RedirectionService - 02_enum_crscap.py: SKIP RedirectionService - 03_RedirectionSAP_errs.py: SKIP ServiceAccessBySAP - 01_forward.py: SKIP ServiceAccessBySAP - 02_reverse.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 -------------------------------------------------------------------- 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: 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: SKIP -------------------------------------------------------------------- HostedAccessPoint - 02_reverse.py: SKIP -------------------------------------------------------------------- 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: SKIP -------------------------------------------------------------------- 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: SKIP -------------------------------------------------------------------- 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: FAIL ERROR - (6, u'CIM_ERR_NOT_FOUND: No such instance (domguest/xvda)') ERROR - Enum RASDs failed -------------------------------------------------------------------- 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: SKIP -------------------------------------------------------------------- RedirectionService - 01_enum_crs.py: SKIP -------------------------------------------------------------------- RedirectionService - 02_enum_crscap.py: SKIP -------------------------------------------------------------------- RedirectionService - 03_RedirectionSAP_errs.py: SKIP -------------------------------------------------------------------- ReferencedProfile - 01_verify_refprof.py: PASS -------------------------------------------------------------------- ReferencedProfile - 02_refprofile_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: PASS -------------------------------------------------------------------- ResourcePool - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePool - 02_rp_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 01_forward.py: SKIP -------------------------------------------------------------------- ServiceAccessBySAP - 02_reverse.py: SKIP -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: 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: FAIL ERROR - Xen_DiskResourceAllocationSettingData instance for rstest_disk_domain not found ERROR - Failed to verify disk path for rstest_disk_domain -------------------------------------------------------------------- VirtualSystemManagementService - 15_mod_system_settings.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 01_migratable_host.py: FAIL ERROR - MigrateVirtualSystemToHost took too long Xen_ComputerSystem.CreationClassName="Xen_ComputerSystem",Name="dom_migrate" -------------------------------------------------------------------- VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL ERROR - Got CIM error CIM_ERR_FAILED: Failed to lookup resulting system with return code 1 ERROR - CS instance not returned for dom_migrate. ERROR - Error start domain dom_migrate InvokeMethod(DefineSystem): CIM_ERR_FAILED: Failed to lookup resulting system CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). CIM_ERR_NOT_FOUND: No such instance (dom_migrate). -------------------------------------------------------------------- VirtualSystemMigrationService - 05_migratable_host_errs.py: FAIL ERROR - Got CIM error CIM_ERR_FAILED: Unable to start domain with return code 1 ERROR - Error start domain dom_migration InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Unable to start domain -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 01_forward.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 02_reverse.py: FAIL ERROR - Got CIM error CIM_ERR_FAILED: Unable to start domain with return code 1 ERROR - Failed to start the dom: VSSDC_dom InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Unable to start domain -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: FAIL ERROR - Got CIM error CIM_ERR_FAILED: Unable to start domain with return code 1 ERROR - Unable to start domain domu1 InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Unable to start domain -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL ERROR - Got CIM error CIM_ERR_FAILED: Unable to start domain with return code 1 ERROR - Unable to start domain domu1 InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Unable to start domain -------------------------------------------------------------------- VirtualSystemSnapshotService - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS -------------------------------------------------------------------- -- Thanks and Regards, Deepti B. Kalakeri IBM Linux Technology Center deeptik(a)linux.vnet.ibm.com

2 3

Test Run Summary (Mar 18 2009): Xen on Red Hat Enterprise Linux Server release 5.3 (Tikanga) with Pegasus
by Guo Lian Yun 18 Mar '09

18 Mar '09

================================================= Test Run Summary (Mar 18 2009): Xen on Red Hat Enterprise Linux Server release 5.3 (Tikanga) with Pegasus ================================================= Distro: Red Hat Enterprise Linux Server release 5.3 (Tikanga) Kernel: 2.6.18-128.el5xen libvirt: 0.3.3 Hypervisor: Xen 3.1.0 CIMOM: Pegasus 2.7.1 Libvirt-cim revision: 829 Libvirt-cim changeset: 1aff0d0e9bf4 Cimtest revision: Cimtest changeset: ================================================= FAIL : 2 XFAIL : 1 SKIP : 3 PASS : 140 ----------------- Total : 146 ================================================= FAIL Test Summary: VirtualSystemMigrationService - 01_migratable_host.py: FAIL VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 33_suspend_reboot.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP LogicalDisk - 02_nodevs.py: SKIP NetworkPort - 03_user_netport.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 -------------------------------------------------------------------- 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: 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: SKIP -------------------------------------------------------------------- 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 -------------------------------------------------------------------- RedirectionService - 01_enum_crs.py: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 01_forward.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 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: 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: PASS -------------------------------------------------------------------- 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: 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 -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 01_migratable_host.py: FAIL ERROR - Error create domain dom_migrate -------------------------------------------------------------------- VirtualSystemMigrationService - 02_host_migrate_type.py: FAIL ERROR - dom_migrate migrate failed ERROR - dom_migrate migrate failed -------------------------------------------------------------------- VirtualSystemMigrationService - 05_migratable_host_errs.py: PASS -------------------------------------------------------------------- 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 -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS --------------------------------------------------------------------

1 0

[PATCH] [TEST] Add tc to verify VSMS.RemoveResourceSettings() with correct resource
by yunguol＠cn.ibm.com 17 Mar '09

17 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1236759196 25200 # Node ID 0e350cf7bbab15c07d948976435ff4fe1b4ab597 # Parent a78b6f23ebaa8a38fa591e420d742aa03cd9e515 [TEST] Add tc to verify VSMS.RemoveResourceSettings() with correct resource This tc verify disk and network devices now, follow up patch will verify input and graphics devices Tested for KVM/Xen/XenFV with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r a78b6f23ebaa -r 0e350cf7bbab suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py Wed Mar 11 01:13:16 2009 -0700 @@ -0,0 +1,109 @@ +#!/usr/bin/python +# +# Copyright 2008 IBM Corp. +# +# Authors: +# Guolian Yun <yunguol(a)cn.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU 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 +# General Public License for more details. +# +# You should have received a copy of the GNU 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 +# + +import sys +import pywbem +import random +from pywbem.cim_obj import CIMInstanceName +from XenKvmLib import vsms +from XenKvmLib import vxml +from XenKvmLib.classes import get_typed_class +from CimTest.Globals import logger +from XenKvmLib.const import do_main, get_provider_version, default_network_name +from CimTest.ReturnCodes import FAIL, PASS +from XenKvmLib.common_util import create_netpool_conf, destroy_netpool +from XenKvmLib.xm_virt_util import get_bridge_from_network_xml + +sup_types = ['Xen', 'KVM', 'XenFV'] +default_dom = 'domain' +libvirt_cim_dev_xml = 828 +ntype = 'network' +nmac = '00:11:22:33:44:55' +npool_name = default_network_name + str(random.randint(1, 100)) + +@do_main(sup_types) +def main(): + options = main.options + + if options.virt == 'KVM': + nddev = 'hdb' + else: + nddev = 'xvdb' + + cxml = vxml.get_class(options.virt)(default_dom, disk=nddev, mac=nmac) + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + + drasd = get_typed_class(options.virt, 'DiskResourceAllocationSettingData') + drasd_id = '%s/%s' % (default_dom, nddev) + dkeys = {'InstanceID' : drasd_id} + + nrasd = get_typed_class(options.virt, 'NetResourceAllocationSettingData') + nrasd_id = '%s/%s' % (default_dom, nmac) + nkeys = {'InstanceID' : nrasd_id} + + status, net_name = create_netpool_conf(options.ip, options.virt, + use_existing=False, + net_name=npool_name) + if status != PASS: + logger.error('Unable to create network pool') + return FAIL + + dresource = CIMInstanceName(drasd, keybindings = dkeys) + nresource = CIMInstanceName(nrasd, keybindings = nkeys) + + service = vsms.get_vsms_class(options.virt)(options.ip) + try: + service.RemoveResourceSettings(ResourceSettings=[dresource, nresource]) + except Exception, details: + logger.error('Failed to remove % or %s', dresource, nresource) + logger.error(details) + cxml.undefine(options.ip) + destroy_netpool(options.ip, options.virt, net_name) + return FAIL + + cxml.dumpxml(options.ip) + disk = cxml.get_value_xpath('/domain/devices/disk/target/@dev[. = "%s"]' + % nddev) + if options.virt == 'KVM': + net = cxml.get_value_xpath( + '/domain/devices/interface/source/@network[. = "%s"]' % nmac) + else: + br = get_bridge_from_network_xml(net_name, options.ip, options.virt) + net = cxml.get_value_xpath( + '/domain/devices/interface/source/@bridge[. = "%s"]' % br) + + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) + if disk != None and net != None and curr_cim_rev >= libvirt_cim_dev_xml: + logger.error('The resource is not removerd successfully') + cxml.undefine(options.ip) + destroy_netpool(options.ip, options.virt, net_name) + return FAIL + + cxml.undefine(options.ip) + destroy_netpool(options.ip, options.virt, net_name) + return PASS + +if __name__ == "__main__": + sys.exit(main())

3 7

[PATCH] [TEST] #4 Make sure network pool is created with a random IP
by Kaitlin Rupert 17 Mar '09

17 Mar '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1236965462 25200 # Node ID e7a106fadb25acb73ecc8d5ff4137611d942548a # Parent b1e05c9de638909c5c6a7ba86aa2b3551802d013 [TEST] #4 Make sure network pool is created with a random IP. This will help prevent overlap with existing networks. However, this won't completely prevent the issue. We'd need to do test to see if the IP address is already used by a different network. If the network is in use, then another IP address should be used. Update from 3 to 4: -Remove changes made for debugging purposes: *Uisng a 192.168.122 value for the subnet instead of 192.168.123 *Overriding addr value Updates from 2 to 3: -If IP address is already in use, return from the _init_() call. Updates from 1 to 2: -Check to see if pool with the specified IP range exists, if so, return a meaningful error -Since the NetXML generates a random IP, creating a NetXML object in the destroy call will generate an object with a different IP. Instead, use the virsh call to destroy the network. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r b1e05c9de638 -r e7a106fadb25 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Fri Mar 13 10:31:02 2009 -0700 @@ -36,7 +36,7 @@ CIM_ERROR_GETINSTANCE from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.xm_virt_util import diskpool_list, virsh_version, net_list,\ - domain_list, virt2uri + domain_list, virt2uri, net_destroy from XenKvmLib.vxml import PoolXML, NetXML from VirtLib import utils from XenKvmLib.const import default_pool_name, default_network_name @@ -438,11 +438,9 @@ if net_name == None: return FAIL - netxml = NetXML(server, virt=virt, networkname=net_name) - ret = netxml.destroy_vnet() - if not ret: - logger.error("Failed to destroy Virtual Network '%s'", - net_name) + ret = net_destroy(net_name, server, virt) + if ret != 0: + logger.error("Failed to destroy Virtual Network '%s'", net_name) return FAIL return PASS diff -r b1e05c9de638 -r e7a106fadb25 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Mar 13 10:31:02 2009 -0700 @@ -32,6 +32,7 @@ # shared by XenXML & KVMXML. import os import sys +import random import platform import tempfile from time import sleep @@ -39,7 +40,8 @@ from xml.dom import minidom, Node from xml import xpath from VirtLib import utils, live -from XenKvmLib.xm_virt_util import get_bridge_from_network_xml, bootloader +from XenKvmLib.xm_virt_util import get_bridge_from_network_xml, bootloader, \ + net_list from XenKvmLib.test_doms import set_uuid, viruuid from XenKvmLib import vsms from XenKvmLib import const @@ -182,7 +184,6 @@ def get_valid_bridge_name(server): bridge_list = live.available_bridges(server) if bridgename in bridge_list: - import random vbr = bridgename + str(random.randint(1, 100)) if vbr in bridge_list: logger.error('Need to give different bridge name ' @@ -207,13 +208,27 @@ self.add_sub_node(network, 'name', self.net_name) self.add_sub_node(network, 'uuid', set_uuid()) self.add_sub_node(network, 'forward') - subnet = '192.168.122.' + subnet = '192.168.123.' self.add_sub_node(network, 'bridge', name=self.vbr, stp='on', forwardDelay='0') - ip = self.add_sub_node(network, 'ip', address=subnet+'1', + ip_base = random.randint(1, 100) + addr = subnet+'%d' % ip_base + + n_list = net_list(server, virt) + for _net_name in n_list: + cmd = "virsh net-dumpxml %s | awk '/ip address/ {print}' | \ + cut -d ' ' -f 4 | sed 's/address=//'" % _net_name + s, in_use_addr = utils.run_remote(server, cmd) + in_use_addr = in_use_addr.strip("'") + if in_use_addr == addr: + logger.error("IP address is in use by a different network") + return None + + ip = self.add_sub_node(network, 'ip', address=addr, netmask='255.255.255.0') dhcp = self.add_sub_node(ip, 'dhcp') - self.add_sub_node(dhcp, 'range', start=subnet+'2', + range_addr = subnet+'%d' % (ip_base + 1) + self.add_sub_node(dhcp, 'range', start=range_addr, end=subnet+'254') def create_vnet(self): diff -r b1e05c9de638 -r e7a106fadb25 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Fri Mar 13 10:31:02 2009 -0700 @@ -184,6 +184,14 @@ if len(bridge) > 1: return bridge[1] +def net_destroy(network, server, virt="Xen"): + """Function destroys a given virtual network""" + + cmd = "virsh -c %s net-destroy %s" % (virt2uri(virt), network) + ret, out = utils.run_remote(server, cmd) + + return ret + def network_by_bridge(bridge, server, virt="Xen"): """Function returns virtual network for a given bridge"""

2 1

[PATCH] [TEST] #3 Make sure network pool is created with a random IP
by Kaitlin Rupert 17 Mar '09

17 Mar '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1236965462 25200 # Node ID bc7ee42128a826ef12c8d7a90ff611a6688f8136 # Parent b1e05c9de638909c5c6a7ba86aa2b3551802d013 [TEST] #3 Make sure network pool is created with a random IP. This will help prevent overlap with existing networks. However, this won't completely prevent the issue. We'd need to do test to see if the IP address is already used by a different network. If the network is in use, then another IP address should be used. Updates from 2 to 3: -If IP address is already in use, return from the _init_() call. Updates from 1 to 2: -Check to see if pool with the specified IP range exists, if so, return a meaningful error -Since the NetXML generates a random IP, creating a NetXML object in the destroy call will generate an object with a different IP. Instead, use the virsh call to destroy the network. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r b1e05c9de638 -r bc7ee42128a8 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Fri Mar 13 10:31:02 2009 -0700 @@ -36,7 +36,7 @@ CIM_ERROR_GETINSTANCE from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC from XenKvmLib.xm_virt_util import diskpool_list, virsh_version, net_list,\ - domain_list, virt2uri + domain_list, virt2uri, net_destroy from XenKvmLib.vxml import PoolXML, NetXML from VirtLib import utils from XenKvmLib.const import default_pool_name, default_network_name @@ -438,11 +438,9 @@ if net_name == None: return FAIL - netxml = NetXML(server, virt=virt, networkname=net_name) - ret = netxml.destroy_vnet() - if not ret: - logger.error("Failed to destroy Virtual Network '%s'", - net_name) + ret = net_destroy(net_name, server, virt) + if ret != 0: + logger.error("Failed to destroy Virtual Network '%s'", net_name) return FAIL return PASS diff -r b1e05c9de638 -r bc7ee42128a8 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Mar 13 10:31:02 2009 -0700 @@ -32,6 +32,7 @@ # shared by XenXML & KVMXML. import os import sys +import random import platform import tempfile from time import sleep @@ -39,7 +40,8 @@ from xml.dom import minidom, Node from xml import xpath from VirtLib import utils, live -from XenKvmLib.xm_virt_util import get_bridge_from_network_xml, bootloader +from XenKvmLib.xm_virt_util import get_bridge_from_network_xml, bootloader, \ + net_list from XenKvmLib.test_doms import set_uuid, viruuid from XenKvmLib import vsms from XenKvmLib import const @@ -182,7 +184,6 @@ def get_valid_bridge_name(server): bridge_list = live.available_bridges(server) if bridgename in bridge_list: - import random vbr = bridgename + str(random.randint(1, 100)) if vbr in bridge_list: logger.error('Need to give different bridge name ' @@ -210,10 +211,25 @@ subnet = '192.168.122.' self.add_sub_node(network, 'bridge', name=self.vbr, stp='on', forwardDelay='0') - ip = self.add_sub_node(network, 'ip', address=subnet+'1', + ip_base = random.randint(1, 100) + addr = subnet+'%d' % ip_base + addr = subnet+'1' + + n_list = net_list(server, virt) + for _net_name in n_list: + cmd = "virsh net-dumpxml %s | awk '/ip address/ {print}' | \ + cut -d ' ' -f 4 | sed 's/address=//'" % _net_name + s, in_use_addr = utils.run_remote(server, cmd) + in_use_addr = in_use_addr.strip("'") + if in_use_addr == addr: + logger.error("IP address is in use by a different network") + return None + + ip = self.add_sub_node(network, 'ip', address=addr, netmask='255.255.255.0') dhcp = self.add_sub_node(ip, 'dhcp') - self.add_sub_node(dhcp, 'range', start=subnet+'2', + range_addr = subnet+'%d' % (ip_base + 1) + self.add_sub_node(dhcp, 'range', start=range_addr, end=subnet+'254') def create_vnet(self): diff -r b1e05c9de638 -r bc7ee42128a8 suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/xm_virt_util.py Fri Mar 13 10:31:02 2009 -0700 @@ -184,6 +184,14 @@ if len(bridge) > 1: return bridge[1] +def net_destroy(network, server, virt="Xen"): + """Function destroys a given virtual network""" + + cmd = "virsh -c %s net-destroy %s" % (virt2uri(virt), network) + ret, out = utils.run_remote(server, cmd) + + return ret + def network_by_bridge(bridge, server, virt="Xen"): """Function returns virtual network for a given bridge"""

2 3

[PATCH] [TEST] #3 Fix VirtualSystemManagementService/05_destroysystem_neg.py with provider's updates of error message
by yunguol＠cn.ibm.com 17 Mar '09

17 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1237268304 25200 # Node ID 8ab3cd32eec75ce195e51b6c62a4e0b2c7acc56d # Parent b1e05c9de638909c5c6a7ba86aa2b3551802d013 [TEST] #3 Fix VirtualSystemManagementService/05_destroysystem_neg.py with provider's updates of error message Updates from 2 to 3: 1) Move following log message before the if conditional statement logger.info("For Invalid Scenario '%s'", tc) 2) Return PASS instead of assign status separately Updates from 1 to 2: 1) Remove unused import statement 2) Redefine exp_value for different provider version 3) Add log error desc for report mismatching exception Tested for KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r b1e05c9de638 -r 8ab3cd32eec7 suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Mon Mar 16 22:38:24 2009 -0700 @@ -20,80 +20,87 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# This test case is used to verify the VSMS.DestroySystem with invalid vs. + import sys import pywbem from pywbem.cim_obj import CIMInstanceName -from VirtLib import utils from XenKvmLib import vsms from XenKvmLib.classes import get_typed_class -from XenKvmLib.test_doms import undefine_test_domain from CimTest.Globals import logger -from XenKvmLib.const import do_main +from XenKvmLib.const import do_main, get_provider_version from CimTest.ReturnCodes import FAIL, PASS, SKIP sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] -vsms_status_version = 534 +vsms_err_message = 814 def destroysystem_fail(tc, options): service = vsms.get_vsms_class(options.virt)(options.ip) classname = get_typed_class(options.virt, 'ComputerSystem') + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) if tc == 'noname': cs_ref = CIMInstanceName(classname, keybindings = {'CreationClassName':classname}) - exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, - 'desc' : 'Unable to retrieve domain name.' - } + if curr_cim_rev >= vsms_err_message: + exp_value = { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'Unable to retrieve domain name: Error 0' + } + else: + exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : 'Unable to retrieve domain name.' + } elif tc == 'nonexistent': cs_ref = CIMInstanceName(classname,keybindings = { 'Name':'##@@!!cimtest_domain', 'CreationClassName':classname}) - exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, - 'desc' : 'Failed to find domain' - } + if curr_cim_rev >= vsms_err_message: + exp_value = { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : "Referenced domain `##@@!!cimtest_domain'" \ + " does not exist: Domain not found" + } + else: + exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : 'Failed to find domain' + } - else: - return SKIP - - status = FAIL try: ret = service.DestroySystem(AffectedSystem=cs_ref) except Exception, details: err_no = details[0] err_desc = details[1] + logger.info("For Invalid Scenario '%s'", tc) if err_no == exp_value['rc'] and err_desc.find(exp_value['desc']) >= 0: - logger.error("For Invalid Scenario '%s'", tc) logger.info('Got expected error no: %s', err_no) logger.info('Got expected error desc: %s',err_desc) return PASS - - logger.error('destroy_fail>> %s: Error executing DestroySystem', tc) - logger.error(details) - return FAIL + else: + logger.error('Got error no %s, but expected no %s', + err_no, exp_value['rc']) + logger.error('Got error desc: %s, but expected desc: %s', + err_desc, exp_value['desc']) + return FAIL + logger.error('destroy_fail>> %s: Error executing DestroySystem', tc) + logger.error(details) + return FAIL @do_main(sup_types) def main(): options = main.options rc1 = destroysystem_fail('noname', options) rc2 = destroysystem_fail('nonexistent', options) - + status = FAIL if rc1 == PASS and rc2 == PASS: - status = PASS - else: - rclist = [rc1, rc2] - rclist.sort() - if rclist[0] == PASS and rclist[1] == SKIP: - status = PASS - + return PASS + return status if __name__ == "__main__": sys.exit(main()) -

2 1

[PATCH] [TEST] #2 Add tc to verify VSMS.RemoveResourceSettings() with correct resource
by yunguol＠cn.ibm.com 16 Mar '09

16 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1237196093 25200 # Node ID dd3b676d57e5e719213e4587743c0b0c06194160 # Parent b1e05c9de638909c5c6a7ba86aa2b3551802d013 [TEST] #2 Add tc to verify VSMS.RemoveResourceSettings() with correct resource Updates from 1 to 2: Get RASD instances by SystemDevice and SettingsDefineState associaton Tested for KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r b1e05c9de638 -r dd3b676d57e5 suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/16_removeresource.py Mon Mar 16 02:34:53 2009 -0700 @@ -0,0 +1,108 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# Guolian Yun <yunguol(a)cn.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU 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 +# General Public License for more details. +# +# You should have received a copy of the GNU 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 +# + +import sys +from XenKvmLib.vsms import get_vsms_class +from XenKvmLib.vxml import get_class +from XenKvmLib.classes import get_typed_class +from XenKvmLib.assoc import AssociatorNames +from CimTest.Globals import logger +from XenKvmLib.const import do_main, get_provider_version +from CimTest.ReturnCodes import FAIL, PASS, SKIP + +sup_types = ['Xen', 'KVM', 'XenFV'] +default_dom = 'domain' +rem_res_err_rev_start = 779 +rem_res_err_rev_end = 828 +nmac = '00:11:22:33:44:55' + +@do_main(sup_types) +def main(): + options = main.options + + if options.virt == 'KVM': + nddev = 'hdb' + else: + nddev = 'xvdb' + + cxml = get_class(options.virt)(default_dom, disk=nddev, mac=nmac) + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + + try: + # Get system devices through SystemDevice assocation + sd_classname = get_typed_class(options.virt, 'SystemDevice') + cs_classname = get_typed_class(options.virt, 'ComputerSystem') + + devs = AssociatorNames(options.ip, sd_classname, cs_classname, + Name=default_dom, CreationClassName=cs_classname) + + if len(devs) == 0: + raise Exception("No devices returned") + + # Get RASD instances through SettingsDefineState + sds_classname = get_typed_class(options.virt, 'SettingsDefineState') + mem = get_typed_class(options.virt, 'Memory') + proc = get_typed_class(options.virt, 'Processor') + input = get_typed_class(options.virt, 'PointingDevice') + dev_not_rem = [mem, proc, input] + + for dev in devs: + if dev['CreationClassName'] not in dev_not_rem: + ccn = dev['CreationClassName'] + sccn = dev['SystemCreationClassName'] + rasd = AssociatorNames(options.ip, sds_classname, ccn, + DeviceID = dev['DeviceID'], + CreationClassName = ccn, + SystemName = dev['SystemName'], + SystemCreationClassName = sccn) + if len(rasd) != 1: + raise Exception("%i RASD insts for %s", len(rasd), dev.DeviceID) + + # Invoke RemoveResourceSettings() to remove resource + service = get_vsms_class(options.virt)(options.ip) + service.RemoveResourceSettings(ResourceSettings=[rasd[0]]) + except Exception, details: + logger.error(details) + cxml.undefine(options.ip) + return FAIL + + cxml.dumpxml(options.ip) + device = cxml.get_value_xpath('/domain/@devices') + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) + + if device == None: + status = PASS + elif device != None and curr_cim_rev >= rem_res_err_rev_start and\ + curr_cim_rev < rem_res_err_rev_end: + status = SKIP + else: + logger.error('The devices are not removed successfully') + status = FAIL + + cxml.undefine(options.ip) + return status + +if __name__ == "__main__": + sys.exit(main())

2 1

[PATCH] [TEST] #2 Fix VirtualSystemManagementService/05_destroysystem_neg.py with provider's updates of error message
by yunguol＠cn.ibm.com 16 Mar '09

16 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1237189564 25200 # Node ID 079bbc777d5b6968c4d2cf0220a509ffc63e820d # Parent b1e05c9de638909c5c6a7ba86aa2b3551802d013 [TEST] #2 Fix VirtualSystemManagementService/05_destroysystem_neg.py with provider's updates of error message Updates from 1 to 2: 1) Remove unused import statement 2) Redefine exp_value for different provider version 3) Add log error desc for report mismatching exception Tested for KVM with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r b1e05c9de638 -r 079bbc777d5b suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Fri Mar 13 10:31:05 2009 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Mon Mar 16 00:46:04 2009 -0700 @@ -20,47 +20,54 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# This test case is used to verify the VSMS.DestroySystem with invalid vs. + import sys import pywbem from pywbem.cim_obj import CIMInstanceName -from VirtLib import utils from XenKvmLib import vsms from XenKvmLib.classes import get_typed_class -from XenKvmLib.test_doms import undefine_test_domain from CimTest.Globals import logger -from XenKvmLib.const import do_main +from XenKvmLib.const import do_main, get_provider_version from CimTest.ReturnCodes import FAIL, PASS, SKIP sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] -vsms_status_version = 534 +vsms_err_message = 814 def destroysystem_fail(tc, options): service = vsms.get_vsms_class(options.virt)(options.ip) classname = get_typed_class(options.virt, 'ComputerSystem') + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) if tc == 'noname': cs_ref = CIMInstanceName(classname, keybindings = {'CreationClassName':classname}) - exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, - 'desc' : 'Unable to retrieve domain name.' - } + if curr_cim_rev >= vsms_err_message: + exp_value = { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'Unable to retrieve domain name: Error 0' + } + else: + exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : 'Unable to retrieve domain name.' + } elif tc == 'nonexistent': cs_ref = CIMInstanceName(classname,keybindings = { 'Name':'##@@!!cimtest_domain', 'CreationClassName':classname}) - exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, - 'desc' : 'Failed to find domain' - } + if curr_cim_rev >= vsms_err_message: + exp_value = { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : "Referenced domain `##@@!!cimtest_domain'" \ + " does not exist: Domain not found"} + else: + exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : 'Failed to find domain' + } - else: - return SKIP - - status = FAIL try: ret = service.DestroySystem(AffectedSystem=cs_ref) @@ -68,30 +75,33 @@ err_no = details[0] err_desc = details[1] if err_no == exp_value['rc'] and err_desc.find(exp_value['desc']) >= 0: - logger.error("For Invalid Scenario '%s'", tc) + logger.info("For Invalid Scenario '%s'", tc) logger.info('Got expected error no: %s', err_no) logger.info('Got expected error desc: %s',err_desc) return PASS - - logger.error('destroy_fail>> %s: Error executing DestroySystem', tc) - logger.error(details) - return FAIL + else: + logger.error("For Invalid Scenario '%s'", tc) + logger.error('Got error no %s, but expected no %s', + err_no, exp_value['rc']) + logger.error('Got error desc: %s, but expected desc: %s', + err_desc, exp_value['desc']) + return FAIL + logger.error('destroy_fail>> %s: Error executing DestroySystem', tc) + logger.error(details) + return FAIL @do_main(sup_types) def main(): options = main.options rc1 = destroysystem_fail('noname', options) rc2 = destroysystem_fail('nonexistent', options) - + status = FAIL if rc1 == PASS and rc2 == PASS: status = PASS else: - rclist = [rc1, rc2] - rclist.sort() - if rclist[0] == PASS and rclist[1] == SKIP: - status = PASS - + status = FAIL + return status if __name__ == "__main__":

3 2

[PATCH 0 of 4] [TEST][RFC] Added new tc to verify remote live migration.
by Deepti B. Kalakeri 16 Mar '09

16 Mar '09

Verified with KVM. The test case will not pass for KVM since the guest information needs to have emulator information without which the remote migration fails. The support to pass the emulator information via VirtualSystemMigrationSettingData is not yet available. As a workaround for verification of the tc. ------------------------------------------- 1) create a KVM VM which has the emulator information outside the tc on the comman line. 2) comment out the setup_guest() call. 3) specify the name of the guest create in test_dom before calling local_remote_migrate(). Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com>

3 11