- CIM - libvirt List Archives

[PATCH] Set the InitPath for LXC guests
by Kaitlin Rupert 16 May '09

16 May '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1242279945 25200 # Node ID 1a625ee4280f4f55fbed04c2eeb973e3af3e5816 # Parent 032d34765a83b2f6784fd33e488b8829f3391603 Set the InitPath for LXC guests This was missed when InitPath support for LXC guests was added. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 032d34765a83 -r 1a625ee4280f src/Virt_VSSD.c --- a/src/Virt_VSSD.c Wed May 13 07:40:47 2009 -0700 +++ b/src/Virt_VSSD.c Wed May 13 22:45:45 2009 -0700 @@ -88,6 +88,16 @@ CMPI_chars); } +static void _set_lxc_prop(struct domain *dominfo, + CMPIInstance *inst) +{ + if (dominfo->os_info.lxc.init != NULL) + CMSetProperty(inst, + "InitPath", + (CMPIValue *)dominfo->os_info.lxc.init, + CMPI_chars); +} + static int instance_from_dom(virDomainPtr dom, CMPIInstance *inst) { @@ -151,6 +161,8 @@ _set_fv_prop(dominfo, inst); else if (dominfo->type == DOMAIN_XENPV) _set_pv_prop(dominfo, inst); + else if (dominfo->type == DOMAIN_LXC) + _set_lxc_prop(dominfo, inst); else CU_DEBUG("Unknown domain type %i for creating VSSD", dominfo->type);

2 1

[PATCH 0 of 2] Add test to verifyCreateSnapshot()
by Kaitlin Rupert 15 May '09

15 May '09

2 4

[PATCH] Allow user to specify UUID to use when guest is created
by Kaitlin Rupert 15 May '09

15 May '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1241805181 25200 # Node ID 9a16c7a7963cebddd145212e57ccc9defa5e0a0c # Parent e08c78615c3ec653c2979b4619b15d48a1c56d48 Allow user to specify UUID to use when guest is created Also expose UUID in VSSD instances. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r e08c78615c3e -r 9a16c7a7963c schema/ComputerSystem.mof --- a/schema/ComputerSystem.mof Mon May 11 10:23:34 2009 -0700 +++ b/schema/ComputerSystem.mof Fri May 08 10:53:01 2009 -0700 @@ -7,7 +7,6 @@ ] class Xen_ComputerSystem : CIM_ComputerSystem { - [Description("UUID assigned to this DomU.")] string UUID; diff -r e08c78615c3e -r 9a16c7a7963c schema/Virt_VSSD.mof --- a/schema/Virt_VSSD.mof Mon May 11 10:23:34 2009 -0700 +++ b/schema/Virt_VSSD.mof Fri May 08 10:53:01 2009 -0700 @@ -12,4 +12,7 @@ Values { "Turn Off", "Save state", "DMTF Reserved" }] uint16 AutomaticShutdownAction; + [Description("UUID assigned to this DomU.")] + string UUID; + }; diff -r e08c78615c3e -r 9a16c7a7963c src/Virt_VSSD.c --- a/src/Virt_VSSD.c Mon May 11 10:23:34 2009 -0700 +++ b/src/Virt_VSSD.c Fri May 08 10:53:01 2009 -0700 @@ -113,6 +113,9 @@ CMSetProperty(inst, "VirtualSystemType", (CMPIValue *)pfx, CMPI_chars); + CMSetProperty(inst, "UUID", + (CMPIValue *)dominfo->uuid, CMPI_chars); + CMSetProperty(inst, "Caption", (CMPIValue *)"Virtual System", CMPI_chars); diff -r e08c78615c3e -r 9a16c7a7963c src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon May 11 10:23:34 2009 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri May 08 10:53:01 2009 -0700 @@ -337,6 +337,12 @@ free(domain->name); domain->name = strdup(val); + ret = cu_get_str_prop(inst, "UUID", &val); + if (ret == CMPI_RC_OK) { + free(domain->uuid); + domain->uuid = strdup(val); + } + ret = cu_get_u16_prop(inst, "AutomaticShutdownAction", &tmp); if (ret != CMPI_RC_OK) tmp = 0;

2 1

[PATCH] Add "disk" type storage pools
by Kaitlin Rupert 14 May '09

14 May '09

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1242062614 25200 # Node ID e08c78615c3ec653c2979b4619b15d48a1c56d48 # Parent 3d42e1423d027c04c104ff0be6d99b86c46d1257 Add "disk" type storage pools. This storage pool type is a disk backed pool, instead of being a file or directory backed pool. This is tricky to test - you'll need a free disk / partition that you can mount. I've tested this using a spare LVM partition. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 3d42e1423d02 -r e08c78615c3e src/Virt_ResourcePoolConfigurationService.c --- a/src/Virt_ResourcePoolConfigurationService.c Mon Apr 27 17:05:48 2009 -0700 +++ b/src/Virt_ResourcePoolConfigurationService.c Mon May 11 10:23:34 2009 -0700 @@ -148,8 +148,8 @@ pool->pool_info.disk.src_dir = NULL; } -static const char *disk_fs_pool(CMPIInstance *inst, - struct virt_pool *pool) +static const char *disk_fs_or_disk_pool(CMPIInstance *inst, + struct virt_pool *pool) { const char *val = NULL; @@ -195,19 +195,19 @@ case DISK_POOL_DIR: break; case DISK_POOL_FS: - msg = disk_fs_pool(inst, pool); - if (msg != NULL) - goto out; + case DISK_POOL_DISK: + msg = disk_fs_or_disk_pool(inst, pool); break; case DISK_POOL_NETFS: msg = disk_netfs_pool(inst, pool); - if (msg != NULL) - goto out; break; default: return "Storage pool type not supported"; } + if (msg != NULL) + goto out; + pool->pool_info.disk.pool_type = type; if (cu_get_str_prop(inst, "Path", &val) != CMPI_RC_OK)

2 1

[PATCH] This fix the generation of the <boot> tag on fully-virtualizable Xen guests
by Richard Maciel 14 May '09

14 May '09

# HG changeset patch # User Richard Maciel <rmaciel(a)linux.vnet.ibm.com> # Date 1242071235 10800 # Node ID c0bd6c9a2c0084398784bb1ae36649bd3400e36c # Parent 5608b9455cd32fccbc324cd540c509d7230a113f This fix the generation of the <boot> tag on fully-virtualizable Xen guests. Right now it is generated with the boot device as a the value of the node (e.g. <boot>hd</boot>) However, the boot device must be a property of the node (e.g. <boot dev='hd'/>) Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com> diff -r 5608b9455cd3 -r c0bd6c9a2c00 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Mon Apr 27 17:05:48 2009 -0700 +++ b/libxkutil/xmlgen.c Mon May 11 16:47:15 2009 -0300 @@ -457,10 +457,12 @@ if (tmp == NULL) return XML_ERROR; - tmp = xmlNewChild(root, NULL, BAD_CAST "boot", BAD_CAST os->boot); + tmp = xmlNewChild(root, NULL, BAD_CAST "boot", NULL); if (tmp == NULL) return XML_ERROR; + xmlNewProp(tmp, BAD_CAST "dev", BAD_CAST os->boot); + tmp = xmlNewChild(root, NULL, BAD_CAST "features", NULL); xmlNewChild(tmp, NULL, BAD_CAST "pae", NULL); xmlNewChild(tmp, NULL, BAD_CAST "acpi", NULL);

1 0

[PATCH] [TEST]Update RPCS/07 with the latest updates of pool verification
by yunguol＠cn.ibm.com 14 May '09

14 May '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1242291170 25200 # Node ID f899232889810985dadbaabeed1198bad05edde2 # Parent 9391439d65e7ec6b88f34923d97f969c6114a237 [TEST]Update RPCS/07 with the latest updates of pool verification Tested for KVM with current sources Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r 9391439d65e7 -r f89923288981 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py Wed May 13 07:28:33 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/07_DeleteResourcePool.py Thu May 14 01:52:50 2009 -0700 @@ -33,10 +33,12 @@ # OUT -- Job -- CIM_ConcreteJob REF -- Returned job if started # OUT -- Error-- String -- Encoded error instance if the operation # failed and did not return a job. -# REVISIT : -# -------- -# As of now the DeleteResourcePool() simply throws an Exception. -# We must improve this tc once the service is implemented. +# +# Exception details before Revision 841 +# ----- +# Error code: CIM_ERR_NOT_SUPPORTED +# +# After revision 841, the service is implemented # # -Date: 20.02.2008 @@ -46,32 +48,79 @@ from XenKvmLib import rpcs_service from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS -from XenKvmLib.const import do_main, platform_sup +from XenKvmLib.const import do_main, platform_sup, get_provider_version +from XenKvmLib.enumclass import EnumInstances, EnumNames from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import destroy_netpool +from XenKvmLib.pool import create_netpool, verify_pool cim_errno = pywbem.CIM_ERR_NOT_SUPPORTED cim_mname = "DeleteResourcePool" +libvirt_cim_child_pool_rev = 841 +test_pool = "nat_pool" @do_main(platform_sup) def main(): + status = FAIL options = main.options rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ "ResourcePoolConfigurationService"))(options.ip) - try: - rpcs_conn.DeleteResourcePool() - except pywbem.CIMError, (err_no, desc): - if err_no == cim_errno : - logger.info("Got expected exception for '%s' service", cim_mname) - logger.info("Errno is '%s' ", err_no) - logger.info("Error string is '%s'", desc) - return PASS - else: - logger.error("Unexpected rc code %s and description %s\n", - err_no, desc) + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) + if curr_cim_rev < libvirt_cim_child_pool_rev: + try: + rpcs_conn.DeleteResourcePool() + except pywbem.CIMError, (err_no, desc): + if err_no == cim_errno : + logger.info("Got expected exception for '%s' service", cim_mname) + logger.info("Errno is '%s' ", err_no) + logger.info("Error string is '%s'", desc) + return PASS + else: + logger.error("Unexpected rc code %s and description %s\n", + err_no, desc) + return FAIL + elif curr_cim_rev >= libvirt_cim_child_pool_rev: + pool_attr = { + "Address" : "192.168.0.8", + "Netmask" : "255.255.255.0", + "IPRangeStart" : "192.168.0.9", + "IPRangeEnd" : "192.168.0.15", + "ForwardMode" : "nat" + } + np = get_typed_class(options.virt, 'NetworkPool') + np_id = "NetworkPool/%s" % test_pool + + status = create_netpool(options.ip, options.virt, test_pool, pool_attr) + if status != PASS: + logger.error("Error in networkpool creation") return FAIL - - logger.error("The execution should not have reached here!!") - return FAIL + + status = verify_pool(options.ip, options.virt, np, + test_pool, pool_attr) + if status != PASS: + logger.error("Error in networkpool verification") + destroy_netpool(options.ip, options.virt, test_pool) + return FAIL + + netpool = EnumNames(options.ip, np) + for i in range(0, len(netpool)): + ret_pool = netpool[i].keybindings['InstanceID'] + if ret_pool == np_id: + pool_settings = netpool[i] + break + try: + rpcs_conn.DeleteResourcePool(Pool = pool_settings) + netpool = EnumInstances(options.ip, np) + for i in range(0, len(netpool)): + ret_pool = netpool[i].InstanceID + if ret_pool == np_id: + raise Exception("Failed to delete %s" % test_pool) + status = PASS + except Exception, details: + logger.error(details) + return FAIL + + return status + if __name__ == "__main__": sys.exit(main()) -

2 1

[PATCH] [TEST]Update RPCS/04 with the latest updates of pool verification
by yunguol＠cn.ibm.com 14 May '09

14 May '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1242287412 25200 # Node ID e1ca990097ed08771ba19aa8d6ac21af16c10a65 # Parent 9391439d65e7ec6b88f34923d97f969c6114a237 [TEST]Update RPCS/04 with the latest updates of pool verification Tested for KVM with current sources Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r 9391439d65e7 -r e1ca990097ed suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Wed May 13 07:28:33 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Thu May 14 00:50:12 2009 -0700 @@ -39,45 +39,59 @@ # OUT -- Error -- String -- Encoded error instance if the operation # failed and did not return a job # -# REVISIT : -# -------- -# As of now the CreateChildResourcePool() simply throws an Exception. -# We must improve this tc once the service is implemented. -# -# -Date: 20.02.2008 - +# Exception details before Revision 837 +# ----- +# Error code: CIM_ERR_NOT_SUPPORTED +# +# After revision 837, the service is implemented +# +# -Date: 20.02.2008 import sys -import pywbem -from XenKvmLib import rpcs_service from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS from XenKvmLib.const import do_main, platform_sup from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import destroy_netpool +from XenKvmLib.pool import create_netpool, verify_pool -cim_errno = pywbem.CIM_ERR_NOT_SUPPORTED -cim_mname = "CreateChildResourcePool" +test_pool = "testpool" +test_mode = ["nat"] @do_main(platform_sup) def main(): + status = PASS options = main.options - rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ - "ResourcePoolConfigurationService"))(options.ip) - try: - rpcs_conn.CreateChildResourcePool() - except pywbem.CIMError, (err_no, desc): - if err_no == cim_errno : - logger.info("Got expected exception for '%s' service", cim_mname) - logger.info("Errno is '%s' ", err_no) - logger.info("Error string is '%s'", desc) - return PASS - else: - logger.error("Unexpected rc code %s and description %s\n", - err_no, desc) + + np = get_typed_class(options.virt, 'NetworkPool') + np_id = "NetworkPool/%s" % test_pool + pool_attr = { + "Address" : "192.168.0.8", + "Netmask" : "255.255.255.0", + "IPRangeStart" : "192.168.0.9", + "IPRangeEnd" : "192.168.0.15" + } + for i in range(0, len(test_mode)): + pool_attr["ForwardMode"] = test_mode[i] + status = create_netpool(options.ip, options.virt, + test_pool, pool_attr) + if status != PASS: + logger.error("Error in networkpool creation") return FAIL - - logger.error("The execution should not have reached here!!") - return FAIL + + status = verify_pool(options.ip, options.virt, np, + test_pool, pool_attr) + if status != PASS: + logger.error("Error in networkpool verification") + destroy_netpool(options.ip, options.virt, test_pool) + return FAIL + + status = destroy_netpool(options.ip, options.virt, test_pool) + if status != PASS: + logger.error("Unable to destroy networkpool %s", test_pool) + return FAIL + + return status + if __name__ == "__main__": sys.exit(main()) -

2 1

[PATCH 0 of 2] [TEST] Add test to verify CreateSnapshot()
by Kaitlin Rupert 14 May '09

14 May '09

2 3

[PATCH 0 of 2] [RFC] (#2) Add boot order support for full virtualization environments
by Richard Maciel 14 May '09

14 May '09

2 3

[PATCH 0 of 2] [RFC] Add boot order support for full virtualization environments
by Richard Maciel 13 May '09

13 May '09

2 5