- CIM - libvirt List Archives

[PATCH] Set namespace of object path in rasd_to_vdev()
by Kaitlin Rupert 30 May '08

30 May '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1212155823 25200 # Node ID 5b89d6aa5816613627a2869d8c72bde37a9f2e2c # Parent bebc49d05ccd893020673286905d5c64f652cd62 Set namespace of object path in rasd_to_vdev() This was being done in classify_resources(), however, rasd_to_vdev() needs to set this value because a call to CMGetObjectPath() strips the instance of it's namespace. Functions that call rasd_to_vdev() need to pass in the namespace, so those are updated as well. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r bebc49d05ccd -r 5b89d6aa5816 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Thu May 29 14:48:41 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri May 30 06:57:03 2008 -0700 @@ -487,7 +487,8 @@ static const char *rasd_to_vdev(CMPIInstance *inst, struct domain *domain, - struct virt_device *dev) + struct virt_device *dev, + const char *ns) { uint16_t type; CMPIObjectPath *op; @@ -498,6 +499,9 @@ msg = "Unable to get path for device instance"; goto out; } + + CMSetNameSpace(op, ns); + CMSetObjectPath(inst, op); if (res_type_from_rasd_classname(CLASSNAME(op), &type) != CMPI_RC_OK) { msg = "Unable to get device type"; @@ -553,9 +557,6 @@ if (op == NULL) return "Unknown resource instance type"; - CMSetNameSpace(op, ns); - CMSetObjectPath(inst, op); - if (res_type_from_rasd_classname(CLASSNAME(op), &type) != CMPI_RC_OK) return "Unable to determine resource type"; @@ -563,19 +564,23 @@ if (type == CIM_RES_TYPE_PROC) msg = rasd_to_vdev(inst, domain, - &domain->dev_vcpu[domain->dev_vcpu_ct++]); + &domain->dev_vcpu[domain->dev_vcpu_ct++], + ns); else if (type == CIM_RES_TYPE_MEM) msg = rasd_to_vdev(inst, domain, - &domain->dev_mem[domain->dev_mem_ct++]); + &domain->dev_mem[domain->dev_mem_ct++], + ns); else if (type == CIM_RES_TYPE_DISK) msg = rasd_to_vdev(inst, domain, - &domain->dev_disk[domain->dev_disk_ct++]); + &domain->dev_disk[domain->dev_disk_ct++], + ns); else if (type == CIM_RES_TYPE_NET) msg = rasd_to_vdev(inst, domain, - &domain->dev_net[domain->dev_net_ct++]); + &domain->dev_net[domain->dev_net_ct++], + ns); if (msg != NULL) return msg; @@ -872,7 +877,8 @@ typedef CMPIStatus (*resmod_fn)(struct domain *, CMPIInstance *, uint16_t, - const char *); + const char *, + const char*); static struct virt_device **find_list(struct domain *dominfo, uint16_t type, @@ -966,7 +972,8 @@ static CMPIStatus resource_del(struct domain *dominfo, CMPIInstance *rasd, uint16_t type, - const char *devid) + const char *devid, + const char *ns) { CMPIStatus s; CMPIObjectPath *op; @@ -1013,7 +1020,8 @@ static CMPIStatus resource_add(struct domain *dominfo, CMPIInstance *rasd, uint16_t type, - const char *devid) + const char *devid, + const char *ns) { CMPIStatus s; CMPIObjectPath *op; @@ -1060,7 +1068,7 @@ dev->type = type; dev->id = strdup(devid); - rasd_to_vdev(rasd, dominfo, dev); + rasd_to_vdev(rasd, dominfo, dev, ns); s = _resource_dynamic(dominfo, dev, RESOURCE_ADD, CLASSNAME(op)); if (s.rc != CMPI_RC_OK) @@ -1078,7 +1086,8 @@ static CMPIStatus resource_mod(struct domain *dominfo, CMPIInstance *rasd, uint16_t type, - const char *devid) + const char *devid, + const char *ns) { CMPIStatus s; CMPIObjectPath *op; @@ -1109,7 +1118,7 @@ struct virt_device *dev = &list[i]; if (STREQ(dev->id, devid)) { - rasd_to_vdev(rasd, dominfo, dev); + rasd_to_vdev(rasd, dominfo, dev, ns); s = _resource_dynamic(dominfo, dev, RESOURCE_MOD, @@ -1156,7 +1165,7 @@ goto out; } - s = func(dominfo, rasd, type, devid); + s = func(dominfo, rasd, type, devid, NAMESPACE(ref)); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Resource transform function failed"); goto out;

1 0

[PATCH] [TEST] Update VirtualSystemSnapshotServiceCapabilities.01&02 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 1212142223 -28800 # Node ID 5bcfdd805bba1b6ce1e2f8c2d01cb5e3523b4ca3 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update VirtualSystemSnapshotServiceCapabilities.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 5bcfdd805bba suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/01_enum.py Fri May 30 18:10:23 2008 +0800 @@ -25,14 +25,16 @@ from XenKvmLib import enumclass from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class + +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def print_error(fieldname, ret_value, exp_value): logger.error("%s Mismatch", fieldname) logger.error("Returned %s instead of %s", ret_value, exp_value) -@do_main(platform_sup) +@do_main(sup_types) def main(): options = main.options # Expected results from enumeration diff -r 3ac66cf562f0 -r 5bcfdd805bba suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotServiceCapabilities/02_vs_sservicecap_gi_errs.py Fri May 30 18:10:23 2008 +0800 @@ -49,10 +49,10 @@ from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.ReturnCodes import PASS from XenKvmLib.common_util import try_getinstance -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class - +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { "invalid_instid" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ 'desc' : 'No such instance (InstanceID)' } @@ -62,7 +62,7 @@ return try_getinstance(conn, classname, keys, field_name=field, \ expr_values=expr_values['invalid_instid'], bug_no="") -@do_main(platform_sup) +@do_main(sup_types) def main(): global options options = main.options diff -r 3ac66cf562f0 -r 5bcfdd805bba suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 18:10:23 2008 +0800 @@ -209,6 +209,9 @@ class KVM_VirtualSystemSnapshotServiceCapabilities(CIM_VirtualSystemSnapshotServiceCapabilities): pass +class LXC_VirtualSystemSnapshotServiceCapabilities(CIM_VirtualSystemSnapshotServiceCapabilities): + pass + class Xen_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): pass

1 0

[PATCH] [TEST] Update VirtualSystemSnapshotService.01&02 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 1212141720 -28800 # Node ID 7614eb8b8023999620e91d0ec74917ba24aa98a0 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update VirtualSystemSnapshotService.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 7614eb8b8023 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Fri May 30 18:02:00 2008 +0800 @@ -25,7 +25,7 @@ from XenKvmLib import enumclass from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import get_host_info @@ -33,7 +33,8 @@ logger.error("%s Mismatch", fieldname) logger.error("Returned %s instead of %s", ret_value, exp_value) -@do_main(platform_sup) +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] +@do_main(sup_types) def main(): options = main.options # Expected results from enumeration diff -r 3ac66cf562f0 -r 7614eb8b8023 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Fri May 30 18:02:00 2008 +0800 @@ -31,10 +31,11 @@ from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.ReturnCodes import PASS from XenKvmLib.common_util import try_getinstance -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class from XenKvmLib.common_util import get_host_info +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { "INVALID_CCName" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ 'desc' : 'No such instance (CreationClassName)' }, \ @@ -219,7 +220,7 @@ return status return PASS -@do_main(platform_sup) +@do_main(sup_types) def main(): global options options = main.options diff -r 3ac66cf562f0 -r 7614eb8b8023 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 18:02:00 2008 +0800 @@ -203,6 +203,9 @@ class KVM_VirtualSystemSnapshotService(CIM_VirtualSystemSnapshotService): pass +class LXC_VirtualSystemSnapshotService(CIM_VirtualSystemSnapshotService): + pass + class Xen_VirtualSystemSnapshotServiceCapabilities(CIM_VirtualSystemSnapshotServiceCapabilities): pass

1 0

[PATCH] [TEST]Update ReferencedProfile.01&02 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 1212140542 -28800 # Node ID 005aae91fa3af0aedbda2e1334802f4e0ae35dc0 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST]Update ReferencedProfile.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 005aae91fa3a suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py --- a/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py Fri May 30 17:42:22 2008 +0800 @@ -82,7 +82,7 @@ from XenKvmLib.const import CIM_REV from XenKvmLib.common_util import print_field_error -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] libvirtcim_rev = 501 diff -r 3ac66cf562f0 -r 005aae91fa3a suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py --- a/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ReferencedProfile/02_refprofile_errs.py Fri May 30 17:42:22 2008 +0800 @@ -62,7 +62,7 @@ from XenKvmLib.common_util import try_assoc from XenKvmLib.const import CIM_REV -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] libvirtcim_rev = 501 expr_values = {

1 0

[PATCH] [TEST] Update Profile.01 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 1212140258 -28800 # Node ID 9e2b90555485a540ddc87c1d220a2abcd549bd32 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update Profile.01 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 9e2b90555485 suites/libvirt-cim/cimtest/Profile/01_enum.py --- a/suites/libvirt-cim/cimtest/Profile/01_enum.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/Profile/01_enum.py Fri May 30 17:37:38 2008 +0800 @@ -33,7 +33,7 @@ from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] @do_main(sup_types) def main(): diff -r 3ac66cf562f0 -r 9e2b90555485 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 17:37:38 2008 +0800 @@ -99,6 +99,9 @@ pass class KVM_RegisteredProfile(CIM_RegisteredProfile): + pass + +class LXC_RegisteredProfile(CIM_RegisteredProfile): pass class Xen_VirtualSystemSettingData(CIM_MyClass):

1 0

[PATCH] [TEST] Update ElementSettingData.01 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 1212139075 -28800 # Node ID c8021d56cff8acb3a3084741234f2b7317c98a27 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update ElementSettingData.01 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r c8021d56cff8 suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Fri May 30 17:17:55 2008 +0800 @@ -55,7 +55,7 @@ from CimTest import Globals from CimTest.Globals import do_main -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] esd_cn = 'ElementSettingData' vssd_cn = 'VirtualSystemSettingData' vssdc_cn = 'VirtualSystemSettingDataComponent' diff -r 3ac66cf562f0 -r c8021d56cff8 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri May 30 17:17:55 2008 +0800 @@ -105,6 +105,9 @@ pass class KVM_VirtualSystemSettingData(CIM_MyClass): + pass + +class LXC_VirtualSystemSettingData(CIM_MyClass): pass class Xen_LogicalDisk(CIM_LogicalDevice):

1 0

[PATCH] [TEST] #2 LXC support for ComputerSystem.01, 02, 05 & 22
by zli＠linux.vnet.ibm.com 30 May '08

30 May '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1212128798 -28800 # Node ID 5c77329cb53e6340cd6ddbf9c044462fb994eb88 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] #2 LXC support for ComputerSystem.01, 02, 05 & 22 Updates: removing test cases that depends on DefineSystem(). Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 5c77329cb53e 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 14:26:38 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 3ac66cf562f0 -r 5c77329cb53e 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 14:26:38 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 3ac66cf562f0 -r 5c77329cb53e 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 14:26:38 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 3ac66cf562f0 -r 5c77329cb53e 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 14:26:38 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)

1 0

[PATCH] [TEST] Update HostedResourcePool.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 1212125627 -28800 # Node ID f03185d9684f996141b3e151a22a2207dc88251d # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update HostedResourcePool.01~04 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r f03185d9684f suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Fri May 30 13:33:47 2008 +0800 @@ -29,10 +29,11 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class -@do_main(platform_sup) +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] +@do_main(sup_types) def main(): options = main.options status = FAIL diff -r 3ac66cf562f0 -r f03185d9684f suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Fri May 30 13:33:47 2008 +0800 @@ -28,10 +28,11 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class -@do_main(platform_sup) +sup_types=['Xen', 'KVM', 'XenFV', 'LXC'] +@do_main(sup_types) def main(): options = main.options status = PASS diff -r 3ac66cf562f0 -r f03185d9684f suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/03_forward_errs.py Fri May 30 13:33:47 2008 +0800 @@ -29,14 +29,15 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class expr_values = { "rc" : pywbem.CIM_ERR_NOT_FOUND, \ "desc" : "No such instance" } -@do_main(platform_sup) +sup_types=['Xen', 'KVM', 'XenFV', 'LXC'] +@do_main(sup_types) def main(): options = main.options status = PASS diff -r 3ac66cf562f0 -r f03185d9684f suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Fri May 30 13:33:47 2008 +0800 @@ -28,9 +28,10 @@ from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { "Invalid_InstanceID_KeyName" : { "rc" : pywbem.CIM_ERR_FAILED, \ @@ -42,7 +43,7 @@ } } -@do_main(platform_sup) +@do_main(sup_types) def main(): options = main.options status = PASS

1 0

[PATCH] [TEST] Update HostedDependency tc for LXC support
by yunguol＠cn.ibm.com 29 May '08

29 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212117460 -28800 # Node ID 729be78aaf6da7cfab0275c5eb4d3981d2e5ea57 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update HostedDependency tc for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 729be78aaf6d suites/libvirt-cim/cimtest/HostedDependency/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Fri May 30 11:17:40 2008 +0800 @@ -55,7 +55,7 @@ from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] test_dom = "hd_domain" test_mac = "00:11:22:33:44:55" @@ -66,7 +66,10 @@ status = PASS virtxml = vxml.get_class(options.virt) - cxml = virtxml(test_dom, mac = test_mac) + if options.virt == "LXC": + cxml = virtxml(test_dom) + else: + cxml = virtxml(test_dom, mac = test_mac) ret = cxml.define(options.ip) if not ret: Globals.logger.error("Failed to Create the dom: %s", test_dom) diff -r 3ac66cf562f0 -r 729be78aaf6d suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py Fri May 30 11:17:40 2008 +0800 @@ -50,7 +50,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] test_dom = "hd_domain" test_mac = "00:11:22:33:44:55" @@ -61,7 +61,10 @@ status = PASS virtxml = vxml.get_class(options.virt) - cxml = virtxml(test_dom, mac = test_mac) + if options.virt == "LXC": + cxml = virtxml(test_dom) + else: + cxml = virtxml(test_dom, mac = test_mac) ret = cxml.create(options.ip) if not ret: diff -r 3ac66cf562f0 -r 729be78aaf6d suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Fri May 30 11:17:40 2008 +0800 @@ -38,7 +38,7 @@ from XenKvmLib.common_util import get_host_info, try_assoc from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] test_dom = "hd_domain1" test_mac = "00:11:22:33:44:55" @@ -109,7 +109,10 @@ status = PASS server = options.ip virtxml = vxml.get_class(options.virt) - cxml = virtxml(test_dom, mac = test_mac) + if options.virt == "LXC": + cxml = virtxml(test_dom) + else: + cxml = virtxml(test_dom, mac = test_mac) ret = cxml.create(options.ip) if not ret:

1 0

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

29 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