# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1213285886 -28800 # Node ID b90b6fe46296b90cb87f5169b2654c7ba0970f98 # Parent 254bc5464030a03b6f791fd49acd208f6ec1db23 [TEST] Update HostSystem.03 for LXC support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 254bc5464030 -r b90b6fe46296 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Wed Jun 11 20:56:07 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Thu Jun 12 23:51:26 2008 +0800 @@ -51,7 +51,7 @@ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.const import CIM_REV -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domgst" test_vcpus = 1 libvirtcim_sdc_rasd_rev = 571 @@ -115,10 +115,13 @@ status = PASS devpool = [] - ccnlist = { '%s_ProcessorPool' % virt : 'Processors', - '%s_MemoryPool' % virt : 'KiloBytes', - '%s_DiskPool' % virt : 'Megabytes' , - '%s_NetworkPool' % virt : None } + if virt == "LXC": + ccnlist = { '%s_MemoryPool' % virt : 'KiloBytes'} + else: + ccnlist = { '%s_ProcessorPool' % virt : 'Processors', + '%s_MemoryPool' % virt : 'KiloBytes' , + '%s_DiskPool' % virt : 'Megabytes' , + '%s_NetworkPool' % virt : None } try: assoc_info = Associators(server, an1, @@ -151,11 +154,13 @@ alloccap = [] filter = {"key" : "ResourceType"} - - ccnlist = { '%s_ProcessorPool' % virt: 3, - '%s_MemoryPool' % virt : 4, - '%s_DiskPool' % virt : 17 , - '%s_NetworkPool' % virt : 10 } + if virt == 'LXC': + ccnlist = {'%s_MemoryPool' % virt : 4} + else: + ccnlist = { '%s_ProcessorPool' % virt: 3, + '%s_MemoryPool' % virt : 4, + '%s_DiskPool' % virt : 17 , + '%s_NetworkPool' % virt : 10 } for inst in devpool: try: @@ -193,11 +198,14 @@ ccn = '%s_AllocationCapabilities' % virt an = '%s_SettingsDefineCapabilities' % virt - rtype = { - "%s_DiskResourceAllocationSettingData" % virt : 17, \ - "%s_MemResourceAllocationSettingData" % virt : 4, \ - "%s_NetResourceAllocationSettingData" % virt : 10, \ - "%s_ProcResourceAllocationSettingData" % virt : 3 + if virt == 'LXC': + rtype = {"%s_MemResourceAllocationSettingData" % virt : 4} + else: + rtype = { + "%s_DiskResourceAllocationSettingData" % virt : 17, \ + "%s_MemResourceAllocationSettingData" % virt : 4, \ + "%s_NetResourceAllocationSettingData" % virt : 10, \ + "%s_ProcResourceAllocationSettingData" % virt : 3 } rangelist = { "Default" : 0, \