# HG changeset patch # User Zhengang Li <lizg@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@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):