May 2008 - CIM - libvirt List Archives

[PATCH] [TEST] Update ElementConforms.01~04 for LXC support
by yunguol＠cn.ibm.com 30 May '08

30 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211896263 -28800 # Node ID 05a50a59c4e926933fd6ae3b190b8a36d13e5672 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Update ElementConforms.01~04 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3233a0703772 -r 05a50a59c4e9 suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Tue May 27 21:51:03 2008 +0800 @@ -42,7 +42,7 @@ from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] test_dom = "domU" def verify_cs(item, id): diff -r 3233a0703772 -r 05a50a59c4e9 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Tue May 27 21:51:03 2008 +0800 @@ -53,7 +53,7 @@ from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] test_dom = "domgst" diff -r 3233a0703772 -r 05a50a59c4e9 suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Tue May 27 21:51:03 2008 +0800 @@ -60,7 +60,7 @@ from CimTest import Globals from CimTest.Globals import logger, CIM_USER, CIM_PASS, do_main -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] bug = '92642' diff -r 3233a0703772 -r 05a50a59c4e9 suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Tue May 27 21:51:03 2008 +0800 @@ -89,7 +89,7 @@ from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] bug = '92642' test_dom = "domU" diff -r 3233a0703772 -r 05a50a59c4e9 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue May 27 21:51:03 2008 +0800 @@ -99,6 +99,9 @@ pass class KVM_RegisteredProfile(CIM_RegisteredProfile): + pass + +class LXC_RegisteredProfile(CIM_RegisteredProfile): pass class Xen_VirtualSystemSettingData(CIM_MyClass):

3 2

[PATCH] Add polling for domain undefine in VSMigrationService
by Kaitlin Rupert 29 May '08

29 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1212097721 25200 # Node ID 8c3b74f06d88a4a8b6aa7451e65b82e2f3c502a5 # Parent 05a5ba2fda5d03facdea4e0cdfdc26d4a47d80fd Add polling for domain undefine in VSMigrationService. Use the same timeout duration used for the domain shutdown. This should be more than enough time for the guest to complete migration. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 05a5ba2fda5d -r 8c3b74f06d88 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Wed May 28 14:04:50 2008 -0700 +++ b/src/Virt_VSMigrationService.c Thu May 29 14:48:41 2008 -0700 @@ -977,8 +977,34 @@ { CMPIStatus s = {CMPI_RC_OK, NULL}; virDomainPtr newdom = NULL; + virDomainPtr dom; + int i; + int ret; - if (virDomainUndefine(ldom) == -1) { + for (i = 0; i < MIGRATE_SHUTDOWN_TIMEOUT; i++) { + if ((i % 30) == 0) { + CU_DEBUG("Polling to undefine guest %s...", + virDomainGetName(ldom)); + } + + dom = virDomainLookupByName(virDomainGetConnect(ldom), + virDomainGetName(ldom)); + if (dom == NULL) { + CU_DEBUG("Unable to re-lookup domain"); + ret = -1; + break; + } + + ret = virDomainUndefine(dom); + virDomainFree(dom); + + if (ret == 0) + break; + + sleep(1); + } + + if (ret != 0) { CU_DEBUG("Undefine of local domain failed"); }

1 0

[PATCH] Make VCPU RASD Add/Remove fail and Modify behave correctly
by Dan Smith 29 May '08

29 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1212078794 25200 # Node ID 3f3dd6c106e07bc3c1dfc9a53947180ab893e44d # Parent 05a5ba2fda5d03facdea4e0cdfdc26d4a47d80fd Make VCPU RASD Add/Remove fail and Modify behave correctly With the recent VCPU changes, this needs to be in place for VSMS to function properly. Signed-off-by: Dan Smith <danms(a)us.ibm.com> Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 05a5ba2fda5d -r 3f3dd6c106e0 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Wed May 28 14:04:50 2008 -0700 +++ b/libxkutil/device_parsing.c Thu May 29 09:33:14 2008 -0700 @@ -1002,29 +1002,26 @@ return 1; } -static int change_vcpus(virDomainPtr dom, int delta) +static int change_vcpus(virDomainPtr dom, struct virt_device *dev) { int ret; - virDomainInfo info; - ret = virDomainGetInfo(dom, &info); - if (ret == -1) { - CU_DEBUG("Failed to get domain info for %s", - virDomainGetName(dom)); + if (dev->dev.vcpu.quantity <= 0) { + CU_DEBUG("Unable to set VCPU count to %i", + dev->dev.vcpu.quantity); return 0; } - ret = virDomainSetVcpus(dom, info.nrVirtCpu + delta); + ret = virDomainSetVcpus(dom, dev->dev.vcpu.quantity); if (ret == -1) { CU_DEBUG("Failed to set domain vcpus to %i", - info.nrVirtCpu + delta); + dev->dev.vcpu.quantity); return 0; } - CU_DEBUG("Changed %s vcpus from %i to %i", + CU_DEBUG("Changed %s vcpus to %i", virDomainGetName(dom), - info.nrVirtCpu, - info.nrVirtCpu + delta); + dev->dev.vcpu.quantity); return 1; } @@ -1034,8 +1031,6 @@ if ((dev->type == CIM_RES_TYPE_NET) || (dev->type == CIM_RES_TYPE_DISK)) return _change_device(dom, dev, true); - else if (dev->type == CIM_RES_TYPE_PROC) - return change_vcpus(dom, 1); CU_DEBUG("Unhandled device type %i", dev->type); @@ -1047,8 +1042,6 @@ if ((dev->type == CIM_RES_TYPE_NET) || (dev->type == CIM_RES_TYPE_DISK)) return _change_device(dom, dev, false); - else if (dev->type == CIM_RES_TYPE_PROC) - return change_vcpus(dom, -1); CU_DEBUG("Unhandled device type %i", dev->type); @@ -1059,6 +1052,8 @@ { if (dev->type == CIM_RES_TYPE_MEM) return change_memory(dom, dev); + else if (dev->type == CIM_RES_TYPE_PROC) + return change_vcpus(dom, dev); CU_DEBUG("Unhandled device type %i", dev->type); diff -r 05a5ba2fda5d -r 3f3dd6c106e0 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Wed May 28 14:04:50 2008 -0700 +++ b/libxkutil/xmlgen.c Thu May 29 09:33:14 2008 -0700 @@ -254,21 +254,17 @@ static bool vcpu_to_xml(char **xml, struct virt_device *dev) { - int count; int ret; + char *_xml; - if (*xml == NULL) { - ret = asprintf(xml, "<vcpu>1</vcpu>"); - return ret != -1; - } + ret = asprintf(&_xml, "<vcpu>%" PRIu64 "</vcpu>\n", + dev->dev.vcpu.quantity); + if (ret == -1) + return false; + else + astrcat(xml, _xml); - if (sscanf(*xml, "<vcpu>%i</vcpu>\n", &count) != 1) - return false; - - free(*xml); - ret = asprintf(xml, "<vcpu>%i</vcpu>\n", count + 1); - - return ret != -1; + return true; } static bool mem_to_xml(char **xml, struct virt_device *dev) diff -r 05a5ba2fda5d -r 3f3dd6c106e0 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed May 28 14:04:50 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Thu May 29 09:33:14 2008 -0700 @@ -447,6 +447,14 @@ return NULL; } +static const char *proc_rasd_to_vdev(CMPIInstance *inst, + struct virt_device *dev) +{ + cu_get_u64_prop(inst, "VirtualQuantity", &dev->dev.vcpu.quantity); + + return NULL; +} + static const char *_sysvirt_rasd_to_vdev(CMPIInstance *inst, struct virt_device *dev, uint16_t type) @@ -458,7 +466,7 @@ } else if (type == CIM_RES_TYPE_MEM) { return mem_rasd_to_vdev(inst, dev); } else if (type == CIM_RES_TYPE_PROC) { - return NULL; /* FIXME: replace when processor is done */ + return proc_rasd_to_vdev(inst, dev); } return "Resource type not supported on this platform";

2 1

[PATCH] [TEST] Add LXC support to AllocationCapabilities.01 & 02
by zli＠linux.vnet.ibm.com 29 May '08

29 May '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1212078285 -28800 # Node ID af35c2dcc8c55b876e03ac9535ff9365c95f2709 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Add LXC support to AllocationCapabilities.01 & 02 Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 3233a0703772 -r af35c2dcc8c5 suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py Fri May 30 00:24:45 2008 +0800 @@ -27,7 +27,8 @@ from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, platform_sup from CimTest.ReturnCodes import PASS, FAIL -@do_main(platform_sup) +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] +@do_main(sup_types) def main(): options = main.options diff -r 3233a0703772 -r af35c2dcc8c5 suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py --- a/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/02_alloccap_gi_errs.py Fri May 30 00:24:45 2008 +0800 @@ -71,7 +71,8 @@ procid = "%s/%s" % ("ProcessorPool", 0) rev = 463 -@do_main(platform_sup) +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] +@do_main(sup_types) def main(): options = main.options diff -r 3233a0703772 -r af35c2dcc8c5 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 00:24:45 2008 +0800 @@ -119,10 +119,16 @@ class KVM_MemoryPool(CIM_ResourcePool): pass +class LXC_MemoryPool(CIM_ResourcePool): + pass + class Xen_ProcessorPool(CIM_ResourcePool): pass class KVM_ProcessorPool(CIM_ResourcePool): + pass + +class LXC_ProcessorPool(CIM_ResourcePool): pass class Xen_VirtualSystemManagementCapabilities(CIM_VirtualSystemManagementCapabilities): @@ -149,10 +155,16 @@ class KVM_DiskPool(CIM_ResourcePool): pass +class LXC_DiskPool(CIM_ResourcePool): + pass + class Xen_NetworkPool(CIM_ResourcePool): pass class KVM_NetworkPool(CIM_ResourcePool): + pass + +class LXC_NetworkPool(CIM_ResourcePool): pass class Xen_VirtualSystemMigrationCapabilities(Virt_VirtualSystemMigrationCapabilities): @@ -165,6 +177,9 @@ pass class KVM_AllocationCapabilities(CIM_AllocationCapabilities): + pass + +class LXC_AllocationCapabilities(CIM_AllocationCapabilities): pass class Xen_VirtualSystemMigrationSettingData(CIM_VirtualSystemMigrationSettingData):

1 0

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

29 May '08

====================================== CIM Test Report for XenFV ====================================== Distro : RHEL 5.2 Beta Kernel : 2.6.18-88.el5xen Xen version : 3.1.2-88.el5 Libvirt : libvirt-0.3.3-7.el5 CIMOM : pegasus PyWBEM : pywbem-3.14 CIM Schema : cimv216Experimental LibCMPIutil : 79 LibVirtCIM : 592 CIMTEST : 160 ====================================== PASS : 87 FAIL : 19 [ 10 test cases passed when ran manually , so 9 tc are failing now] XFAIL : 1 SKIP : 22 ----------------- Total : 129 ====================================== List of tc that are failing: ComputerSystem - 03_defineVS.py: FAIL --Passed when run manually ComputerSystem - 04_defineStartVS.py: FAIL ComputerSystem - 06_paused_active_suspend.py: FAIL ComputerSystem - 23_suspend_suspend.py: FAIL ComputerSystem - 32_start_reboot.py: FAIL ComputerSystem - 33_suspend_reboot.py: FAIL ComputerSystem - 35_start_reset.py: FAIL ElementConforms - 01_forward.py: FAIL --Passed when run manually ElementConforms - 02_reverse.py: FAIL --Passed when run manually EnabledLogicalElementCapabilities - 01_enum.py: FAIL --Passed when run manually HostSystem - 02_hostsystem_to_rasd.py: FAIL --Passed when run manually LogicalDisk - 03_ld_gi_errs.py: FAIL --Passed when run manually Memory - 01_memory.py: FAIL --Passed when run manually NetworkPort - 01_netport.py: FAIL --Passed when run manually ResourceAllocationFromPool - 02_reverse.py: FAIL ResourceAllocationFromPool - 05_RAPF_err.py: FAIL --Passed when run manually VSSD - 04_vssd_to_rasd.py: FAIL --Passed when run manually VirtualSystemManagementService - 02_destroysystem.py: FAIL VirtualSystemManagementService - 08_modifyresource.py: FAIL Please find the complete report attached with the mail. Thanks and Regards, Deepti. Starting test suite: libvirt-cim Cleaned log files. Testing XenFV hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: FAIL ERROR - Failed to enumerate the class of Xen_ComputerSystem ERROR - Exception: No defined domain (domU1) is found ERROR - Error: property values are not set for VS domU1 ComputerSystem - 04_defineStartVS.py: FAIL ERROR - Error: property values are not set for VS domguest ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<00002> ComputerSystem - 06_paused_active_suspend.py: FAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain not running') ERROR - Unable to suspend dom DomST1 using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain not running ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 27_define_suspend_errs.py: PASS ComputerSystem - 32_start_reboot.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 33_suspend_reboot.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 35_start_reset.py: FAIL ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. ComputerSystem - 40_RSC_start.py: PASS ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: 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: FAIL ERROR - Failed to get associators information for ElementConformsToProfile ERROR - Exception: not enough arguments for format string ElementConforms - 02_reverse.py: FAIL ERROR - ERROR: Instance for domgst not created ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: SKIP ElementSettingData - 03_esd_assoc_with_rasd_errs.py: SKIP EnabledLogicalElementCapabilities - 01_enum.py: FAIL ERROR - Get domain list error, the number of domains is not equal EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: FAIL ERROR - Xen_HostSystem with CrossClass_GuestDom was not returned HostSystem - 03_hs_to_settdefcap.py: PASS HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: SKIP HostedDependency - 02_reverse.py: SKIP HostedDependency - 03_enabledstate.py: SKIP HostedDependency - 04_reverse_errs.py: SKIP HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: FAIL ERROR - Failed to get instance by the class of Xen_LogicalDisk ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (hd_domain/hda)') Memory - 01_memory.py: FAIL ERROR - Capacity should be 262144 MB instead of 131072 MB Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: FAIL ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: SKIP Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: SKIP Profile - 02_profile_to_elec.py: SKIP Profile - 03_rprofile_gi_errs.py: SKIP RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: FAIL ERROR - No associated pool for Domain-0/0 CIM_ERR_NOT_FOUND: No such instance (Domain-0/0) ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: FAIL ERROR - Xen_NetResourceAllocationSettingData returned 0 instances, excepted atleast 1 instance ERROR - ------FAILED: to verify the RAFP.------ ResourcePool - 01_enum.py: SKIP ResourcePool - 02_rp_gi_errors.py: SKIP ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.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: SKIP VSSD - 03_vssd_gi_errs.py: PASS VSSD - 04_vssd_to_rasd.py: FAIL ERROR - Xen_VirtualSystemSettingData with VSSDC_dom was not returned ERROR - Xen_VirtualSystemSettingData returned 0 VSSD objects, expected only 1 VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: PASS VirtualSystemManagementService - 02_destroysystem.py: FAIL ERROR - Unknow exception happened ERROR - (1, u'CIM_ERR_FAILED: Unable to retrieve domain name.') ERROR - Destroyed multiple domains InvokeMethod(DestroySystem): CIM_ERR_FAILED: Unable to retrieve domain name. VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: PASS VirtualSystemManagementService - 06_addresource.py: SKIP VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: FAIL ERROR - Error invoking ModifyRS ERROR - (1, u'CIM_ERR_FAILED: Failed to create domain') InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Failed to create domain VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS

1 0

[PATCH] Fix pool_member_of() for Net devices of type network
by Dan Smith 29 May '08

29 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1211984997 25200 # Node ID edf43e3ad962d666500b682a19aea71267be7e4b # Parent e987c6ce099434eddec21ca021eba5cd37c4e946 Fix pool_member_of() for Net devices of type network Some assumptions were made in this code about what the source field contained which were no longer correct when we added network (instead of bridge) support. This patch checks the type and interprets the field correctly. This fixes RAFP for domains with 'network' interfaces for me. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r e987c6ce0994 -r edf43e3ad962 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Tue May 20 10:33:56 2008 -0700 +++ b/src/Virt_DevicePool.c Wed May 28 07:29:57 2008 -0700 @@ -378,13 +378,20 @@ } static char *_netpool_member_of(virConnectPtr conn, - const char *bridge) + const struct net_device *ndev) { virNetworkPtr net = NULL; const char *netname; char *pool = NULL; - net = bridge_to_network(conn, bridge); + if (STREQ(ndev->type, "bridge")) + net = bridge_to_network(conn, ndev->source); + else if (STREQ(ndev->type, "network")) + net = virNetworkLookupByName(conn, ndev->source); + else { + CU_DEBUG("Unhandled network type `%s'", ndev->type); + } + if (net == NULL) goto out; @@ -395,7 +402,7 @@ if (asprintf(&pool, "NetworkPool/%s", netname) == -1) pool = NULL; - CU_DEBUG("Determined pool: %s (%s, %s)", pool, bridge, netname); + CU_DEBUG("Determined pool: %s (%s, %s)", pool, ndev->source, netname); out: virNetworkFree(net); @@ -435,7 +442,7 @@ for (i = 0; i < count; i++) { if (STREQ((devs[i].id), dev)) { result = _netpool_member_of(conn, - devs[i].dev.net.source); + &devs[i].dev.net); break; } }

3 2

[PATCH] [TEST] LXC support for ComputerSystem.01, 02, 04, 05, 06, 22 & 23
by zli＠linux.vnet.ibm.com 29 May '08

29 May '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1212078375 -28800 # Node ID 03df2f209f12969e86dbb0e7c5de0ce97e2a8c53 # Parent af35c2dcc8c55b876e03ac9535ff9365c95f2709 [TEST] LXC support for ComputerSystem.01, 02, 04, 05, 06, 22 & 23 Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r af35c2dcc8c5 -r 03df2f209f12 suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Fri May 30 00:26:15 2008 +0800 @@ -30,7 +30,7 @@ from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL -SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV'] +SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(SUPPORTED_TYPES) def main(): diff -r af35c2dcc8c5 -r 03df2f209f12 suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Fri May 30 00:26:15 2008 +0800 @@ -31,7 +31,7 @@ from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def clean_system(host, virt): l = live.domain_list(host, virt) diff -r af35c2dcc8c5 -r 03df2f209f12 suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Fri May 30 00:26:15 2008 +0800 @@ -38,7 +38,7 @@ from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domguest" @do_main(sup_types) diff -r af35c2dcc8c5 -r 03df2f209f12 suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Fri May 30 00:26:15 2008 +0800 @@ -50,7 +50,7 @@ from XenKvmLib.common_util import call_request_state_change from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "DomST1" mem = 128 # MB bug_no = "00002" diff -r af35c2dcc8c5 -r 03df2f209f12 suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Fri May 30 00:26:15 2008 +0800 @@ -51,7 +51,7 @@ from XenKvmLib.common_util import call_request_state_change from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "DomST1" mem = 128 # MB # Keeping the bug no for future reference diff -r af35c2dcc8c5 -r 03df2f209f12 suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Fri May 30 00:26:15 2008 +0800 @@ -37,7 +37,7 @@ from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domgst" @do_main(sup_types) diff -r af35c2dcc8c5 -r 03df2f209f12 suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/23_suspend_suspend.py Fri May 30 00:26:15 2008 +0800 @@ -47,7 +47,7 @@ from XenKvmLib.common_util import create_using_definesystem from XenKvmLib.common_util import call_request_state_change -sup_types = ['Xen', 'XenFV'] +sup_types = ['Xen', 'XenFV', 'LXC'] ACTIVE_STATE = 2 SUSPND_STATE = 9

3 2

[PATCH] [TEST] LXC support using DefineSystem & VSMS.01
by zli＠linux.vnet.ibm.com 29 May '08

29 May '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1212085020 -28800 # Node ID 555aeb0c467907a683e208d87ec67bb083d3d9e0 # Parent 9520aaa2b61210bb2038b5bf3be5bed3b711c78e [TEST] LXC support using DefineSystem & VSMS.01 Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 9520aaa2b612 -r 555aeb0c4679 suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Fri May 30 00:30:02 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Fri May 30 02:17:00 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.Globals import do_main from CimTest.Globals import logger -SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV'] +SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] default_dom = 'test_domain' @do_main(SUPPORTED_TYPES) diff -r 9520aaa2b612 -r 555aeb0c4679 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 30 00:30:02 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 30 02:17:00 2008 +0800 @@ -85,3 +85,4 @@ #vxml.LXCXML LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init') LXC_default_tty = '/dev/ptmx' +LXC_default_mp = '/tmp' diff -r 9520aaa2b612 -r 555aeb0c4679 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri May 30 00:30:02 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri May 30 02:17:00 2008 +0800 @@ -66,6 +66,9 @@ class KVM_VirtualSystemManagementService(CIM_VirtualSystemManagementService): pass +class LXC_VirtualSystemManagementService(CIM_VirtualSystemManagementService): + pass + @eval_cls('VirtualSystemManagementService') def get_vsms_class(virt): pass @@ -99,6 +102,8 @@ self.isFullVirt = (type == 'KVM' or virt == 'XenFV') if self.isFullVirt: self.BootDevice = 'hd' + elif type == 'LXC': + self.InitPath = const.LXC_init_path else: self.Bootloader = live.bootloader(Globals.CIM_IP, 0) self.BootloaderArgs = '' @@ -110,6 +115,9 @@ pass class KVM_VirtualSystemSettingData(CIM_VirtualSystemSettingData): + pass + +class LXC_VirtualSystemSettingData(CIM_VirtualSystemSettingData): pass @eval_cls('VirtualSystemSettingData') @@ -131,6 +139,11 @@ class KVM_DiskResourceAllocationSettingData(CIM_DiskResourceAllocationSettingData): pass + +class LXC_DiskResourceAllocationSettingData(CIMClassMOF): + def __init__(self, mountpoint, name): + self.MountPoint = mountpoint + self.InstanceID = '%s/%s' % (name, mountpoint) @eval_cls('DiskResourceAllocationSettingData') def get_dasd_class(virt): @@ -154,6 +167,9 @@ class KVM_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData): pass +class LXC_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData): + pass + @eval_cls('NetResourceAllocationSettingData') def get_nasd_class(virt): pass @@ -172,6 +188,9 @@ pass class KVM_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData): + pass + +class LXC_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData): pass @eval_cls('ProcResourceAllocationSettingData') @@ -194,6 +213,9 @@ class KVM_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): pass +class LXC_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): + pass + @eval_cls('MemResourceAllocationSettingData') def get_masd_class(virt): pass @@ -208,18 +230,25 @@ virt='Xen'): class_vssd = get_vssd_class(virt) vssd = class_vssd(name=dom_name, virt=virt) + + # LXC only takes disk and memory device for now. + # Only disk __init__ takes different params. + if virt == 'LXC': + d = LXC_DiskResourceAllocationSettingData( + mountpoint=const.LXC_default_mp, name=dom_name) + else: + class_dasd = get_dasd_class(virt) + if virt == 'KVM': + disk_dev = 'hda' + disk_source = const.KVM_disk_path + elif virt == 'XenFV': + disk_dev = 'hda' + disk_source = const.XenFV_disk_path + d = class_dasd( + dev=disk_dev, + source=disk_source, + name=dom_name) - class_dasd = get_dasd_class(virt) - if virt == 'KVM': - disk_dev = 'hda' - disk_source = const.KVM_disk_path - elif virt == 'XenFV': - disk_dev = 'hda' - disk_source = const.XenFV_disk_path - d = class_dasd( - dev=disk_dev, - source=disk_source, - name=dom_name) class_nasd = get_nasd_class(virt) if virt == 'KVM': net_mac= const.KVM_default_mac @@ -237,6 +266,6 @@ m = class_masd( megabytes=mem_mb, name=dom_name) - + return vssd.mof(), [d.mof(), n.mof(), p.mof(), m.mof()]

3 2

[PATCH] Set processor device type and id in parse_vcpu_device()
by Kaitlin Rupert 28 May '08

28 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1212005642 25200 # Node ID 19c940c809dde457eb16af15a9de0cb4ad87df1c # Parent e987c6ce099434eddec21ca021eba5cd37c4e946 Set processor device type and id in parse_vcpu_device(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r e987c6ce0994 -r 19c940c809dd libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Tue May 20 10:33:56 2008 -0700 +++ b/libxkutil/device_parsing.c Wed May 28 13:14:02 2008 -0700 @@ -351,6 +351,9 @@ goto err; list->dev.vcpu.quantity = count; + + list->type = CIM_RES_TYPE_PROC; + list->id = strdup("proc"); *vdevs = list;

1 0

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

28 May '08

======================================================================== CIM Test Report for KVM on F9 with latest libvirt-cim and libcmpiutil ======================================================================== Distro : Fedora 9 Beta Kernel : 2.6.25-0.121.rc5.git4.fc9 Libvirt : libvirt-0.4.2-1.fc9.x86_64 CIMOM : pegasus PyWBEM : pywbem-0.6 CIM Schema : cimv216Experimental LibCMPIutil : 79 LibVirtCIM : 592 CIMTEST : 159 ======================================================= PASS : 102 FAIL : 9 XFAIL : 2 SKIP : 16 ----------------- Total : 129 ======================================================= List of tc that are failing HostSystem - 02_hostsystem_to_rasd.py: FAIL NetworkPort - 01_netport.py: FAIL RASD - 01_verify_rasd_fields.py: FAIL ResourceAllocationFromPool - 02_reverse.py: FAIL ResourceAllocationFromPool - 05_RAPF_err.py: FAIL All the above fail because of the KVMXML changes. Will be submitting fix for them. NetworkPort - 03_user_netport.py: FAIL VSSD - 03_vssd_gi_errs.py: FAIL VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: FAIL VirtualSystemManagementService - 08_modifyresource.py: FAIL Please find the complete report attached with the mail. Thanks and Regards, Deepti. Starting test suite: libvirt-cim Cleaned log files. Testing KVM hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<00002> ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from suspend State to Activate state was not Successful Bug:<00002> ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: SKIP ComputerSystem - 27_define_suspend_errs.py: SKIP ComputerSystem - 32_start_reboot.py: SKIP ComputerSystem - 33_suspend_reboot.py: SKIP ComputerSystem - 35_start_reset.py: SKIP ComputerSystem - 40_RSC_start.py: PASS ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: PASS ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS EnabledLogicalElementCapabilities - 01_enum.py: PASS EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: FAIL ERROR - NetworkType Mismatch ERROR - Returned network instead of bridge or ethernet ERROR - Mistmatching association values HostSystem - 03_hs_to_settdefcap.py: PASS HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: PASS HostedDependency - 02_reverse.py: PASS HostedDependency - 03_enabledstate.py: PASS HostedDependency - 04_reverse_errs.py: PASS HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: PASS Memory - 01_memory.py: PASS Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: FAIL ERROR - LinkTechnology should be set to `2' instead of `0' ERROR - Checked interface 00:11:22:33:44:55 NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: FAIL ERROR - user is not a valid network type Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: PASS Profile - 02_profile_to_elec.py: SKIP Profile - 03_rprofile_gi_errs.py: SKIP RASD - 01_verify_rasd_fields.py: FAIL ERROR - NetworkType Mismatch ERROR - Returned network instead of bridge or ethernet ERROR - Mistmatching association values RASD - 02_enum.py: PASS RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: FAIL ERROR - No associated pool for demo2/0 CIM_ERR_NOT_FOUND: No such instance (demo2/0) ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: FAIL ERROR - LookupError : Zero or multiple nodes found for XPath/domain/devices/interface/source 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 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 - 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: FAIL ERROR - Error invoking ModifyRS ERROR - Error changing rs for net mac VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS

1 0

[PATCH] Add a default pool configuration file to be installed when libvirt version
by Dan Smith 27 May '08

27 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1211900260 25200 # Node ID 27e8f7a666411251f721bfac9030a00f391c8855 # Parent f00dd77c664c258551c5f884a0bee5d842241e4e Add a default pool configuration file to be installed when libvirt version is older than 0.4.0 Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r f00dd77c664c -r 27e8f7a66641 Makefile.am --- a/Makefile.am Tue May 20 11:24:39 2008 -0400 +++ b/Makefile.am Tue May 27 07:57:40 2008 -0700 @@ -101,7 +101,8 @@ EXTRA_DIST = schema $(pkgdata_DATA) $(pkgdata_SCRIPTS) \ libvirt-cim.spec.in libvirt-cim.spec \ doc/CodingStyle doc/SubmittingPatches \ - .changeset .revision + .changeset .revision \ + examples/diskpool.conf preinstall: sh -x base_schema/install_base_schema.sh `pwd`/base_schema @@ -111,6 +112,7 @@ postinstall: sh provider-register.sh -v -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) + virsh -v | grep -q '^0.3' && cp examples/diskpool.conf $(DISK_POOL_CONFIG) || true preuninstall: sh provider-register.sh -v -d -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS) diff -r f00dd77c664c -r 27e8f7a66641 acinclude.m4 --- a/acinclude.m4 Tue May 20 11:24:39 2008 -0400 +++ b/acinclude.m4 Tue May 27 07:57:40 2008 -0700 @@ -312,6 +312,8 @@ AC_DEFUN([DEFINE_DISK_CONFIG], [ AC_DEFINE_UNQUOTED([DISK_POOL_CONFIG], "$1", [Disk pool config filepath.]) + DISK_POOL_CONFIG=$1 + AC_SUBST(DISK_POOL_CONFIG) ] ) diff -r f00dd77c664c -r 27e8f7a66641 examples/diskpool.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/diskpool.conf Tue May 27 07:57:40 2008 -0700 @@ -0,0 +1,1 @@ +Default /

2 1

[PATCH] [TEST] Fixing the tc which failed bcs of the vxml.py and const.py changes for KVM
by Deepti B. Kalakeri 27 May '08

27 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211886844 25200 # Node ID 6a273db93afc6cd02702eb090251854ad74a7ff2 # Parent ec679dca161f99a00dfae18dd360f17611d4a1ba [TEST] Fixing the tc which failed bcs of the vxml.py and const.py changes for KVM. This patch needs the changes made to KVMXML to make use network as the deafult net_type. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r ec679dca161f -r 6a273db93afc suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Tue May 27 03:25:54 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Tue May 27 04:14:04 2008 -0700 @@ -58,7 +58,7 @@ from CimTest.ReturnCodes import PASS, FA from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \ verify_diskrasd_values, verify_memrasd_values -from XenKvmLib.const import CIM_REV +from XenKvmLib.const import CIM_REV, KVM_default_net_type sup_types = ['Xen', 'KVM', 'XenFV'] @@ -103,11 +103,14 @@ def init_list(vsxml, virt="Xen"): "VirtualQuantity" : (test_mem * 1024), } } + if virt == 'KVM': + rasd_values[net_cn]['ntype2'] = KVM_default_net_type + if CIM_REV < rev: - rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes" + rasd_values[mem_cn]['AllocationUnits'] = "MegaBytes" if CIM_REV < proc_instid_rev: - rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0) + rasd_values[proc_cn]['InstanceID'] = '%s/%s' %(test_dom, 0) return rasd_values diff -r ec679dca161f -r 6a273db93afc suites/libvirt-cim/cimtest/NetworkPort/01_netport.py --- a/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Tue May 27 03:25:54 2008 -0700 +++ b/suites/libvirt-cim/cimtest/NetworkPort/01_netport.py Tue May 27 04:14:04 2008 -0700 @@ -39,11 +39,13 @@ from CimTest.Globals import logger from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC +from XenKvmLib import const sup_types = ['Xen', 'KVM', 'XenFV'] test_dom = "test_domain" test_mac = "00:11:22:33:44:55" +const.KVM_default_net_type='bridge' @do_main(sup_types) def main(): diff -r ec679dca161f -r 6a273db93afc suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Tue May 27 03:25:54 2008 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Tue May 27 04:14:04 2008 -0700 @@ -54,7 +54,7 @@ from XenKvmLib import vxml from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from XenKvmLib import rasd -from XenKvmLib.const import CIM_REV +from XenKvmLib.const import CIM_REV, KVM_default_net_type from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL @@ -81,6 +81,9 @@ def init_list(xml, disk, virt="Xen"): "ntype1" : "bridge", "ntype2" : "ethernet", "CreationClassName" : get_typed_class(virt, rasd.nasd_cn)} + if virt == 'KVM': + netrasd['ntype2'] = KVM_default_net_type + address = xml.xml_get_disk_source() diskrasd = { "InstanceID" : '%s/%s' % (test_dom, disk), diff -r ec679dca161f -r 6a273db93afc suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py Tue May 27 03:25:54 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py Tue May 27 04:14:04 2008 -0700 @@ -55,10 +55,12 @@ from CimTest.Globals import do_main, pla from CimTest.Globals import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib import const test_dom = "RAPF_domain" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 +const.KVM_default_net_type='bridge' def get_unique_bridge(): bridge = "invalid-bridge"

2 1

[PATCH] [TEST] Modifying the KVMXML to make use network as the deafult net_type
by Deepti B. Kalakeri 27 May '08

27 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211804430 25200 # Node ID 3e9db2a1534d0565e06596b3ebebd33c09bd6587 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Modifying the KVMXML to make use network as the deafult net_type. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 3233a0703772 -r 3e9db2a1534d suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Mon May 26 05:20:30 2008 -0700 @@ -66,7 +66,7 @@ KVM_secondary_disk_path = os.path.join(_ KVM_secondary_disk_path = os.path.join(_image_dir, 'default-kvm-dimage.2ND') KVM_default_disk_dev = 'hda' KVM_default_mac = '11:22:33:aa:bb:cc' -KVM_default_net_type = 'bridge' +KVM_default_net_type = 'network' # vxml.XenFVXML s, o = platform.architecture() diff -r 3233a0703772 -r 3e9db2a1534d suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon May 26 05:20:30 2008 -0700 @@ -574,8 +574,30 @@ class KVMXML(VirtXML): interface = self.add_sub_node(devices, 'interface', type=net_type) self.add_sub_node(interface, 'mac', address=net_mac) + if net_type == 'bridge': self.set_vbridge(CIM_IP) + elif net_type == 'network': + self.set_vnetwork(interface) + else: + logger.error("%s is not a valid network type", net_type) + sys.exit(1) + + def set_vnetwork(self, interface): + network_list = live.net_list(CIM_IP, virt='KVM') + if len(network_list) > 0: + nname = network_list[0] + else: + logger.info('No virutal network found') + logger.info('Trying to create one ......') + netxml = NetXML(CIM_IP, virt='KVM') + ret = netxml.create_vnet() + if not ret: + logger.error('Failed to create the virtual network "%s"', + netxml.net_name) + sys.exit(SKIP) + nname = netxml.xml_get_netpool_name() + self.add_sub_node(interface, 'source', network=nname) def set_emulator(self, emu): return self._set_emulator(emu)

2 1

[PATCH] [TEST] Update EnabledLogicalElementCapabilities.01&02 for LXC support
by yunguol＠cn.ibm.com 27 May '08

27 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211896734 -28800 # Node ID d84f01d8f9583427271f4238d953e0587fb8a82a # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Update EnabledLogicalElementCapabilities.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3233a0703772 -r d84f01d8f958 suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/01_enum.py Tue May 27 21:58:54 2008 +0800 @@ -29,7 +29,7 @@ from VirtLib import live from VirtLib import utils -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(sup_types) def main(): diff -r 3233a0703772 -r d84f01d8f958 suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py --- a/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/EnabledLogicalElementCapabilities/02_elecap_gi_errs.py Tue May 27 21:58:54 2008 +0800 @@ -58,7 +58,7 @@ from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { "invalid_instid_keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \ diff -r 3233a0703772 -r d84f01d8f958 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue May 27 21:58:54 2008 +0800 @@ -141,6 +141,9 @@ pass class KVM_EnabledLogicalElementCapabilities(CIM_EnabledLogicalElementCapabilities): + pass + +class LXC_EnabledLogicalElementCapabilities(CIM_EnabledLogicalElementCapabilities): pass class Xen_DiskPool(CIM_ResourcePool):

1 0

[PATCH] [TEST] Make RHEL 5 XenFV guest grub conf use hda
by Kaitlin Rupert 27 May '08

27 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1211564341 25200 # Node ID 10f6cc2ec9940971f636bfd10b9f518c4c5d1487 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Make RHEL 5 XenFV guest grub conf use hda. It looks like qemu on RHEL emulates an ide drive, not a scsi drive. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 3233a0703772 -r 10f6cc2ec994 suites/libvirt-cim/images/xmt-makefv.sh --- a/suites/libvirt-cim/images/xmt-makefv.sh Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/images/xmt-makefv.sh Fri May 23 10:39:01 2008 -0700 @@ -14,6 +14,8 @@ PARTED="parted -s" TMPMOUNT=/tmp/cimtest_image_temp SIZE=16 + +IS_RHEL=`cat /etc/issue | awk 'BEGIN { FS = "Red Hat Enterprise Linux Server"} ; { print $2 }'` die() { echo "FAILED: $i" >&2 @@ -110,10 +112,19 @@ timeout 1 title Test Environment root (hd0,0) +EOF + +if [ -z $IS_RHEL]; then + cat >>${root}/grub/grub.conf <<EOF + kernel /vmlinuz root=/dev/hda1 + initrd /initrd +EOF +else + cat >>${root}/grub/grub.conf <<EOF kernel /vmlinuz root=/dev/sda1 initrd /initrd EOF - +fi } ramdisk=$1

2 1

[PATCH] [TEST] Update HostedService.01~04 for LXC support
by yunguol＠cn.ibm.com 27 May '08

27 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211895201 -28800 # Node ID 0d0b144585dd37e68e1e4d6086954743e897f014 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Update HostedService.01~04 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Tue May 27 21:33:21 2008 +0800 @@ -31,7 +31,7 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @do_main(sup_types) def main(): diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Tue May 27 21:33:21 2008 +0800 @@ -31,7 +31,7 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @do_main(sup_types) def main(): diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Tue May 27 21:33:21 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance" diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Tue May 27 21:33:21 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance" diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/lib/XenKvmLib/hostsystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/hostsystem.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/hostsystem.py Tue May 27 21:33:21 2008 +0800 @@ -50,6 +50,9 @@ class KVM_HostSystem(CIM_System): pass +class LXC_HostSystem(CIM_System): + pass + def enumerate(server, virt='Xen'): conn = pywbem.WBEMConnection('http://%s' % server, diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/lib/XenKvmLib/rpcs.py --- a/suites/libvirt-cim/lib/XenKvmLib/rpcs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/rpcs.py Tue May 27 21:33:21 2008 +0800 @@ -50,6 +50,8 @@ class KVM_ResourcePoolConfigurationService(CIM_ResourcePoolConfigurationService): pass +class LXC_ResourcePoolConfigurationService(CIM_ResourcePoolConfigurationService): + pass def enumerate(server, classname): conn = pywbem.WBEMConnection('http://%s' % server, diff -r 3233a0703772 -r 0d0b144585dd suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Tue May 27 21:33:21 2008 +0800 @@ -64,6 +64,9 @@ pass class KVM_VirtualSystemManagementService(CIM_VirtualSystemManagementService): + pass + +class LXC_VirtualSystemManagementService(CIM_VirtualSystemManagementService): pass @eval_cls('VirtualSystemManagementService')

1 0

[PATCH] [TEST] Update VirtualSystemMigrationCapabilities.01&02 for LXC support
by yunguol＠cn.ibm.com 27 May '08

27 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211894553 -28800 # Node ID 15ed90e6683e593cd63664a80e67e662323bb4e6 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] Update VirtualSystemMigrationCapabilities.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3233a0703772 -r 15ed90e6683e suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/01_enum.py Tue May 27 21:22:33 2008 +0800 @@ -28,7 +28,7 @@ from CimTest.Globals import CIM_ERROR_ENUMERATE, logger, do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] def print_error(fieldname, ret_value, exp_value): logger.error("%s Mismatch", fieldname) diff -r 3233a0703772 -r 15ed90e6683e suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationCapabilities/02_vsmc_gi_errs.py Tue May 27 21:22:33 2008 +0800 @@ -54,7 +54,7 @@ from XenKvmLib.common_util import try_getinstance from XenKvmLib.classes import get_typed_class -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] expr_values = { "invalid_instid" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ diff -r 3233a0703772 -r 15ed90e6683e suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue May 27 21:22:33 2008 +0800 @@ -159,6 +159,9 @@ pass class KVM_VirtualSystemMigrationCapabilities(Virt_VirtualSystemMigrationCapabilities): + pass + +class LXC_VirtualSystemMigrationCapabilities(Virt_VirtualSystemMigrationCapabilities): pass class Xen_AllocationCapabilities(CIM_AllocationCapabilities):

1 0

[PATCH] [TEST] update ResourcePoolConfigurationCapabilities.01&02 for LXC support
by yunguol＠cn.ibm.com 27 May '08

27 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211894322 -28800 # Node ID 5e78986367dbd60e05c9f3720935b09404542928 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] update ResourcePoolConfigurationCapabilities.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3233a0703772 -r 5e78986367db suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py Tue May 27 21:18:42 2008 +0800 @@ -27,7 +27,7 @@ from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @do_main(sup_types) def main(): diff -r 3233a0703772 -r 5e78986367db suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py Tue May 27 21:18:42 2008 +0800 @@ -54,7 +54,7 @@ from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.common_util import try_getinstance -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] expr_values = { "invalid_instid" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ diff -r 3233a0703772 -r 5e78986367db suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue May 27 21:18:42 2008 +0800 @@ -135,6 +135,9 @@ pass class KVM_ResourcePoolConfigurationCapabilities(CIM_ResourcePoolConfigurationCapabilities): + pass + +class LXC_ResourcePoolConfigurationCapabilities(CIM_ResourcePoolConfigurationCapabilities): pass class Xen_EnabledLogicalElementCapabilities(CIM_EnabledLogicalElementCapabilities):

1 0

Cimtest Report on KVM (2008/05/26)
by Guo Lian Yun 27 May '08

27 May '08

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

2 1

[PATCH] [TEST] Fixing tc 02_reverse.py of SettingDefineState
by Deepti B. Kalakeri 27 May '08

27 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211889137 25200 # Node ID 704d68b194d415c97678531930117d3d632ef5fa # Parent 6a273db93afc6cd02702eb090251854ad74a7ff2 [TEST] Fixing tc 02_reverse.py of SettingDefineState. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 6a273db93afc -r 704d68b194d4 suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Tue May 27 04:14:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Tue May 27 04:52:17 2008 -0700 @@ -59,6 +59,7 @@ from XenKvmLib import vxml from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class, get_class_basename from XenKvmLib.rasd import InstId_err +from XenKvmLib.const import CIM_REV sup_types = ['Xen', 'KVM', 'XenFV'] @@ -67,6 +68,8 @@ test_vcpus = 1 test_vcpus = 1 test_mem = 128 test_mac = "00:11:22:33:44:aa" +proc_instid_rev = 590 + def call_assoc(ip, inst, exp_id, ccn, virt): @@ -189,6 +192,10 @@ def main(): 'NetResourceAllocationSettingData' : '%s/%s' % (test_dom, test_mac), 'DiskResourceAllocationSettingData' : '%s/%s' % (test_dom, test_disk), 'MemResourceAllocationSettingData' : '%s/%s' % (test_dom, 'mem')} + + if CIM_REV < proc_instid_rev : + rasd_devid['ProcResourceAllocationSettingData'] = "%s/%s" % (test_dom, "0") + global dev_devid dev_devid = { 'Processor' : '%s/%s' % (test_dom, test_vcpus-1),

1 0

[PATCH] [TEST] Add graphics and input devices to XenFV guest XML
by Kaitlin Rupert 23 May '08

23 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1211564341 25200 # Node ID d1f390aa4b58329816be4f562c6a75e28e8b15aa # Parent 10f6cc2ec9940971f636bfd10b9f518c4c5d1487 [TEST] Add graphics and input devices to XenFV guest XML. Also add pae, acpi, apic features. Adding these tags fixes several issues: -The ramdisk is 32 bit, so we need to use pae in order to boot properly. -The guest uses a graphical console, so we need to define one in order to start the guest. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 10f6cc2ec994 -r d1f390aa4b58 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri May 23 10:39:01 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri May 23 10:39:01 2008 -0700 @@ -260,6 +260,7 @@ self.add_sub_node(domain, 'name', name) self.add_sub_node(domain, 'uuid', uuid) + self.add_sub_node(domain, 'features') self.add_sub_node(domain, 'os') self.add_sub_node(domain, 'memory', mem * 1024) self.add_sub_node(domain, 'vcpu', vcpu) @@ -601,9 +602,16 @@ logger.error('Error: Disk image does not exist') sys.exit(1) VirtXML.__init__(self, 'xen', test_dom, set_uuid(), mem, vcpus) + self._features() self._os(const.XenFV_default_loader) self._devices(const.XenFV_default_emulator, const.XenFV_default_net_type, mac, disk_file_path, disk) + + def _features(self): + features = self.get_node('/domain/features') + self.add_sub_node(features, 'pae') + self.add_sub_node(features, 'acpi') + self.add_sub_node(features, 'apic') def _os(self, os_loader): os = self.get_node('/domain/os') @@ -615,6 +623,9 @@ devices = self.get_node('/domain/devices') self.add_sub_node(devices, 'emulator', emu) + self.add_sub_node(devices, 'graphics', type='vnc', port='5900', + keymap='en-us') + self.add_sub_node(devices, 'input', type='mouse', bus='xen') interface = self.add_sub_node(devices, 'interface', type=net_type) self.add_sub_node(interface, 'mac', address=net_mac)

1 0

[PATCH] [TEST]4# bundles of patch for LXC support
by yunguol＠cn.ibm.com 23 May '08

23 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1211537668 -28800 # Node ID 0a4ecb2ab4c495e8f52dfbaf2a0ce6a22d54a8b7 # Parent 2039130968f0c4e19234dcfbba9940eddbcd7325 [TEST]4# bundles of patch for LXC support Move the init_path file to be part of undefine and destroy step Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 2039130968f0 -r 0a4ecb2ab4c4 lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Wed May 21 06:37:47 2008 -0700 +++ b/lib/CimTest/Globals.py Fri May 23 18:14:28 2008 +0800 @@ -66,8 +66,8 @@ parser.add_option("-i", "--ip", dest="ip", default="localhost", help="IP address of machine to test, default: localhost") parser.add_option("-v", "--virt", dest="virt", type="choice", - choices=platform_sup, default="Xen", - help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV', default: Xen") + choices=['Xen', 'KVM', 'XenFV', 'LXC'], default="Xen", + help="Virt type, select from: 'Xen' & 'KVM' & 'XenFV' & 'LXC', default: Xen") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr") diff -r 2039130968f0 -r 0a4ecb2ab4c4 lib/VirtLib/utils.py --- a/lib/VirtLib/utils.py Wed May 21 06:37:47 2008 -0700 +++ b/lib/VirtLib/utils.py Fri May 23 18:14:28 2008 +0800 @@ -161,5 +161,7 @@ return "xen:///" if virt == "KVM": return "qemu:///system" + if virt == "LXC": + return "lxc:///system" return "" diff -r 2039130968f0 -r 0a4ecb2ab4c4 suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Wed May 21 06:37:47 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Fri May 23 18:14:28 2008 +0800 @@ -35,7 +35,7 @@ from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domU1" @do_main(sup_types) diff -r 2039130968f0 -r 0a4ecb2ab4c4 suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Wed May 21 06:37:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Fri May 23 18:14:28 2008 +0800 @@ -19,7 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -virt_types = ['Xen', 'KVM', 'XenFV'] +virt_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def get_typed_class(virt, basename): if virt not in virt_types: diff -r 2039130968f0 -r 0a4ecb2ab4c4 suites/libvirt-cim/lib/XenKvmLib/computersystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Wed May 21 06:37:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Fri May 23 18:14:28 2008 +0800 @@ -69,6 +69,9 @@ class KVM_ComputerSystem(CIM_System): pass +class LXC_ComputerSystem(CIM_System): + pass + def get_cs_class(virt): if virt in virt_types: return eval(get_typed_class(virt, 'ComputerSystem')) diff -r 2039130968f0 -r 0a4ecb2ab4c4 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Wed May 21 06:37:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 23 18:14:28 2008 +0800 @@ -81,3 +81,7 @@ XenFV_default_disk_dev = 'hda' XenFV_default_mac = '00:16:3e:5d:c7:9e' XenFV_default_net_type = 'bridge' + +#vxml.LXCXML +LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init') +LXC_default_tty = '/dev/ptmx' diff -r 2039130968f0 -r 0a4ecb2ab4c4 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed May 21 06:37:47 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri May 23 18:14:28 2008 +0800 @@ -141,6 +141,8 @@ self.vuri = 'xen:///' elif vir_type == 'kvm': self.vuri = 'qemu:///system' + elif vir_type == 'lxc': + self.vuri = 'lxc:///system' def run(self, ip, vcmd, param): file_arg_cmds = ['define', 'create', 'net-create', 'pool-create', 'pool-destroy'] @@ -280,7 +282,7 @@ raise NotImplementedError('virtual method, implement your own') def issubinstance(self): - return isinstance(self, (XenXML, KVMXML, XenFVXML)) + return isinstance(self, (XenXML, KVMXML, XenFVXML, LXCXML)) def set_memory(self, mem): self.set_cdata('/domain/memory', mem * 1024) @@ -308,6 +310,8 @@ return self.run(ip, 'define', self.xml_string) def undefine(self, ip): + if os.path.exists(const.LXC_init_path): + os.remove(const.LXC_init_path) return self.run(ip, 'undefine', self.dname) def start(self, ip): @@ -317,6 +321,8 @@ return self.run(ip, 'stop', self.dname) def destroy(self, ip): + if os.path.exists(const.LXC_init_path): + os.remove(const.LXC_init_path) return self.run(ip, 'destroy', self.dname) def create(self, ip): @@ -627,6 +633,37 @@ def set_vbridge(self, ip): return self._set_vbridge(ip, 'XenFV') +class LXCXML(VirtXML): + + def __init__(self, test_dom=const.default_domname, + mem=const.default_memory, + vcpus=const.default_vcpus, + tty=const.LXC_default_tty): + VirtXML.__init__(self, 'lxc', test_dom, set_uuid(), mem, vcpus) + self._os(const.LXC_init_path) + self._devices(const.LXC_default_tty) + self.create_lxc_file(CIM_IP, const.LXC_init_path) + + def _os(self, os_init): + os = self.get_node('/domain/os') + self.add_sub_node(os, 'init', os_init) + + def _devices(self, tty): + devices = self.get_node('/domain/devices') + + interface = self.add_sub_node(devices, 'console', tty) + + def create_lxc_file(self, ip, lxc_file): + try: + f = open(lxc_file, 'w') + f.write('%s' % 'exec /bin/sh') + cmd = 'chmod +x %s' % lxc_file + s, o = utils.run_remote(ip, cmd) + f.close() + except Exception: + logger.error("Creation of LXC file Failed") + return False + def get_class(virt): if virt in virt_types: diff -r 2039130968f0 -r 0a4ecb2ab4c4 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Wed May 21 06:37:47 2008 -0700 +++ b/suites/libvirt-cim/main.py Fri May 23 18:14:28 2008 +0800 @@ -50,8 +50,8 @@ action="store_true", dest="clean", help="Will remove existing log files before test run") parser.add_option("-v", "--virt", dest="virt", type="choice", - choices=platform_sup, default="Xen", - help="Virt type, select from 'Xen' & 'KVM' & 'XenFV'(default: Xen). ") + choices=['Xen', 'KVM', 'XenFV', 'LXC'], default="Xen", + help="Virt type, select from 'Xen' & 'KVM' & 'XenFV' & 'LXC'(default: Xen). ") parser.add_option("-d", "--debug-output", action="store_true", dest="debug", help="Duplicate the output to stderr")

1 0

[PATCH 0 of 2] [TEST] Cleanup XFAIL tests.
by Kaitlin Rupert 22 May '08

22 May '08

2 3

[PATCH] [TEST] Fixing tc 05_destroysystem_neg.py of VirtualSystemManagementService
by Deepti B. Kalakeri 22 May '08

22 May '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1211459246 25200 # Node ID 41f9bf4831ff672dfc36de4510bf5c33d5a29154 # Parent 2039130968f0c4e19234dcfbba9940eddbcd7325 [TEST] Fixing tc 05_destroysystem_neg.py of VirtualSystemManagementService. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 2039130968f0 -r 41f9bf4831ff suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Wed May 21 06:37:47 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/05_destroysystem_neg.py Thu May 22 05:27:26 2008 -0700 @@ -27,44 +27,73 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import vsms from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import CIM_REV from XenKvmLib.test_doms import undefine_test_domain from CimTest.Globals import logger from CimTest.Globals import do_main from CimTest.ReturnCodes import FAIL, PASS, SKIP sup_types = ['Xen', 'KVM', 'XenFV'] +vsms_status_version = 534 def destroysystem_fail(tc, options): service = vsms.get_vsms_class(options.virt)(options.ip) classname = get_typed_class(options.virt, 'ComputerSystem') + if tc == 'noname': - exp_rc = 2 #IM_RC_FAILED cs_ref = CIMInstanceName(classname, - keybindings = {'CreationClassName':classname}) + keybindings = {'CreationClassName':classname}) + + if CIM_REV < vsms_status_version: + exp_rc = 2 #IM_RC_FAILED + else: + exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : 'CIM_ERR_FAILED: Unable to retrieve domain\ + name.' + } + elif tc == 'nonexistent': - exp_rc = 4 #IM_RC_SYS_NOT_FOUND cs_ref = CIMInstanceName(classname,keybindings = { - 'Name':'##@@!!cimtest_domain', - 'CreationClassName':classname}) + 'Name':'##@@!!cimtest_domain', + 'CreationClassName':classname}) + + if CIM_REV < vsms_status_version: + exp_rc = 4 #IM_RC_SYS_NOT_FOUND + else: + exp_value = { 'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : 'CIM_ERR_FAILED: Failed to find domain' + } + else: return SKIP status = FAIL try: ret = service.DestroySystem(AffectedSystem=cs_ref) - if ret[0] == exp_rc: - status = PASS - logger.info('destroy_fail>>%s: Got expected return code %s' % (tc, exp_rc)) - else: - status = FAIL - logger.error('destroy_fail>>%s: Got rc: %s, but we expect %s' % (tc, ret[0], exp_rc)) + if CIM_REV < vsms_status_version: + if ret[0] == exp_rc: + logger.info('destroy_fail>>%s: Got expected return code %s', + tc, exp_rc) + return PASS + else: + logger.error('destroy_fail>>%s: Got rc: %s, but we expect %s', + tc, ret[0], exp_rc) + return FAIL + except Exception, details: - logger.error('destroy_fail>>%s: Error executing DestroySystem, exception details below' % tc) + if CIM_REV >= vsms_status_version: + err_no = details[0] + err_desc = details[1] + if err_no == exp_value['rc'] and err_desc == exp_value['desc']: + 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) - status = FAIL - - return status + return FAIL @do_main(sup_types) def main():

1 0

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

22 May '08

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

1 0