# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1213680047 -28800 # Node ID 4cadaeddee3aa439638ff212861a2cfc37fdfe69 # Parent 6652ca49942c0314ec1b2b1da504810325097250 [TEST] Update ResourceAllocationFromPool.03&04 for LXC support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 6652ca49942c -r 4cadaeddee3a suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Thu Jun 12 17:13:23 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Tue Jun 17 13:20:47 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 @@ -42,7 +42,9 @@ poollist = {get_typed_class(options.virt, "MemoryPool") : "wrong", - get_typed_class(options.virt, "ProcessorPool") : "wrong"} + get_typed_class(options.virt, "ProcessorPool") : "wrong", + get_typed_class(options.virt, "DiskPool") : "wrong", + get_typed_class(options.virt, "NetworkPool") : "wrong"} conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) diff -r 6652ca49942c -r 4cadaeddee3a suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Thu Jun 12 17:13:23 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/04_reverse_errs.py Tue Jun 17 13:20:47 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" @@ -42,7 +42,9 @@ dataset = {get_typed_class(options.virt, "MemResourceAllocationSettingData") : "wrong", - get_typed_class(options.virt, "ProcResourceAllocationSettingData") : "wrong"} + get_typed_class(options.virt, "ProcResourceAllocationSettingData") : "wrong", + get_typed_class(options.virt, "DiskResourceAllocationSettingData") : "wrong", + get_typed_class(options.virt, "NetResourceAllocationSettingData") : "wrong"} conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS)