# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1212128528 -28800 # Node ID 7d2ce92ea89eedd84ad92ece773edcf175162d27 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update ResourceAllocationFromPool.01~04 for LXC support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 3ac66cf562f0 -r 7d2ce92ea89e suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Fri May 30 14:22:08 2008 +0800 @@ -31,7 +31,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'] @do_main(sup_types) def main(): diff -r 3ac66cf562f0 -r 7d2ce92ea89e suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Fri May 30 14:22:08 2008 +0800 @@ -31,7 +31,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'] @do_main(sup_types) def main(): diff -r 3ac66cf562f0 -r 7d2ce92ea89e suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Fri May 30 14:22:08 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.ReturnCodes import PASS, FAIL, XFAIL from XenKvmLib.const import CIM_REV -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] rev = 466 diff -r 3ac66cf562f0 -r 7d2ce92ea89e suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Fri May 30 14:22:08 2008 +0800 @@ -29,7 +29,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 3ac66cf562f0 -r 7d2ce92ea89e suites/libvirt-cim/lib/XenKvmLib/devices.py --- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Fri May 30 14:22:08 2008 +0800 @@ -87,10 +87,16 @@ class KVM_Memory(CIM_Memory): pass +class LXC_Memory(CIM_Memory): + pass + class Xen_Processor(CIM_Processor): pass class KVM_Processor(CIM_Processor): + pass + +class LXC_Processor(CIM_Processor): pass def get_class(classname):