September 2008 - CIM - libvirt List Archives

[PATCH] [TEST] Fixing 01_forward.py tc of HostedDependency, accomdating sblim-base-provider changes
by Deepti B. Kalakeri 25 Sep '08

25 Sep '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1222369936 25200 # Node ID cdf9d7ee99cac967eb9ec0935709b02db6c9dabd # Parent 375ae129b8e910fe42a5e4434b67ada5589bc72f [TEST] Fixing 01_forward.py tc of HostedDependency, accomdating sblim-base-provider changes. This tc changes requires the check_sblim() fn changes. Tested with Xen, XenFV, KVM on current sources and witjh/without sblim-base-provider installed. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 375ae129b8e9 -r cdf9d7ee99ca suites/libvirt-cim/cimtest/HostedDependency/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Thu Sep 25 12:12:16 2008 -0700 @@ -31,7 +31,7 @@ # # The output should be a single record and it will look something like this: # localhost:5988/root/virt:Xen_HostSystem.CreationClassName="Xen_HostSystem", -# Name="mx3650b.in.ibm.com" +# Name="x3650" # ...... # -CommunicationStatus # -CreationClassName="Xen_HostSystem" @@ -51,8 +51,10 @@ from XenKvmLib import enumclass from XenKvmLib import enumclass from XenKvmLib.classes import get_class_basename from CimTest import Globals +from CimTest.Globals import logger from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import check_sblim sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] @@ -71,25 +73,41 @@ def main(): 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) + logger.error("Failed to Create the dom: %s", test_dom) status = FAIL return status + keys = ['Name', 'CreationClassName'] + try: - host = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] + ret, linux_cs = check_sblim(options.ip) + host_info = enumclass.enumerate(options.ip, 'HostSystem', keys, + options.virt) except Exception,detail: - Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, 'Hostsystem') - Globals.logger.error("Exception: %s", detail) + logger.error(Globals.CIM_ERROR_ENUMERATE, 'Hostsystem') + logger.error("Exception: %s", detail) status = FAIL cxml.undefine(options.ip) return status - - keys = ['Name', 'CreationClassName'] + + # This below modification is req to accomadate the + # sblim-base-provider provider related changes + if ret == PASS and len(host_info) == 0: + host = linux_cs + elif ret == FAIL and len(host_info) == 1: + host = host_info[0] + elif (ret == FAIL and len(host_info) == 0) or \ + (ret == PASS and len(host_info) == 1): + logger.error("Error in getting HostSystem information, Exiting...") + cxml.undefine(options.ip) + return FAIL + try: - cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, + options.virt) except Exception,detail: - Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, 'ComputerSystem') - Globals.logger.error("Exception: %s", detail) + logger.error(Globals.CIM_ERROR_ENUMERATE, 'ComputerSystem') + logger.error("Exception: %s", detail) status = FAIL cxml.undefine(options.ip) return status @@ -104,14 +122,15 @@ def main(): if not hs: cxml.undefine(options.ip) - Globals.logger.error("HostName seems to be empty") + logger.error("HostName seems to be empty") status = FAIL break if len(hs) != 1: test = "(len(hs), system.name)" - Globals.logger.error("HostedDependency returned %i HostSystem \ -objects for domain '%s'", len(hs), system.name) + logger.error("'%s' returned %i HostSystem " + "objects for domain '%s'", + hs_cn, len(hs), system.name) status = FAIL break @@ -119,19 +138,19 @@ objects for domain '%s'", len(hs), syste sn = hs[0]["Name"] if cn != host.CreationClassName: - Globals.logger.error("CreationClassName does not match") + logger.error("CreationClassName does not match") status = FAIL if sn != host.Name: - Globals.logger.error("Name does not match") + logger.error("Name does not match") status = FAIL - if status != 0: + if status != PASS: break except Exception,detail: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, hs_cn) - Globals.logger.error("Exception: %s", detail) + logger.error(Globals.CIM_ERROR_ASSOCIATORS, hs_cn) + logger.error("Exception: %s", detail) status = FAIL cxml.undefine(options.ip) return status

1 0

[PATCH] (#2) Remove CMSetObjectPath() from rasd_to_vdev()
by Kaitlin Rupert 25 Sep '08

25 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222363795 25200 # Node ID 7c0a09c0695b7a37e2a1215b982bb1acffa69712 # Parent 193c94848d62dfeb5eb00566d0331995c4a42931 (#2) Remove CMSetObjectPath() from rasd_to_vdev() This is only needed because default_device_pool() needs an ObjectPath with a proper namespace set. Since this is only needed in the network case, remove the calls to CMSetObjectPath() and CMSetNameSpace() from rasd_to_vdev(). Instead, pass the namespace to _default_network(), which sets the namespace on the ObjectPath directly. This removes any need of setting the ObjectPath of the instance. Also, remove kvm_net_rasd_to_vdev() and xen_net_rasd_to_vdev() - these calls are identical. Move this functionality into net_rasd_to_vdev() and clean up net_rasd_to_vdev(). This means that only net_rasd_to_vdev() needs to be updated with an additional parameter. Updates: -Added ns paramerter to _container_rasd_to_vdev() for consistency with _sysvirt_rasd_to_vdev() Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 193c94848d62 -r 7c0a09c0695b src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Sep 23 13:21:48 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Thu Sep 25 10:29:55 2008 -0700 @@ -285,7 +285,8 @@ return ret; } -static const char *_default_network(CMPIInstance *inst) +static const char *_default_network(CMPIInstance *inst, + const char* ns) { CMPIInstance *pool; CMPIObjectPath *op; @@ -299,6 +300,13 @@ return NULL; } + s = CMSetNameSpace(op, ns); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Failed to set the namespace of net objectpath"); + return NULL; + } + + CU_DEBUG("No PoolID specified, looking up default network pool"); pool = default_device_pool(_BROKER, op, CIM_RES_TYPE_NET, &s); if ((pool == NULL) || (s.rc != CMPI_RC_OK)) { CU_DEBUG("Failed to get default network pool: %s", @@ -311,46 +319,6 @@ } return poolid; -} - -static const char *xen_net_rasd_to_vdev(CMPIInstance *inst, - struct virt_device *dev) -{ - const char *val = NULL; - - free(dev->dev.net.type); - dev->dev.net.type = strdup("network"); - - if (cu_get_str_prop(inst, "PoolID", &val) != CMPI_RC_OK) - val = _default_network(inst); - - if (val == NULL) - return "No NetworkPool specified and no default available"; - - free(dev->dev.net.source); - dev->dev.net.source = name_from_pool_id(val); - - return NULL; -} - -static const char *kvm_net_rasd_to_vdev(CMPIInstance *inst, - struct virt_device *dev) -{ - const char *val = NULL; - - free(dev->dev.net.type); - dev->dev.net.type = strdup("network"); - - if (cu_get_str_prop(inst, "PoolID", &val) != CMPI_RC_OK) - val = _default_network(inst); - - if (val == NULL) - return "No NetworkPool specified and no default available"; - - free(dev->dev.net.source); - dev->dev.net.source = name_from_pool_id(val); - - return NULL; } static const char *_net_rand_mac(void) @@ -394,10 +362,10 @@ } static const char *net_rasd_to_vdev(CMPIInstance *inst, - struct virt_device *dev) + struct virt_device *dev, + const char *ns) { const char *val = NULL; - CMPIObjectPath *op; const char *msg = NULL; if (cu_get_str_prop(inst, "Address", &val) != CMPI_RC_OK) { @@ -414,21 +382,17 @@ free(dev->id); dev->id = strdup(dev->dev.net.mac); - op = CMGetObjectPath(inst, NULL); - if (op == NULL) { - CU_DEBUG("Unable to get instance path"); - goto out; - } + free(dev->dev.net.type); + dev->dev.net.type = strdup("network"); - if (STARTS_WITH(CLASSNAME(op), "Xen")) - msg = xen_net_rasd_to_vdev(inst, dev); - else if (STARTS_WITH(CLASSNAME(op), "KVM")) - msg = kvm_net_rasd_to_vdev(inst, dev); - else { - msg = "Unknown class type for net device"; - CU_DEBUG("Unknown class type for net device: %s", - CLASSNAME(op)); - } + if (cu_get_str_prop(inst, "PoolID", &val) != CMPI_RC_OK) + val = _default_network(inst, ns); + + if (val == NULL) + return "No NetworkPool specified and no default available"; + + free(dev->dev.net.source); + dev->dev.net.source = name_from_pool_id(val); out: return msg; @@ -552,12 +516,13 @@ static const char *_sysvirt_rasd_to_vdev(CMPIInstance *inst, struct virt_device *dev, - uint16_t type) + uint16_t type, + const char *ns) { if (type == CIM_RES_TYPE_DISK) { return disk_rasd_to_vdev(inst, dev); } else if (type == CIM_RES_TYPE_NET) { - return net_rasd_to_vdev(inst, dev); + return net_rasd_to_vdev(inst, dev, ns); } else if (type == CIM_RES_TYPE_MEM) { return mem_rasd_to_vdev(inst, dev); } else if (type == CIM_RES_TYPE_PROC) { @@ -569,7 +534,8 @@ static const char *_container_rasd_to_vdev(CMPIInstance *inst, struct virt_device *dev, - uint16_t type) + uint16_t type, + const char *ns) { if (type == CIM_RES_TYPE_MEM) { return mem_rasd_to_vdev(inst, dev); @@ -595,9 +561,6 @@ 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"; goto out; @@ -606,9 +569,9 @@ dev->type = (int)type; if (domain->type == DOMAIN_LXC) - msg = _container_rasd_to_vdev(inst, dev, type); + msg = _container_rasd_to_vdev(inst, dev, type, ns); else - msg = _sysvirt_rasd_to_vdev(inst, dev, type); + msg = _sysvirt_rasd_to_vdev(inst, dev, type, ns); out: if (msg) CU_DEBUG("rasd_to_vdev(%s): %s", CLASSNAME(op), msg);

1 0

[PATCH] [RFC] Remove CMSetObjectPath() from rasd_to_vdev()
by Kaitlin Rupert 25 Sep '08

25 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222306223 25200 # Node ID 6a60ecb3eac34f34593803ec736539147f5dd692 # Parent 193c94848d62dfeb5eb00566d0331995c4a42931 [RFC] Remove CMSetObjectPath() from rasd_to_vdev() This is only needed because default_device_pool() needs an ObjectPath with a proper namespace set. Since this is only needed in the network case, remove the calls to CMSetObjectPath() and CMSetNameSpace() from rasd_to_vdev(). Instead, pass the namespace to _default_network(), which sets the namespace on the ObjectPath directly. This removes any need of setting the ObjectPath of the instance. Also, remove kvm_net_rasd_to_vdev() and xen_net_rasd_to_vdev() - these calls are identical. Move this functionality into net_rasd_to_vdev() and clean up net_rasd_to_vdev(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 193c94848d62 -r 6a60ecb3eac3 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Sep 23 13:21:48 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Wed Sep 24 18:30:23 2008 -0700 @@ -285,7 +285,8 @@ return ret; } -static const char *_default_network(CMPIInstance *inst) +static const char *_default_network(CMPIInstance *inst, + const char* ns) { CMPIInstance *pool; CMPIObjectPath *op; @@ -299,6 +300,13 @@ return NULL; } + s = CMSetNameSpace(op, ns); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Failed to set the namespace of net objectpath"); + return NULL; + } + + CU_DEBUG("No PoolID specified, looking up default network pool"); pool = default_device_pool(_BROKER, op, CIM_RES_TYPE_NET, &s); if ((pool == NULL) || (s.rc != CMPI_RC_OK)) { CU_DEBUG("Failed to get default network pool: %s", @@ -311,46 +319,6 @@ } return poolid; -} - -static const char *xen_net_rasd_to_vdev(CMPIInstance *inst, - struct virt_device *dev) -{ - const char *val = NULL; - - free(dev->dev.net.type); - dev->dev.net.type = strdup("network"); - - if (cu_get_str_prop(inst, "PoolID", &val) != CMPI_RC_OK) - val = _default_network(inst); - - if (val == NULL) - return "No NetworkPool specified and no default available"; - - free(dev->dev.net.source); - dev->dev.net.source = name_from_pool_id(val); - - return NULL; -} - -static const char *kvm_net_rasd_to_vdev(CMPIInstance *inst, - struct virt_device *dev) -{ - const char *val = NULL; - - free(dev->dev.net.type); - dev->dev.net.type = strdup("network"); - - if (cu_get_str_prop(inst, "PoolID", &val) != CMPI_RC_OK) - val = _default_network(inst); - - if (val == NULL) - return "No NetworkPool specified and no default available"; - - free(dev->dev.net.source); - dev->dev.net.source = name_from_pool_id(val); - - return NULL; } static const char *_net_rand_mac(void) @@ -394,10 +362,10 @@ } static const char *net_rasd_to_vdev(CMPIInstance *inst, - struct virt_device *dev) + struct virt_device *dev, + const char *ns) { const char *val = NULL; - CMPIObjectPath *op; const char *msg = NULL; if (cu_get_str_prop(inst, "Address", &val) != CMPI_RC_OK) { @@ -414,21 +382,17 @@ free(dev->id); dev->id = strdup(dev->dev.net.mac); - op = CMGetObjectPath(inst, NULL); - if (op == NULL) { - CU_DEBUG("Unable to get instance path"); - goto out; - } + free(dev->dev.net.type); + dev->dev.net.type = strdup("network"); - if (STARTS_WITH(CLASSNAME(op), "Xen")) - msg = xen_net_rasd_to_vdev(inst, dev); - else if (STARTS_WITH(CLASSNAME(op), "KVM")) - msg = kvm_net_rasd_to_vdev(inst, dev); - else { - msg = "Unknown class type for net device"; - CU_DEBUG("Unknown class type for net device: %s", - CLASSNAME(op)); - } + if (cu_get_str_prop(inst, "PoolID", &val) != CMPI_RC_OK) + val = _default_network(inst, ns); + + if (val == NULL) + return "No NetworkPool specified and no default available"; + + free(dev->dev.net.source); + dev->dev.net.source = name_from_pool_id(val); out: return msg; @@ -552,12 +516,13 @@ static const char *_sysvirt_rasd_to_vdev(CMPIInstance *inst, struct virt_device *dev, - uint16_t type) + uint16_t type, + const char *ns) { if (type == CIM_RES_TYPE_DISK) { return disk_rasd_to_vdev(inst, dev); } else if (type == CIM_RES_TYPE_NET) { - return net_rasd_to_vdev(inst, dev); + return net_rasd_to_vdev(inst, dev, ns); } else if (type == CIM_RES_TYPE_MEM) { return mem_rasd_to_vdev(inst, dev); } else if (type == CIM_RES_TYPE_PROC) { @@ -595,9 +560,6 @@ 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"; goto out; @@ -608,7 +570,7 @@ if (domain->type == DOMAIN_LXC) msg = _container_rasd_to_vdev(inst, dev, type); else - msg = _sysvirt_rasd_to_vdev(inst, dev, type); + msg = _sysvirt_rasd_to_vdev(inst, dev, type, ns); out: if (msg) CU_DEBUG("rasd_to_vdev(%s): %s", CLASSNAME(op), msg);

1 0

[PATCH] [TEST] #2Fix VirtualSystemSnapshotService.01&02 to work with sblim base provider installed and without
by yunguol＠cn.ibm.com 25 Sep '08

25 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222313268 25200 # Node ID 3305a480c2e2b117b9a45d2e7c7ede9fd24375bf # Parent 375ae129b8e910fe42a5e4434b67ada5589bc72f [TEST] #2Fix VirtualSystemSnapshotService.01&02 to work with sblim base provider installed and without Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 375ae129b8e9 -r 3305a480c2e2 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Wed Sep 24 20:27:48 2008 -0700 @@ -23,6 +23,7 @@ # Date: 25-03-2008 import sys from XenKvmLib import enumclass +from XenKvmLib.common_util import check_sblim from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.const import do_main @@ -40,9 +41,14 @@ def main(): # Expected results from enumeration cn = get_typed_class(options.virt, "VirtualSystemSnapshotService") Name = 'SnapshotService' - status, host_name, classname = get_host_info(options.ip, options.virt) - if status != PASS: - return status + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_name = linux_cs.Name + classname = linux_cs.CreationClassName + else: + status, host_name, classname = get_host_info(options.ip, options.virt) + if status != PASS: + return status try: vs_sservice = enumclass.enumerate_inst(options.ip, "VirtualSystemSnapshotService", diff -r 375ae129b8e9 -r 3305a480c2e2 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Wed Sep 24 20:27:48 2008 -0700 @@ -28,6 +28,7 @@ import sys import sys import pywbem from XenKvmLib import assoc +from XenKvmLib.common_util import check_sblim from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.ReturnCodes import PASS from XenKvmLib.common_util import try_getinstance @@ -231,7 +232,12 @@ def main(): conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) ccn = get_typed_class(options.virt, "VirtualSystemSnapshotService") name = "SnapshotService" - status, sys_name, sccn = get_host_info(options.ip, options.virt) + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + sys_name = linux_cs.Name + sccn = linux_cs.CreationClassName + else: + status, sys_name, sccn = get_host_info(options.ip, options.virt) if status != PASS: return status field = 'INVALID_CCName'

2 1

[PATCH] [TEST] #2 Fix ResourcePoolConfigurationService.01&02 to work with sblim base provider installed and without
by yunguol＠cn.ibm.com 25 Sep '08

25 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222313124 25200 # Node ID 6f009d69469751477d8c3a91a37109a418e69412 # Parent 375ae129b8e910fe42a5e4434b67ada5589bc72f [TEST] #2 Fix ResourcePoolConfigurationService.01&02 to work with sblim base provider installed and without Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 375ae129b8e9 -r 6f009d694697 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Wed Sep 24 20:25:24 2008 -0700 @@ -25,6 +25,7 @@ import sys import sys from XenKvmLib import enumclass from XenKvmLib import rpcs +from XenKvmLib.common_util import check_sblim from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import logger @@ -39,12 +40,16 @@ def main(): server = options.ip classname = get_typed_class(options.virt, "ResourcePoolConfigurationService") keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(server, 'HostSystem', keys, options.virt)[0] - except Exception: - host_cn = get_typed_class(options.virt, "HostSystem") - logger.error(Globals.CIM_ERROR_ENUMERATE % host_cn) - return FAIL + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_sys = linux_cs + else: + try: + host_sys = enumclass.enumerate(server, 'HostSystem', keys, options.virt)[0] + except Exception: + host_cn = get_typed_class(options.virt, "HostSystem") + logger.error(Globals.CIM_ERROR_ENUMERATE % host_cn) + return FAIL try: rpcservice = rpcs.enumerate(server, classname) diff -r 375ae129b8e9 -r 6f009d694697 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Wed Sep 24 20:25:24 2008 -0700 @@ -29,6 +29,7 @@ import pywbem import pywbem from CimTest.ReturnCodes import PASS from XenKvmLib import assoc +from XenKvmLib.common_util import check_sblim from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from XenKvmLib.common_util import get_host_info, try_getinstance from XenKvmLib.const import do_main @@ -237,10 +238,15 @@ def main(): conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) virt = options.virt - status, hostname, sccname = get_host_info(server, virt) - if status != PASS: - logger.error("Problem getting host information") - return status + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + hostname = linux_cs.Name + sccname = linux_cs.CreationClassName + else: + status, hostname, sccname = get_host_info(server, virt) + if status != PASS: + logger.error("Problem getting host information") + return status classname = get_typed_class(virt, 'ResourcePoolConfigurationService') ret_value = err_invalid_ccname_keyname(conn, classname, hostname, sccname, \ field='INVALID_CCName_KeyName')

2 1

[PATCH] [TEST] #3 Add helper function() to fix HostSystem related tc work with sblim base provider installed
by yunguol＠cn.ibm.com 25 Sep '08

25 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222312007 25200 # Node ID 27157c757211adf675236cab10777541aa7c8922 # Parent 375ae129b8e910fe42a5e4434b67ada5589bc72f [TEST] #3 Add helper function() to fix HostSystem related tc work with sblim base provider installed Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 375ae129b8e9 -r 27157c757211 suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Wed Sep 24 20:06:47 2008 -0700 @@ -22,10 +22,6 @@ virt_types = ['Xen', 'KVM', 'XenFV', 'LX virt_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def get_typed_class(virt, basename): - if virt not in virt_types: - if virt != "Virt" and basename != "MigrationJob": - raise ValueError('Invalid class type') - if basename == None or basename == '': raise ValueError('Invalide class base name') diff -r 375ae129b8e9 -r 27157c757211 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Wed Sep 24 20:06:47 2008 -0700 @@ -27,7 +27,8 @@ from distutils.file_util import move_fil from distutils.file_util import move_file from XenKvmLib.test_xml import * from XenKvmLib.test_doms import * -from XenKvmLib import vsms +from XenKvmLib import vsms +from CimTest import Globals from XenKvmLib import enumclass from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance @@ -477,4 +478,23 @@ def libvirt_cached_data_poll(ip, virt, d sleep(1) - return cs + return cs + +def check_sblim(server, virt='Xen'): + status = FAIL + Globals.CIM_NS = 'root/cimv2' + keys = ['Name', 'CreationClassName'] + linux_cs = None + try: + linux = enumclass.enumerate(server, 'ComputerSystem', keys, 'Linux') + if len(linux) == 1: + status = PASS + linux_cs = linux[0] + else: + logger.info("Enumerate of Linux_ComputerSystem return NULL") + except Exception, detail: + logger.error(CIM_ERROR_ENUMERATE, 'Linux_ComputerSystem') + logger.error("Exception: %s", detail) + + Globals.CIM_NS = 'root/virt' + return status, linux_cs diff -r 375ae129b8e9 -r 27157c757211 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue Sep 23 04:45:04 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Wed Sep 24 20:06:47 2008 -0700 @@ -63,6 +63,23 @@ class CIM_MyClass(CIM_Instance): return self.inst[attr] else: return CimExt._Method(self.__invoke, attr) + +class Linux_ComputerSystem(CIM_Instance): + def __init__(self, server, keys): + conn = pywbem.WBEMConnection('http://%s' % server, + (Globals.CIM_USER, Globals.CIM_PASS), + Globals.CIM_NS) + + try: + classname = self.__class__.__name__ + ref = CIMInstanceName(classname, + keybindings=keys) + inst = conn.GetInstance(ref) + except pywbem.CIMError, arg: + raise arg + + CIM_Instance.__init__(self, inst) + class CIM_ComputerSystem(CIM_MyClass): pass

2 1

[PATCH] [TEST] Fix VirtualSystemSnapshotService.01&02 to work with sblim base provider installed and without
by yunguol＠cn.ibm.com 25 Sep '08

25 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222241113 25200 # Node ID e8629ccc57322c25ee54826a59b53a88f092bfdb # Parent d2ae228a60c34b78c3dd1e4f43f6a5413898980d [TEST] Fix VirtualSystemSnapshotService.01&02 to work with sblim base provider installed and without Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r d2ae228a60c3 -r e8629ccc5732 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Wed Sep 24 00:25:13 2008 -0700 @@ -23,6 +23,7 @@ # Date: 25-03-2008 import sys from XenKvmLib import enumclass +from XenKvmLib.common_util import check_sblim from CimTest.Globals import CIM_ERROR_ENUMERATE, logger from CimTest.ReturnCodes import PASS, FAIL from XenKvmLib.const import do_main @@ -40,9 +41,14 @@ def main(): # Expected results from enumeration cn = get_typed_class(options.virt, "VirtualSystemSnapshotService") Name = 'SnapshotService' - status, host_name, classname = get_host_info(options.ip, options.virt) - if status != PASS: - return status + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_name = linux_cs[0].Name + classname = linux_cs[0].CreationClassName + else: + status, host_name, classname = get_host_info(options.ip, options.virt) + if status != PASS: + return status try: vs_sservice = enumclass.enumerate_inst(options.ip, "VirtualSystemSnapshotService", diff -r d2ae228a60c3 -r e8629ccc5732 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/02_vs_sservice_gi_errs.py Wed Sep 24 00:25:13 2008 -0700 @@ -28,6 +28,7 @@ import sys import sys import pywbem from XenKvmLib import assoc +from XenKvmLib.common_util import check_sblim from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.ReturnCodes import PASS from XenKvmLib.common_util import try_getinstance @@ -231,7 +232,12 @@ def main(): conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) ccn = get_typed_class(options.virt, "VirtualSystemSnapshotService") name = "SnapshotService" - status, sys_name, sccn = get_host_info(options.ip, options.virt) + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + sys_name = linux_cs[0].Name + sccn = linux_cs[0].CreationClassName + else: + status, sys_name, sccn = get_host_info(options.ip, options.virt) if status != PASS: return status field = 'INVALID_CCName'

3 2

[PATCH] [TEST] Fix ResourcePoolConfigurationService.01&02 to work with sblim base provider installed and without
by yunguol＠cn.ibm.com 25 Sep '08

25 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222240437 25200 # Node ID 7c2de8fcf22951325f1bbcf67bd73b7f8cee871d # Parent d2ae228a60c34b78c3dd1e4f43f6a5413898980d [TEST] Fix ResourcePoolConfigurationService.01&02 to work with sblim base provider installed and without Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r d2ae228a60c3 -r 7c2de8fcf229 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Wed Sep 24 00:13:57 2008 -0700 @@ -25,6 +25,7 @@ import sys import sys from XenKvmLib import enumclass from XenKvmLib import rpcs +from XenKvmLib.common_util import check_sblim from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import logger @@ -39,12 +40,16 @@ def main(): server = options.ip classname = get_typed_class(options.virt, "ResourcePoolConfigurationService") keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(server, 'HostSystem', keys, options.virt)[0] - except Exception: - host_cn = get_typed_class(options.virt, "HostSystem") - logger.error(Globals.CIM_ERROR_ENUMERATE % host_cn) - return FAIL + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_sys = linux_cs[0] + else: + try: + host_sys = enumclass.enumerate(server, 'HostSystem', keys, options.virt)[0] + except Exception: + host_cn = get_typed_class(options.virt, "HostSystem") + logger.error(Globals.CIM_ERROR_ENUMERATE % host_cn) + return FAIL try: rpcservice = rpcs.enumerate(server, classname) diff -r d2ae228a60c3 -r 7c2de8fcf229 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Wed Sep 24 00:13:57 2008 -0700 @@ -29,6 +29,7 @@ import pywbem import pywbem from CimTest.ReturnCodes import PASS from XenKvmLib import assoc +from XenKvmLib.common_util import check_sblim from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from XenKvmLib.common_util import get_host_info, try_getinstance from XenKvmLib.const import do_main @@ -237,10 +238,15 @@ def main(): conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS), CIM_NS) virt = options.virt - status, hostname, sccname = get_host_info(server, virt) - if status != PASS: - logger.error("Problem getting host information") - return status + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + hostname = linux_cs[0].Name + sccname = linux_cs[0].CreationClassName + else: + status, hostname, sccname = get_host_info(server, virt) + if status != PASS: + logger.error("Problem getting host information") + return status classname = get_typed_class(virt, 'ResourcePoolConfigurationService') ret_value = err_invalid_ccname_keyname(conn, classname, hostname, sccname, \ field='INVALID_CCName_KeyName')

3 2

[PATCH] [TEST] #2 patch set of fixing HostSystem-01_enum.py with sblim base provider installed
by yunguol＠cn.ibm.com 24 Sep '08

24 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222236393 25200 # Node ID 83add054f191b8b6ad2c4ba53fce67cdca455989 # Parent d2ae228a60c34b78c3dd1e4f43f6a5413898980d [TEST] #2 patch set of fixing HostSystem-01_enum.py with sblim base provider installed Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r d2ae228a60c3 -r 83add054f191 suites/libvirt-cim/cimtest/HostSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Tue Sep 23 23:06:33 2008 -0700 @@ -27,12 +27,13 @@ import sys from XenKvmLib import enumclass +from XenKvmLib.common_util import check_sblim from XenKvmLib.classes import get_typed_class from VirtLib import live from VirtLib import utils from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from XenKvmLib.const import do_main -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, XFAIL SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] @@ -43,27 +44,34 @@ def main(): status = FAIL keys = ['Name', 'CreationClassName'] - try: - hs = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt) - name = get_typed_class(options.virt, 'HostSystem') + + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + name = 'Linux_ComputerSystem' + system = linux_cs[0] + else: + try: + hs = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt) + name = get_typed_class(options.virt, 'HostSystem') - if len(hs) != 1: - logger.error("Expected 1 %s instance returned" % name) - return FAIL + if len(hs) != 1: + logger.error("Expected 1 %s instance returned" % name) + return XFAIL - system = hs[0] + system = hs[0] + except Exception, details: + logger.error("%s %s: %s" % (CIM_ERROR_ENUMERATE, name, details)) + status = FAIL - if system.CreationClassName != name or system.Name != host: - logger.error("Exp %s, got %s" % (name, system.CreationClassName)) - logger.error("Exp %s, got %s" % (host, system.Name)) - status = FAIL - else: - logger.info("%s is %s" % (name, host)) - status = PASS - except Exception, details: - logger.error("%s %s: %s" % (CIM_ERROR_ENUMERATE, name, details)) + if system.CreationClassName != name or system.Name != host: + logger.error("Exp %s, got %s" % (name, system.CreationClassName)) + logger.error("Exp %s, got %s" % (host, system.Name)) status = FAIL + else: + logger.info("%s is %s" % (name, host)) + status = PASS + return status diff -r d2ae228a60c3 -r 83add054f191 suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Tue Sep 23 23:06:33 2008 -0700 @@ -22,10 +22,6 @@ virt_types = ['Xen', 'KVM', 'XenFV', 'LX virt_types = ['Xen', 'KVM', 'XenFV', 'LXC'] def get_typed_class(virt, basename): - if virt not in virt_types: - if virt != "Virt" and basename != "MigrationJob": - raise ValueError('Invalid class type') - if basename == None or basename == '': raise ValueError('Invalide class base name') diff -r d2ae228a60c3 -r 83add054f191 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Sep 23 23:06:33 2008 -0700 @@ -27,7 +27,8 @@ from distutils.file_util import move_fil from distutils.file_util import move_file from XenKvmLib.test_xml import * from XenKvmLib.test_doms import * -from XenKvmLib import vsms +from XenKvmLib import vsms +from CimTest import Globals from XenKvmLib import enumclass from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance @@ -477,4 +478,22 @@ def libvirt_cached_data_poll(ip, virt, d sleep(1) - return cs + return cs + +def check_sblim(server, virt='Xen'): + status = FAIL + Globals.CIM_NS = 'root/cimv2' + keys = ['Name', 'CreationClassName'] + try: + linux_cs = enumclass.enumerate(server, 'ComputerSystem', keys, 'Linux') + host_sys = enumclass.enumerate(server, 'HostSystem', keys, virt) + if len(linux_cs) == 1 and len(host_sys) == 0: + status = PASS + else: + logger.info("sblim base provider is not installed") + except Exception, detail: + logger.error(CIM_ERROR_ENUMERATE, 'Linux_ComputerSystem') + logger.error("Exception: %s", detail) + + Globals.CIM_NS = 'root/virt' + return status, linux_cs diff -r d2ae228a60c3 -r 83add054f191 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue Sep 23 23:06:33 2008 -0700 @@ -63,6 +63,23 @@ class CIM_MyClass(CIM_Instance): return self.inst[attr] else: return CimExt._Method(self.__invoke, attr) + +class Linux_ComputerSystem(CIM_Instance): + def __init__(self, server, keys): + conn = pywbem.WBEMConnection('http://%s' % server, + (Globals.CIM_USER, Globals.CIM_PASS), + Globals.CIM_NS) + + try: + classname = self.__class__.__name__ + ref = CIMInstanceName(classname, + keybindings=keys) + inst = conn.GetInstance(ref) + except pywbem.CIMError, arg: + raise arg + + CIM_Instance.__init__(self, inst) + class CIM_ComputerSystem(CIM_MyClass): pass

3 4

[PATCH] [TEST] Fix HostedService.01~04 with sblim base provider installed
by yunguol＠cn.ibm.com 24 Sep '08

24 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222239007 25200 # Node ID f09ea1ef1bf1c4c830985078b53e50a103635ae2 # Parent d2ae228a60c34b78c3dd1e4f43f6a5413898980d [TEST] Fix HostedService.01~04 with sblim base provider installed suites/libvirt-cim/cimtest/HostedService/cimtest.log diff -r d2ae228a60c3 -r f09ea1ef1bf1 suites/libvirt-cim/cimtest/HostedService/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Tue Sep 23 23:50:07 2008 -0700 @@ -24,6 +24,7 @@ import sys import sys from VirtLib import utils from XenKvmLib import assoc +from XenKvmLib.common_util import check_sblim from XenKvmLib import enumclass from XenKvmLib.classes import get_typed_class from CimTest import Globals @@ -36,12 +37,17 @@ sup_types = ['Xen', 'XenFV', 'KVM', 'LXC @do_main(sup_types) def main(): options = main.options - keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] - except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) - return FAIL + + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_sys = linux_cs[0] + else: + keys = ['Name', 'CreationClassName'] + try: + host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] + except Exception: + logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) + return FAIL try: service = assoc.AssociatorNames(options.ip, "HostedService", diff -r d2ae228a60c3 -r f09ea1ef1bf1 suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Tue Sep 23 23:50:07 2008 -0700 @@ -25,6 +25,7 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import assoc from XenKvmLib import enumclass +from XenKvmLib.common_util import check_sblim from XenKvmLib.classes import get_typed_class from CimTest import Globals from XenKvmLib.const import do_main @@ -36,12 +37,16 @@ sup_types = ['Xen', 'XenFV', 'KVM', 'LXC @do_main(sup_types) def main(): options = main.options - keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] - except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.CreationClassName) - return FAIL + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_sys = linux_cs[0] + else: + keys = ['Name', 'CreationClassName'] + try: + host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] + except Exception: + logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.CreationClassName) + return FAIL servicelist = {"ResourcePoolConfigurationService" : "RPCS", "VirtualSystemManagementService" : "Management Service", "VirtualSystemMigrationService" : "MigrationService"} @@ -67,7 +72,7 @@ def main(): ccn = assoc_host[0].keybindings['CreationClassName'] name = assoc_host[0].keybindings['Name'] - if ccn != get_typed_class(options.virt, "HostSystem"): + if ccn != get_typed_class(options.virt, "HostSystem") and ccn != 'Linux_ComputerSystem' : logger.error("CreationClassName Error") return FAIL elif name != host_sys.Name: diff -r d2ae228a60c3 -r f09ea1ef1bf1 suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/03_forward_errs.py Tue Sep 23 23:50:07 2008 -0700 @@ -25,6 +25,7 @@ from pywbem.cim_obj import CIMInstanceNa from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc from XenKvmLib import enumclass +from XenKvmLib.common_util import check_sblim from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_USER, \ CIM_PASS, CIM_NS @@ -41,11 +42,15 @@ def main(): rc = -1 status = FAIL keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] - except Exception: - logger.error(CIM_ERROR_ENUMERATE % host_sys.name) - return FAIL + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_sys = linux_cs[0] + else: + try: + host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] + except Exception: + logger.error(CIM_ERROR_ENUMERATE % host_sys.name) + return FAIL conn = assoc.myWBEMConnection('http://%s' % options.ip, diff -r d2ae228a60c3 -r f09ea1ef1bf1 suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/04_reverse_errs.py Tue Sep 23 23:50:07 2008 -0700 @@ -25,6 +25,7 @@ from pywbem.cim_obj import CIMInstanceNa from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc from XenKvmLib import enumclass +from XenKvmLib.common_util import check_sblim from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, CIM_USER, \ CIM_PASS, CIM_NS @@ -41,11 +42,15 @@ def main(): rc = -1 status = FAIL keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] - except Exception: - logger.error(CIM_ERROR_ENUMERATE % host_sys.name) - return FAIL + status, linux_cs = check_sblim(options.ip, options.virt) + if status == PASS: + host_sys = linux_cs[0] + else: + try: + host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] + except Exception: + logger.error(CIM_ERROR_ENUMERATE % host_sys.name) + return FAIL servicelist = {get_typed_class(options.virt, "ResourcePoolConfigurationService") : "RPCS",

4 3

[PATCH] (#2) Fix return value of ModifySystemSettings
by Dan Smith 24 Sep '08

24 Sep '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1222277765 25200 # Node ID 61a72b41f401bbba89b6c503bf4629400fcce60f # Parent 06e1fa131671f9d0ecd76a89c927864a887f0b0d (#2) Fix return value of ModifySystemSettings Changes: - Fix silly compile error Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 06e1fa131671 -r 61a72b41f401 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Sep 24 09:30:41 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Wed Sep 24 10:36:05 2008 -0700 @@ -1210,17 +1210,27 @@ CMPIArgs *argsout) { CMPIInstance *inst; + CMPIStatus s; + uint32_t rc; if (cu_get_inst_arg(argsin, "SystemSettings", &inst) != CMPI_RC_OK) { - CMPIStatus s; cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Missing SystemSettings"); - return s; + goto out; } - return update_system_settings(context, reference, inst); + s = update_system_settings(context, reference, inst); + out: + if (s.rc == CMPI_RC_OK) + rc = CIM_SVPC_RETURN_COMPLETED; + else + rc = CIM_SVPC_RETURN_FAILED; + + CMReturnData(results, &rc, CMPI_uint32); + + return s; } typedef CMPIStatus (*resmod_fn)(struct domain *,

1 0

[PATCH] Fix return value of ModifySystemSettings
by Dan Smith 24 Sep '08

24 Sep '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1222190876 25200 # Node ID 29d96fbb316175f6d1590929752a7e688f00fc8e # Parent 16cdfa1774d4b9fa65e6e835a9f5fc5a37d52051 Fix return value of ModifySystemSettings Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 16cdfa1774d4 -r 29d96fbb3161 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Sep 23 07:10:47 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Tue Sep 23 10:27:56 2008 -0700 @@ -1210,6 +1210,7 @@ CMPIArgs *argsout) { CMPIInstance *inst; + uint32_t rc; if (cu_get_inst_arg(argsin, "SystemSettings", &inst) != CMPI_RC_OK) { CMPIStatus s; @@ -1217,10 +1218,19 @@ cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Missing SystemSettings"); - return s; + goto out; } - return update_system_settings(context, reference, inst); + s = update_system_settings(context, reference, inst); + out: + if (s.rc == CMPI_RC_OK) + rc = CIM_SVPC_RETURN_COMPLETED; + else + rc = CIM_SVPC_RETURN_FAILED; + + CMReturnData(results, &rc, CMPI_uint32); + + return s; } typedef CMPIStatus (*resmod_fn)(struct domain *,

1 0

[PATCH] [TEST] Updating the 03_ld_gi_errs.py, 03_proc_gi_errs.py, 03_sds_fwd_errs.py tc
by Deepti B. Kalakeri 24 Sep '08

24 Sep '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1222240659 -19800 # Node ID d06e48783aa9811d497f685e3bb0e4495da629bc # Parent d2ae228a60c34b78c3dd1e4f43f6a5413898980d [TEST] Updating the 03_ld_gi_errs.py, 03_proc_gi_errs.py, 03_sds_fwd_errs.py tc Updating the exception message which was used to verify the error message when an invalid device id is passed because of the changes that went in as part of "Add a little debugging to the device path" patch. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r d2ae228a60c3 -r d06e48783aa9 suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/03_ld_gi_errs.py Wed Sep 24 12:47:39 2008 +0530 @@ -138,15 +138,16 @@ sup_types = ['Xen', 'KVM', 'XenFV'] sup_types = ['Xen', 'KVM', 'XenFV'] expr_values = { - "invalid_ccname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : "No such instance (CreationClassName)" }, \ - "invalid_devid_keyname" : {'rc' : pywbem.CIM_ERR_FAILED, \ - 'desc' : "No DeviceID specified" }, \ - "invalid_devid_keyvalue" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : "No such instance (INVALID_DevID_Keyvalue)" },\ - "invalid_sccname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : "No such instance (SystemCreationClassName)" },\ - "invalid_sysname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, \ + "invalid_ccname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : "No such instance (CreationClassName)" }, + "invalid_devid_keyname" : {'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : "No DeviceID specified" }, + "invalid_devid_keyvalue" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : "No such instance "\ + "(bad id INVALID_DevID_Keyvalue)" }, + "invalid_sccname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : "No such instance (SystemCreationClassName)" }, + "invalid_sysname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, 'desc' : "No such instance (SystemName)" } } @@ -157,13 +158,13 @@ def try_invalid_gi(i, field1, field2): temp = name_val[i] name_val[i] = field1 keys = { - name_val[0] : name_val[1], \ - name_val[2] : name_val[3], \ - name_val[4] : name_val[5], \ + name_val[0] : name_val[1], + name_val[2] : name_val[3], + name_val[4] : name_val[5], name_val[6] : name_val[7] } - ret_value = try_getinstance(conn, classname, keys, field_name=field1, \ - expr_values=expr_values[field2], bug_no="") + ret_value = try_getinstance(conn, classname, keys, field_name=field1, + expr_values=expr_values[field2], bug_no="") if ret_value != PASS: logger.error("------ FAILED: %s------" % field1) name_val[i] = temp @@ -208,19 +209,19 @@ def main(): global name_val name_val = [ - 'CreationClassName', disk.CreationClassName, \ - 'DeviceID', disk.DeviceID, \ - 'SystemCreationClassName', disk.SystemCreationClassName, \ + 'CreationClassName', disk.CreationClassName, + 'DeviceID', disk.DeviceID, + 'SystemCreationClassName', disk.SystemCreationClassName, 'SystemName', disk.SystemName ] - tc_scen = { 'INVALID_CCName_Keyname' : 'invalid_ccname', \ - 'INVALID_CCName_Keyvalue' : 'invalid_ccname', \ - 'INVALID_DevID_Keyname' : 'invalid_devid_keyname', \ - 'INVALID_DevID_Keyvalue' : 'invalid_devid_keyvalue', \ - 'INVALID_SCCName_Keyname' : 'invalid_sccname', \ - 'INVALID_SCCName_Keyvalue' : 'invalid_sccname', \ - 'INVALID_SysName_Keyname' : 'invalid_sysname', \ + tc_scen = { 'INVALID_CCName_Keyname' : 'invalid_ccname', + 'INVALID_CCName_Keyvalue' : 'invalid_ccname', + 'INVALID_DevID_Keyname' : 'invalid_devid_keyname', + 'INVALID_DevID_Keyvalue' : 'invalid_devid_keyvalue', + 'INVALID_SCCName_Keyname' : 'invalid_sccname', + 'INVALID_SCCName_Keyvalue' : 'invalid_sccname', + 'INVALID_SysName_Keyname' : 'invalid_sysname', 'INVALID_SysName_Keyvalue' : 'invalid_sysname' } diff -r d2ae228a60c3 -r d06e48783aa9 suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py --- a/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/Processor/03_proc_gi_errs.py Wed Sep 24 12:47:39 2008 +0530 @@ -141,7 +141,8 @@ expr_values = { "invalid_devid_keyname" : {'rc' : pywbem.CIM_ERR_FAILED, 'desc' : "No DeviceID specified" }, "invalid_devid_keyvalue" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, - 'desc' : "No such instance (INVALID_DevID_Keyvalue)" }, + 'desc' : "No such instance "\ + "(bad id INVALID_DevID_Keyvalue)" }, "invalid_sccname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, 'desc' : "No such instance (SystemCreationClassName)" }, "invalid_sysname" : {'rc' : pywbem.CIM_ERR_NOT_FOUND, @@ -161,8 +162,8 @@ def try_invalid_gi(i, field1, field2): k = j * 2 keys[name_val[k]] = name_val[k+1] - ret_value = try_getinstance(conn, classname, keys, field_name=field1, \ - expr_values=expr_values[field2], bug_no="") + ret_value = try_getinstance(conn, classname, keys, field_name=field1, + expr_values=expr_values[field2], bug_no="") if ret_value != PASS: logger.error("------ FAILED: %s------" % field1) name_val[i] = temp diff -r d2ae228a60c3 -r d06e48783aa9 suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Mon Sep 22 11:28:02 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Wed Sep 24 12:47:39 2008 +0530 @@ -161,30 +161,30 @@ test_vcpus = 1 test_vcpus = 1 expr_values = { - "INVALID_DevID_Keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \ - 'desc' : 'No DeviceID specified' }, \ - "INVALID_DevID_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (INVALID_DevID_Keyval)'}, \ - "INVALID_CCName_Keyname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (CreationClassName)'}, \ - "INVALID_CCName_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (CreationClassName)'}, \ - "INVALID_SCCName_Keyname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (SystemCreationClassName)'}, \ - "INVALID_SCCName_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (SystemCreationClassName)'}, \ - "INVALID_SysName_Keyname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ - 'desc' : 'No such instance (SystemName)'}, \ - "INVALID_SysName_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ + "INVALID_DevID_Keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, + 'desc' : 'No DeviceID specified' }, + "INVALID_DevID_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'No such instance (bad id INVALID_DevID_Keyval)'}, + "INVALID_CCName_Keyname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'No such instance (CreationClassName)'}, + "INVALID_CCName_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'No such instance (CreationClassName)'}, + "INVALID_SCCName_Keyname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'No such instance (SystemCreationClassName)'}, + "INVALID_SCCName_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'No such instance (SystemCreationClassName)'}, + "INVALID_SysName_Keyname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, + 'desc' : 'No such instance (SystemName)'}, + "INVALID_SysName_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, 'desc' : 'No such instance (SystemName)'} } def get_name_val(classname, device_id, sccn): devid = "%s/%s" % (test_dom, device_id) name_val = [ - 'DeviceID' , devid, \ - 'CreationClassName' , classname, \ - 'SystemCreationClassName' , sccn, \ + 'DeviceID' , devid, + 'CreationClassName' , classname, + 'SystemCreationClassName' , sccn, 'SystemName' , test_dom ] return name_val @@ -197,8 +197,8 @@ def try_invalid_assoc(classname, name_va k = j * 2 keys[name_val[k]] = name_val[k+1] ac_classname = get_typed_class(virt, 'SettingsDefineState') - ret_val = try_assoc(conn, classname, ac_classname, keys, field_name=field, \ - expr_values=expr_values[field], bug_no='') + ret_val = try_assoc(conn, classname, ac_classname, keys, field_name=field, + expr_values=expr_values[field], bug_no='') if ret_val != PASS: logger.error("------ FAILED: %s------" % field) name_val[i] = temp @@ -227,8 +227,8 @@ def main(): return FAIL global conn - conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, \ - CIM_PASS), CIM_NS) + conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, + CIM_PASS), CIM_NS) if options.virt == 'LXC': class_id = {get_typed_class(options.virt, 'Memory') : 'mem'} else: @@ -240,9 +240,9 @@ def main(): } tc_scen = [ - 'INVALID_DevID_Keyname', 'INVALID_DevID_Keyval', \ - 'INVALID_CCName_Keyname', 'INVALID_CCName_Keyval', \ - 'INVALID_SCCName_Keyname', 'INVALID_SCCName_Keyval', \ + 'INVALID_DevID_Keyname', 'INVALID_DevID_Keyval', + 'INVALID_CCName_Keyname', 'INVALID_CCName_Keyval', + 'INVALID_SCCName_Keyname', 'INVALID_SCCName_Keyval', 'INVALID_SysName_Keyname', 'INVALID_SysName_Keyval' ]

1 0

[PATCH 0 of 4] [TEST] Fix HostSystem.01 to work with sblim base provider installed and not
by yunguol＠cn.ibm.com 24 Sep '08

24 Sep '08

Follow up patch will fix the behavior of the enumerate() function, then update this patch sets Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

3 7

[PATCH] [TEST]Fix HostSystem-01_enum.py with sblim cmpi base provider installed, add Linux_ComputerSystem to enumclass
by yunguol＠cn.ibm.com 24 Sep '08

24 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1222062868 25200 # Node ID 83e6f32be2ae455bfec0f014374889a5217f1168 # Parent 892ce3fce2340df3fb51a1160f510d15838f2d54 [TEST]Fix HostSystem-01_enum.py with sblim cmpi base provider installed, add Linux_ComputerSystem to enumclass Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 892ce3fce234 -r 83e6f32be2ae suites/libvirt-cim/cimtest/HostSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Fri Sep 12 14:35:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/01_enum.py Sun Sep 21 22:54:28 2008 -0700 @@ -32,8 +32,9 @@ from VirtLib import utils from VirtLib import utils from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from XenKvmLib.const import do_main -from CimTest.ReturnCodes import PASS, FAIL +from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC +bug = '00007' SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(SUPPORTED_TYPES) @@ -43,27 +44,35 @@ def main(): status = FAIL keys = ['Name', 'CreationClassName'] - try: - hs = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt) - name = get_typed_class(options.virt, 'HostSystem') + + linux_cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, 'Linux') + hs = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt) + if len(linux_cs) == 1 and len(hs) == 0: + return PASS + if len(linux_cs) == 0 and len(hs) == 0: + return XFAIL_RC(bug) + elif len(linux_cs) == 0 and len(hs)== 1: + try: + hs = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt) + name = get_typed_class(options.virt, 'HostSystem') - if len(hs) != 1: - logger.error("Expected 1 %s instance returned" % name) - return FAIL + if len(hs) != 1: + logger.error("Expected 1 %s instance returned" % name) + return FAIL - system = hs[0] + system = hs[0] - if system.CreationClassName != name or system.Name != host: - logger.error("Exp %s, got %s" % (name, system.CreationClassName)) - logger.error("Exp %s, got %s" % (host, system.Name)) + if system.CreationClassName != name or system.Name != host: + logger.error("Exp %s, got %s" % (name, system.CreationClassName)) + logger.error("Exp %s, got %s" % (host, system.Name)) + status = FAIL + else: + logger.info("%s is %s" % (name, host)) + status = PASS + + except Exception, details: + logger.error("%s %s: %s" % (CIM_ERROR_ENUMERATE, name, details)) status = FAIL - else: - logger.info("%s is %s" % (name, host)) - status = PASS - - except Exception, details: - logger.error("%s %s: %s" % (CIM_ERROR_ENUMERATE, name, details)) - status = FAIL return status diff -r 892ce3fce234 -r 83e6f32be2ae suites/libvirt-cim/lib/XenKvmLib/classes.py --- a/suites/libvirt-cim/lib/XenKvmLib/classes.py Fri Sep 12 14:35:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/classes.py Sun Sep 21 22:54:28 2008 -0700 @@ -23,6 +23,8 @@ virt_types = ['Xen', 'KVM', 'XenFV', 'LX def get_typed_class(virt, basename): if virt not in virt_types: + if virt == "Linux" and basename == "ComputerSystem": + return 'Linux_ComputerSystem' if virt != "Virt" and basename != "MigrationJob": raise ValueError('Invalid class type') diff -r 892ce3fce234 -r 83e6f32be2ae suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri Sep 12 14:35:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Sun Sep 21 22:54:28 2008 -0700 @@ -68,6 +68,9 @@ class CIM_ComputerSystem(CIM_MyClass): pass class CIM_System(CIM_MyClass): + pass + +class Linux_ComputerSystem(CIM_MyClass): pass class CIM_AllocationCapabilities(CIM_MyClass):

3 3

[PATCH] [TEST] Fixing 05_RAPF_err.py tc of RAFP
by Deepti B. Kalakeri 24 Sep '08

24 Sep '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1222108082 25200 # Node ID c87a451fbf690b718e800be49ecc7ec83b83ad9b # Parent 892ce3fce2340df3fb51a1160f510d15838f2d54 [TEST] Fixing 05_RAPF_err.py tc of RAFP. Removed the verification for wrong bridge type as this is not yet supported in the providers. Tested with Xen/XenFV, KVM[F9] with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 892ce3fce234 -r c87a451fbf69 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py Fri Sep 12 14:35:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/05_RAPF_err.py Mon Sep 22 11:28:02 2008 -0700 @@ -52,46 +52,19 @@ from CimTest import Globals from CimTest import Globals from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from CimTest.ReturnCodes import PASS, FAIL -from XenKvmLib.const import do_main, platform_sup +from XenKvmLib.const import do_main from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import default_network_name +from XenKvmLib.common_util import create_netpool_conf, destroy_netpool test_dom = "RAPF_domain" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 +npool_name = default_network_name + str(random.randint(1, 100)) +sup_types = ['KVM', 'Xen', 'XenFV'] -def get_unique_interface(server, virt, nettype='network'): - interface = "wrong-int" - if nettype == 'bridge': - int_list = live.available_bridges(server) - else: - int_list = live.net_list(server, virt) - - while interface in int_list: - interface = interface + str(random.randint(1, 100)) - - return interface - -def modify_net_name(server, virt, nettype, vsxml): - if nettype == 'bridge': - int_name = vsxml.xml_get_net_bridge() - else: - int_name = vsxml.xml_get_net_network() - - if int_name == None: - devices = vsxml.get_node('/domain/devices') - vsxml.set_interface_details(devices, test_mac, nettype, virt) - - int_name = get_unique_interface(server, virt, nettype) - - if nettype == 'bridge': - vsxml.set_bridge_name(int_name) - else: - vsxml.set_net_name(int_name) - - return vsxml - -def setup_env(server, virt, nettype='network'): +def setup_env(server, virt, net_name, nettype='network'): vsxml_info = None if virt == "Xen": test_disk = "xvda" @@ -101,14 +74,16 @@ def setup_env(server, virt, nettype='net virt_xml = vxml.get_class(virt) vsxml_info = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, disk = test_disk, - ntype = nettype) - - vsxml_info = modify_net_name(server, virt, nettype, vsxml_info) + ntype = nettype, net_name=net_name) ret = vsxml_info.cim_define(server) if not ret: - Globals.logger.error("Failed to define the dom '%s' for '%s' type" - " interface", test_dom, nettype) + logger.error("Failed to define the dom '%s' for '%s' type" + " interface", test_dom, nettype) + if virt != 'KVM': + status = destroy_netpool(server, virt, net_name) + if status != PASS: + logger.error("Failed to destroy the networkpool %s", net_name) return FAIL, vsxml_info return PASS, vsxml_info @@ -196,31 +171,50 @@ def verify_rapf_err(server, virt, vsxml) return status -@do_main(platform_sup) +@do_main(sup_types) def main(): options = main.options server = options.ip virt = options.virt destroy_and_undefine_all(server) - in_list = [ 'bridge', 'network' ] + in_list = 'network' - for interface in in_list: - # This is req bcs virsh does not support the defining a guest - # when an invalid network poolname is passed. - if interface == 'network' and virt != 'KVM': - continue + # libvirt does not allow to define a guest with invalid networkpool info + # for Xen and XenFV, but it does not restrict to do so for KVM. + # Hence passing wrong networkpool for KVM and a valid networkpool for + # Xen and XenFV otherwise. + if virt == 'KVM': + int_name = 'wrong-int' + else: + status, int_name = create_netpool_conf(options.ip, options.virt, + use_existing=False, + net_name=npool_name) + if status != PASS: + logger.error('Unable to create network pool') + return FAIL - status, vsxml = setup_env(server, virt, interface) + + # Since we cannot create a Xen/XenFV guest with invalid networkpool info, + # we first create a guest with valid networkpool info and then + # then destroy the networkpool info as a work around to, verify if the + # provider returns an exception for Xen/XenFV guest when its networkpool + # does not exist anymore on the machine. + status, vsxml = setup_env(server, virt, int_name, in_list) + if status != PASS: + logger.error("Failed to setup the domain") + vsxml.undefine(server) + return status + + if virt != 'KVM': + status = destroy_netpool(server, virt, int_name) if status != PASS: - logger.error("Failed to setup the domain") + logger.error("Failed to destroy the virtual network %s", net_name) vsxml.undefine(server) return status - ret = verify_rapf_err(server, virt, vsxml) - if ret: - logger.error("------FAILED: to verify the RAFP.------") - vsxml.undefine(server) - return ret + status = verify_rapf_err(server, virt, vsxml) + if status != PASS: + logger.error("------FAILED: to verify the RAFP.------") vsxml.undefine(server) return status diff -r 892ce3fce234 -r c87a451fbf69 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Sep 12 14:35:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Mon Sep 22 11:28:02 2008 -0700 @@ -233,6 +233,7 @@ def default_vssd_rasd_str(dom_name='test disk_source=const.Xen_disk_path, net_type='ethernet', net_mac=const.Xen_default_mac, + net_name=None, proc_vcpu=1, mem_mb=512, malloc_units="MegaBytes", @@ -279,7 +280,8 @@ def default_vssd_rasd_str(dom_name='test n = class_nasd( type=net_type, mac=net_mac, - name=dom_name) + name=dom_name, + virt_net=net_name) class_pasd = get_pasd_class(virt) p = class_pasd( vcpu=proc_vcpu, diff -r 892ce3fce234 -r c87a451fbf69 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Fri Sep 12 14:35:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Sep 22 11:28:02 2008 -0700 @@ -467,7 +467,7 @@ class VirtXML(Virsh, XMLClass): class VirtCIM: def __init__(self, virt, dom_name, disk_dev, disk_source, - net_type, net_mac, vcpus, mem, mem_allocunits): + net_type, net_name, net_mac, vcpus, mem, mem_allocunits): self.virt = virt self.domain_name = dom_name self.vssd = vsms.get_vssd_class(virt)(name=dom_name, virt=virt) @@ -476,7 +476,8 @@ class VirtCIM: name=dom_name) self.nasd = vsms.get_nasd_class(virt)(type=net_type, mac=net_mac, - name=dom_name) + name=dom_name, + virt_net=net_name) self.pasd = vsms.get_pasd_class(virt)(vcpu=vcpus, name=dom_name) self.masd = vsms.get_masd_class(virt)(megabytes=mem, mallocunits=mem_allocunits, @@ -545,7 +546,7 @@ class XenXML(VirtXML, VirtCIM): self._devices(disk_file_path, disk, ntype, mac, net_name) VirtCIM.__init__(self, 'Xen', test_dom, disk, disk_file_path, - ntype, mac, vcpus, mem, mem_allocunits) + ntype, net_name, mac, vcpus, mem, mem_allocunits) def _os(self, os_kernel, os_initrd): os = self.get_node('/domain/os') @@ -596,7 +597,7 @@ class KVMXML(VirtXML, VirtCIM): sys.exit(1) VirtXML.__init__(self, 'kvm', test_dom, set_uuid(), mem, vcpus) VirtCIM.__init__(self, 'KVM', test_dom, disk, disk_file_path, - ntype, mac, vcpus, mem, mem_allocunits) + ntype, net_name, mac, vcpus, mem, mem_allocunits) self._os() self._devices(const.KVM_default_emulator, ntype, disk_file_path, disk, mac, net_name) @@ -643,7 +644,7 @@ class XenFVXML(VirtXML, VirtCIM): sys.exit(1) VirtXML.__init__(self, 'xenfv', test_dom, set_uuid(), mem, vcpus) VirtCIM.__init__(self, 'XenFV', test_dom, disk, disk_file_path, - ntype, mac, vcpus, mem, mem_allocunits) + ntype, net_name, mac, vcpus, mem, mem_allocunits) self._features() self._os(const.XenFV_default_loader) self._devices(const.XenFV_default_emulator,

3 3

KVM on Pegasus Test Run Summary for Sep 23 2008
by Deepti B Kalakeri 24 Sep '08

24 Sep '08

================================================= KVM on Pegasus Test Run Summary for Sep 23 2008 ================================================= Distro: Fedora release 9.90.1 (Rawhide) Kernel: 2.6.27-0.322.rc6.fc10.x86_64 libvirt: 0.4.5 Hypervisor: QEMU 0.9.1 CIMOM: Pegasus 2.7.1 Libvirt-cim revision: 688 Libvirt-cim changeset: bc734ecd67ae ================================================= FAIL : 6 XFAIL : 3 SKIP : 6 PASS : 120 ----------------- Total : 135 ================================================= FAIL Test Summary: ElementConforms - 01_forward.py: FAIL HostSystem - 01_enum.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL LogicalDisk - 03_ld_gi_errs.py: FAIL Processor - 03_proc_gi_errs.py: FAIL SettingsDefine - 03_sds_fwd_errs.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 32_start_reboot.py: XFAIL ComputerSystem - 33_suspend_reboot.py: XFAIL ResourceAllocationFromPool - 05_RAPF_err.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP LogicalDisk - 02_nodevs.py: SKIP VSSD - 02_bootldr.py: SKIP VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP ================================================= Full report: -------------------------------------------------------------------- AllocationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- AllocationCapabilities - 02_alloccap_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 01_enum.py: PASS -------------------------------------------------------------------- ComputerSystem - 02_nosystems.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- ComputerSystem - 03_defineVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 04_defineStartVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 05_activate_defined_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 06_paused_active_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 22_define_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 23_suspend_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 27_define_suspend_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 32_start_reboot.py: XFAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed') ERROR - Unable to 'Reboot' dom 'cs_test_domain' using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed Bug:<00005> -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: XFAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain Operation Failed') ERROR - Unable to 'Reboot' dom 'test_domain' using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain Operation Failed Bug:<00005> -------------------------------------------------------------------- ComputerSystem - 35_start_reset.py: PASS -------------------------------------------------------------------- ComputerSystem - 40_RSC_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 41_cs_to_settingdefinestate.py: PASS -------------------------------------------------------------------- ComputerSystem - 42_cs_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystemIndication - 01_created_indication.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 03_reverse_errs.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 04_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- ElementCapabilities - 02_reverse.py: PASS -------------------------------------------------------------------- ElementCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 05_hostsystem_cap.py: PASS -------------------------------------------------------------------- ElementConforms - 01_forward.py: FAIL ERROR - Name Mismatch ERROR - Returned elm3b41.beaverton.ibm.com instead of elm3b41 -------------------------------------------------------------------- ElementConforms - 02_reverse.py: PASS -------------------------------------------------------------------- ElementConforms - 03_ectp_fwd_errs.py: PASS -------------------------------------------------------------------- ElementConforms - 04_ectp_rev_errs.py: PASS -------------------------------------------------------------------- ElementSettingData - 01_forward.py: PASS -------------------------------------------------------------------- ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 01_enum.py: FAIL ERROR - Exp KVM_HostSystem, got KVM_HostSystem ERROR - Exp elm3b41, got elm3b41.beaverton.ibm.com -------------------------------------------------------------------- HostSystem - 02_hostsystem_to_rasd.py: PASS -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - Hostname mismatch KVM_HostSystem : elm3b41 -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: PASS -------------------------------------------------------------------- HostSystem - 05_hs_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 06_hs_to_vsms.py: PASS -------------------------------------------------------------------- HostedDependency - 01_forward.py: PASS -------------------------------------------------------------------- HostedDependency - 02_reverse.py: PASS -------------------------------------------------------------------- HostedDependency - 03_enabledstate.py: PASS -------------------------------------------------------------------- HostedDependency - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 01_forward.py: PASS -------------------------------------------------------------------- HostedResourcePool - 02_reverse.py: PASS -------------------------------------------------------------------- HostedResourcePool - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedService - 01_forward.py: PASS -------------------------------------------------------------------- HostedService - 02_reverse.py: PASS -------------------------------------------------------------------- HostedService - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedService - 04_reverse_errs.py: PASS -------------------------------------------------------------------- LogicalDisk - 01_disk.py: PASS -------------------------------------------------------------------- LogicalDisk - 02_nodevs.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- LogicalDisk - 03_ld_gi_errs.py: FAIL Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyvalue------ -------------------------------------------------------------------- Memory - 01_memory.py: PASS -------------------------------------------------------------------- Memory - 02_defgetmem.py: PASS -------------------------------------------------------------------- Memory - 03_mem_gi_errs.py: PASS -------------------------------------------------------------------- NetworkPort - 01_netport.py: PASS -------------------------------------------------------------------- NetworkPort - 02_np_gi_errors.py: PASS -------------------------------------------------------------------- NetworkPort - 03_user_netport.py: PASS -------------------------------------------------------------------- Processor - 01_processor.py: PASS -------------------------------------------------------------------- Processor - 02_definesys_get_procs.py: PASS -------------------------------------------------------------------- Processor - 03_proc_gi_errs.py: FAIL Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyvalue------ -------------------------------------------------------------------- Profile - 01_enum.py: PASS -------------------------------------------------------------------- Profile - 02_profile_to_elec.py: PASS -------------------------------------------------------------------- Profile - 03_rprofile_gi_errs.py: PASS -------------------------------------------------------------------- RASD - 01_verify_rasd_fields.py: PASS -------------------------------------------------------------------- RASD - 02_enum.py: PASS -------------------------------------------------------------------- RASD - 03_rasd_errs.py: PASS -------------------------------------------------------------------- RASD - 04_disk_rasd_size.py: PASS -------------------------------------------------------------------- ReferencedProfile - 01_verify_refprof.py: PASS -------------------------------------------------------------------- ReferencedProfile - 02_refprofile_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: XFAIL ERROR - 'KVM_ResourceAllocationFromPool' association failed to generate an exception and 'InstanceID' passed. ERROR - ------FAILED: to verify the RAFP.------ Bug:<> -------------------------------------------------------------------- ResourcePool - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePool - 02_rp_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- SettingsDefine - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefine - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 03_sds_fwd_errs.py: FAIL Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit msg = self.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format return fmt.format(record) File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format record.message = record.getMessage() File "/usr/lib64/python2.5/logging/__init__.py", line 288, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ -------------------------------------------------------------------- SettingsDefine - 04_sds_rev_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS -------------------------------------------------------------------- SystemDevice - 01_forward.py: PASS -------------------------------------------------------------------- SystemDevice - 02_reverse.py: PASS -------------------------------------------------------------------- SystemDevice - 03_fwderrs.py: PASS -------------------------------------------------------------------- VSSD - 01_enum.py: PASS -------------------------------------------------------------------- VSSD - 02_bootldr.py: SKIP -------------------------------------------------------------------- VSSD - 03_vssd_gi_errs.py: PASS -------------------------------------------------------------------- VSSD - 04_vssd_to_rasd.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 01_definesystem_name.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 02_destroysystem.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 03_definesystem_ess.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 04_definesystem_ers.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 05_destroysystem_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 06_addresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 09_procrasd_persist.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 10_hv_version.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 11_define_memrasdunits.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 12_referenced_config.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 01_migratable_host.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 01_forward.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 02_reverse.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS -------------------------------------------------------------------- Thanks and Regards, Deepti.

2 2

[PATCH] (#2) Remove value 4 from VSSD ValueMap
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222201308 25200 # Node ID 193c94848d62dfeb5eb00566d0331995c4a42931 # Parent 30bffd9a299131895f695f0061dc57141dc09a97 (#2) Remove value 4 from VSSD ValueMap. libvirt treats "Turn Off" and "Shutdown" in the same manner. Updates: -Remove unintended debug Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 30bffd9a2991 -r 193c94848d62 schema/VSSD.mof --- a/schema/VSSD.mof Tue Sep 23 13:22:54 2008 -0700 +++ b/schema/VSSD.mof Tue Sep 23 13:21:48 2008 -0700 @@ -29,6 +29,10 @@ "One of hd,fd,cdrom.")] string BootDevice; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + }; [Description ( @@ -41,6 +45,10 @@ [Description ("The device to boot from. One of hd,fd,cdrom.")] string BootDevice; + + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; }; @@ -55,4 +63,8 @@ [Description ("Path to the init process for the container")] string InitPath; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + };

1 0

[PATCH] Remove value 4 from VSSD ValueMap
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222113882 25200 # Node ID 8d683acf0587201617d65d8da41818a00165b398 # Parent 1dcb9b94763bc92ad33e0ff2d2483e771253102c Remove value 4 from VSSD ValueMap. libvirt treats "Turn Off" and "Shutdown" in the same manner. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 1dcb9b94763b -r 8d683acf0587 schema/VSSD.mof --- a/schema/VSSD.mof Fri Sep 19 11:30:54 2008 -0700 +++ b/schema/VSSD.mof Mon Sep 22 13:04:42 2008 -0700 @@ -29,6 +29,10 @@ "One of hd,fd,cdrom.")] string BootDevice; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + }; [Description ( @@ -41,6 +45,10 @@ [Description ("The device to boot from. One of hd,fd,cdrom.")] string BootDevice; + + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; }; @@ -55,4 +63,8 @@ [Description ("Path to the init process for the container")] string InitPath; + [Override, ValueMap { "2", "3", ".." }, + Values { "Turn Off", "Save state", "DMTF Reserved" }] + uint16 AutomaticShutdownAction; + }; diff -r 1dcb9b94763b -r 8d683acf0587 src/Virt_KVMRedirectionSAP.c --- a/src/Virt_KVMRedirectionSAP.c Fri Sep 19 11:30:54 2008 -0700 +++ b/src/Virt_KVMRedirectionSAP.c Mon Sep 22 13:04:42 2008 -0700 @@ -194,17 +194,25 @@ CU_DEBUG("calling get_console_sap"); inst = get_console_sap(_BROKER, ref, conn, dominfo, &s); +CU_DEBUG("after get_console"); virDomainFree(list[i]); cleanup_dominfo(&dominfo); - if (inst == NULL) + if (inst == NULL) { +CU_DEBUG("instance is null, continuing"); continue; + } - if (names_only) +CU_DEBUG("returning inst"); + if (names_only) { +CU_DEBUG("names_only"); cu_return_instance_name(results, inst); - else + } + else { +CU_DEBUG("no names"); CMReturnInstance(results, inst); + } } out:

2 2

XenFV on Pegasus Test Run Summary for Sep 23 2008
by Deepti B Kalakeri 23 Sep '08

23 Sep '08

================================================= XenFV on Pegasus Test Run Summary for Sep 23 2008 ================================================= Distro: Red Hat Enterprise Linux Server release 5.2 (Tikanga) Kernel: 2.6.18-92.el5xen libvirt: 0.3.3 Hypervisor: Xen 3.1.0 CIMOM: Pegasus 2.7.0 Libvirt-cim revision: 688 Libvirt-cim changeset: bc734ecd67ae ================================================= FAIL : 3 XFAIL : 1 SKIP : 4 PASS : 127 ----------------- Total : 135 ================================================= FAIL Test Summary: LogicalDisk - 03_ld_gi_errs.py: FAIL Processor - 03_proc_gi_errs.py: FAIL SettingsDefine - 03_sds_fwd_errs.py: FAIL ================================================= XFAIL Test Summary: ResourceAllocationFromPool - 05_RAPF_err.py: XFAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP LogicalDisk - 02_nodevs.py: SKIP NetworkPort - 03_user_netport.py: SKIP VSSD - 02_bootldr.py: SKIP ================================================= Full report: -------------------------------------------------------------------- AllocationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- AllocationCapabilities - 02_alloccap_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 01_enum.py: PASS -------------------------------------------------------------------- ComputerSystem - 02_nosystems.py: SKIP -------------------------------------------------------------------- ComputerSystem - 03_defineVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 04_defineStartVS.py: PASS -------------------------------------------------------------------- ComputerSystem - 05_activate_defined_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 06_paused_active_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 22_define_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 23_suspend_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 27_define_suspend_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 32_start_reboot.py: PASS -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: PASS -------------------------------------------------------------------- ComputerSystem - 35_start_reset.py: PASS -------------------------------------------------------------------- ComputerSystem - 40_RSC_start.py: PASS -------------------------------------------------------------------- ComputerSystem - 41_cs_to_settingdefinestate.py: PASS -------------------------------------------------------------------- ComputerSystem - 42_cs_gi_errs.py: PASS -------------------------------------------------------------------- ComputerSystemIndication - 01_created_indication.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 03_reverse_errs.py: PASS -------------------------------------------------------------------- ElementAllocatedFromPool - 04_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- ElementCapabilities - 02_reverse.py: PASS -------------------------------------------------------------------- ElementCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 05_hostsystem_cap.py: PASS -------------------------------------------------------------------- ElementConforms - 01_forward.py: PASS -------------------------------------------------------------------- ElementConforms - 02_reverse.py: PASS -------------------------------------------------------------------- ElementConforms - 03_ectp_fwd_errs.py: PASS -------------------------------------------------------------------- ElementConforms - 04_ectp_rev_errs.py: PASS -------------------------------------------------------------------- ElementSettingData - 01_forward.py: PASS -------------------------------------------------------------------- ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 01_enum.py: PASS -------------------------------------------------------------------- HostSystem - 02_hostsystem_to_rasd.py: PASS -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: PASS -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: PASS -------------------------------------------------------------------- HostSystem - 05_hs_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 06_hs_to_vsms.py: PASS -------------------------------------------------------------------- HostedDependency - 01_forward.py: PASS -------------------------------------------------------------------- HostedDependency - 02_reverse.py: PASS -------------------------------------------------------------------- HostedDependency - 03_enabledstate.py: PASS -------------------------------------------------------------------- HostedDependency - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 01_forward.py: PASS -------------------------------------------------------------------- HostedResourcePool - 02_reverse.py: PASS -------------------------------------------------------------------- HostedResourcePool - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedResourcePool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedService - 01_forward.py: PASS -------------------------------------------------------------------- HostedService - 02_reverse.py: PASS -------------------------------------------------------------------- HostedService - 03_forward_errs.py: PASS -------------------------------------------------------------------- HostedService - 04_reverse_errs.py: PASS -------------------------------------------------------------------- LogicalDisk - 01_disk.py: PASS -------------------------------------------------------------------- LogicalDisk - 02_nodevs.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- LogicalDisk - 03_ld_gi_errs.py: FAIL ERROR - Failed to get instance by the class of Xen_LogicalDisk ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (no domain for hd_domain/hda)') -------------------------------------------------------------------- Memory - 01_memory.py: PASS -------------------------------------------------------------------- Memory - 02_defgetmem.py: PASS -------------------------------------------------------------------- Memory - 03_mem_gi_errs.py: PASS -------------------------------------------------------------------- NetworkPort - 01_netport.py: PASS -------------------------------------------------------------------- NetworkPort - 02_np_gi_errors.py: PASS -------------------------------------------------------------------- NetworkPort - 03_user_netport.py: SKIP -------------------------------------------------------------------- Processor - 01_processor.py: PASS -------------------------------------------------------------------- Processor - 02_definesys_get_procs.py: PASS -------------------------------------------------------------------- Processor - 03_proc_gi_errs.py: FAIL Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyvalue------ -------------------------------------------------------------------- Profile - 01_enum.py: PASS -------------------------------------------------------------------- Profile - 02_profile_to_elec.py: PASS -------------------------------------------------------------------- Profile - 03_rprofile_gi_errs.py: PASS -------------------------------------------------------------------- RASD - 01_verify_rasd_fields.py: PASS -------------------------------------------------------------------- RASD - 02_enum.py: PASS -------------------------------------------------------------------- RASD - 03_rasd_errs.py: PASS -------------------------------------------------------------------- RASD - 04_disk_rasd_size.py: PASS -------------------------------------------------------------------- ReferencedProfile - 01_verify_refprof.py: PASS -------------------------------------------------------------------- ReferencedProfile - 02_refprofile_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 01_forward.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 02_reverse.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 03_forward_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ResourceAllocationFromPool - 05_RAPF_err.py: XFAIL ERROR - 'Xen_ResourceAllocationFromPool' association failed to generate an exception and 'InstanceID' passed. ERROR - ------FAILED: to verify the RAFP.------ Bug:<> -------------------------------------------------------------------- ResourcePool - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePool - 02_rp_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 01_enum.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- SettingsDefine - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefine - 02_reverse.py: PASS -------------------------------------------------------------------- SettingsDefine - 03_sds_fwd_errs.py: FAIL Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string Traceback (most recent call last): File "/usr/lib64/python2.4/logging/__init__.py", line 731, in emit msg = self.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 617, in format return fmt.format(record) File "/usr/lib64/python2.4/logging/__init__.py", line 405, in format record.message = record.getMessage() File "/usr/lib64/python2.4/logging/__init__.py", line 276, in getMessage msg = msg % self.args TypeError: not enough arguments for format string ERROR - ------ FAILED: INVALID_DevID_Keyval------ -------------------------------------------------------------------- SettingsDefine - 04_sds_rev_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 01_forward.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS -------------------------------------------------------------------- SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS -------------------------------------------------------------------- SystemDevice - 01_forward.py: PASS -------------------------------------------------------------------- SystemDevice - 02_reverse.py: PASS -------------------------------------------------------------------- SystemDevice - 03_fwderrs.py: PASS -------------------------------------------------------------------- VSSD - 01_enum.py: PASS -------------------------------------------------------------------- VSSD - 02_bootldr.py: SKIP -------------------------------------------------------------------- VSSD - 03_vssd_gi_errs.py: PASS -------------------------------------------------------------------- VSSD - 04_vssd_to_rasd.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 01_definesystem_name.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 02_destroysystem.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 03_definesystem_ess.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 04_definesystem_ers.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 05_destroysystem_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 06_addresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 09_procrasd_persist.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 10_hv_version.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 11_define_memrasdunits.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 12_referenced_config.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 01_migratable_host.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 02_host_migrate_type.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationService - 05_migratable_host_errs.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 01_forward.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 02_reverse.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS -------------------------------------------------------------------- Thanks and Regards, Deepti.

1 1

[PATCH] [TEST] Fixing the debug message in common_util.py
by Deepti B. Kalakeri 23 Sep '08

23 Sep '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1222170304 25200 # Node ID 3ecde3bb4f9be6f4d2df69e9ee6c1f3284eea753 # Parent c31e2516d65acc6383665768022a3f4fc1088add [TEST] Fixing the debug message in common_util.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r c31e2516d65a -r 3ecde3bb4f9b suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Sep 23 04:43:08 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Sep 23 04:45:04 2008 -0700 @@ -136,7 +136,7 @@ def verify_err_desc(exp_rc, exp_desc, er return PASS else: logger.error("Unexpected rc code %s and description %s\n", - (err_no, err_desc)) + err_no, err_desc) return FAIL def call_request_state_change(domain_name, ip, rs, time, virt='Xen'):

1 0

[PATCH] [TEST] Add a check to verify virtualization type is valid for system
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222102928 25200 # Node ID a680024808eb6878d71b90ef5632d28448475e66 # Parent 16fd8f75598442d71eeb0199fb680ca6564656bc [TEST] Add a check to verify virtualization type is valid for system. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 16fd8f755984 -r a680024808eb suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon Sep 22 09:45:55 2008 -0700 +++ b/suites/libvirt-cim/main.py Mon Sep 22 10:02:08 2008 -0700 @@ -89,7 +89,12 @@ print "Cleaned log files." -def pre_check(ip): +def pre_check(ip, virt): + cmd = "virsh -c %s version " % utils.virt2uri(virt) + ret, out = utils.run_remote(ip, cmd) + if ret != 0: + return "This libvirt install does not support %s" % virt + cmd = "ps -ef | grep -v grep | grep cimserver" rc, out = utils.run_remote(ip, cmd) if rc != 0: @@ -168,7 +173,7 @@ parser.print_help() return 1 - env_ready = pre_check(options.ip) + env_ready = pre_check(options.ip, options.virt) if env_ready != None: print "\n%s. Please check your environment.\n" % env_ready return 1

3 2

[PATCH] [TEST] #2 Check return code of run_remote() in create_netpool_conf()
by Kaitlin Rupert 23 Sep '08

23 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1222133121 25200 # Node ID 7551f7d43bd39917cd936788dcfd1e319bed234b # Parent c76b2779aca9810f4c3bdf8a0ca768dc3dc9315f [TEST] #2 Check return code of run_remote() in create_netpool_conf() Instead of checking the output. Also, add log_param to main.py debug messages for errors encountered by main.py will be printed to stderr/stdout. Updates from 1 to 2: -Add -w flag to grep command Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c76b2779aca9 -r 7551f7d43bd3 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Sep 22 07:50:25 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Sep 22 18:25:21 2008 -0700 @@ -428,10 +428,11 @@ test_network = vir_network[0] if test_network == None: - cmd = "virsh -c %s net-list --all | grep %s" % \ + cmd = "virsh -c %s net-list --all | grep -w %s" % \ (utils.virt2uri(virt), net_name) ret, out = utils.run_remote(server, cmd) - if out != "": + # If success, network pool with name net_name already exists + if ret == 0: logger.error("Network pool with name '%s' already exists", net_name) return FAIL, "Unknown" diff -r c76b2779aca9 -r 7551f7d43bd3 suites/libvirt-cim/main.py --- a/suites/libvirt-cim/main.py Mon Sep 22 07:50:25 2008 -0700 +++ b/suites/libvirt-cim/main.py Mon Sep 22 18:25:21 2008 -0700 @@ -27,6 +27,7 @@ import sys sys.path.append('../../lib') import TestSuite +from CimTest.Globals import logger, log_param import commands from VirtLib import groups import ConfigParser @@ -184,6 +185,7 @@ return 1 testsuite = TestSuite.TestSuite(log=True) + log_param(file_name=testsuite.log_file) set_python_path() @@ -209,6 +211,7 @@ status = setup_env(options.ip, options.virt) if status != PASS: print "Please check your environment.\n" + testsuite.finish() return 1 print "\nTesting " + options.virt + " hypervisor"

2 1

[PATCH 0 of 2] (#3) Add RedirectionServiceCapabilities provider
by Kaitlin Rupert 23 Sep '08

23 Sep '08

The KVM Redirection Profile (DSP1076) indicates that implementing a provider for this class is option. It's implemented here for consistency with other classes.

1 2

[PATCH] (#2) Fix the AddResources path to not expect an InstanceID from the client
by Dan Smith 23 Sep '08

23 Sep '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1222113268 25200 # Node ID b837bd3290ec14b305dd5c046a81b703a6a5d287 # Parent 3e653cbda42cf949a1c389938aed2c37ba9f90cf (#2) Fix the AddResources path to not expect an InstanceID from the client Remove the update_resource_settings() function that now no longer holds common functionality for add and modify. Make _update_resource_settings() take a domain name to be applied to each of the RASDs in the list, or NULL if the RASD's InstanceID should be honored. Changes: Pull out the correct property for a VSSD AffectedConfiguration Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 3e653cbda42c -r b837bd3290ec src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Sep 10 13:27:03 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Sep 22 12:54:28 2008 -0700 @@ -1333,6 +1333,13 @@ int *count = NULL; int i; + if (devid == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing or incomplete InstanceID"); + goto out; + } + op = CMGetObjectPath(rasd, &s); if ((op == NULL) || (s.rc != CMPI_RC_OK)) goto out; @@ -1420,7 +1427,6 @@ dev = &list[*count]; dev->type = type; - dev->id = strdup(devid); rasd_to_vdev(rasd, dominfo, dev, ns); s = _resource_dynamic(dominfo, dev, RESOURCE_ADD, CLASSNAME(op)); @@ -1448,6 +1454,13 @@ struct virt_device *list; int *count; int i; + + if (devid == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing or incomplete InstanceID"); + goto out; + } op = CMGetObjectPath(rasd, &s); if ((op == NULL) || (s.rc != CMPI_RC_OK)) @@ -1541,7 +1554,32 @@ return s; } +static CMPIStatus get_instanceid(CMPIInstance *rasd, + char **domain, + char **devid) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + const char *id; + + if (cu_get_str_prop(rasd, "InstanceID", &id) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing InstanceID in RASD"); + return s; + } + + if (!parse_fq_devid(id, domain, devid)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Invalid InstanceID `%s'", id); + return s; + } + + return s; +} + static CMPIStatus _update_resource_settings(const CMPIObjectPath *ref, + const char *domain, CMPIArray *resources, const CMPIResult *results, resmod_fn func) @@ -1565,7 +1603,6 @@ for (i = 0; i < count; i++) { CMPIData item; CMPIInstance *inst; - const char *id = NULL; char *name = NULL; char *devid = NULL; virDomainPtr dom = NULL; @@ -1573,18 +1610,17 @@ item = CMGetArrayElementAt(resources, i, NULL); inst = item.value.inst; - if (cu_get_str_prop(inst, "InstanceID", &id) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing InstanceID"); - goto end; - } - - if (!parse_fq_devid(id, &name, &devid)) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Bad InstanceID `%s'", id); - goto end; + /* If we were passed a domain name, then we're doing + * an AddResources, which means we ignore the InstanceID + * of the RASD. If not, then we get the domain name + * from the InstanceID of the RASD each time through. + */ + if (domain == NULL) { + s = get_instanceid(inst, &name, &devid); + if (s.rc != CMPI_RC_OK) + break; + } else { + name = strdup(domain); } dom = virDomainLookupByName(conn, name); @@ -1614,27 +1650,6 @@ virConnectClose(conn); - return s; -} - -static CMPIStatus update_resource_settings(const CMPIObjectPath *ref, - const CMPIArgs *argsin, - const CMPIResult *results, - resmod_fn func) -{ - CMPIArray *arr; - CMPIStatus s; - - if (cu_get_array_arg(argsin, "ResourceSettings", &arr) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceSettings"); - goto out; - } - - s = _update_resource_settings(ref, arr, results, func); - - out: return s; } @@ -1706,10 +1721,40 @@ const CMPIArgs *argsin, CMPIArgs *argsout) { - return update_resource_settings(reference, - argsin, - results, - resource_add); + CMPIArray *arr; + CMPIStatus s; + CMPIObjectPath *sys; + char *domain = NULL; + + if (cu_get_array_arg(argsin, "ResourceSettings", &arr) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing ResourceSettings"); + return s; + } + + if (cu_get_ref_arg(argsin, "AffectedConfiguration", &sys) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing AffectedConfiguration parameter"); + return s; + } + + if (!parse_instanceid(sys, NULL, &domain)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "AffectedConfiguration has invalid InstanceID"); + return s; + } + + s = _update_resource_settings(reference, + domain, + arr, + results, + resource_add); + free(domain); + + return s; } static CMPIStatus mod_resource_settings(CMPIMethodMI *self, @@ -1719,10 +1764,21 @@ const CMPIArgs *argsin, CMPIArgs *argsout) { - return update_resource_settings(reference, - argsin, - results, - resource_mod); + CMPIArray *arr; + CMPIStatus s; + + if (cu_get_array_arg(argsin, "ResourceSettings", &arr) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing ResourceSettings"); + return s; + } + + return _update_resource_settings(reference, + NULL, + arr, + results, + resource_mod); } static CMPIStatus rm_resource_settings(CMPIMethodMI *self, @@ -1752,6 +1808,7 @@ goto out; s = _update_resource_settings(reference, + NULL, resource_arr, results, resource_del);

2 1