- CIM - libvirt List Archives

[PATCH] [TEST] Add stack trace on error to make test case development easier
by Dan Smith 28 Jul '08

28 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1217258680 25200 # Node ID cf3ab249243b02c259aa63f7cc69d0b3983c176d # Parent d1fb0dfbebaa98fd1e7fbcca1ce29dfb1bf44568 [TEST] Add stack trace on error to make test case development easier Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r d1fb0dfbebaa -r cf3ab249243b lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Mon Jul 28 08:24:25 2008 -0700 +++ b/lib/CimTest/Globals.py Mon Jul 28 08:24:40 2008 -0700 @@ -25,6 +25,7 @@ import os import logging from optparse import OptionParser +import traceback global CIM_USER global CIM_PASS @@ -143,6 +144,7 @@ rc = f() except Exception, e: logger.error('%s : %s' % (e.__class__.__name__, e)) + logger.error("%s" % traceback.print_exc()) rc = FAIL return rc setattr(do_try, 'options', options)

1 0

[PATCH] [TEST] Check that the DefineSystem() result can be passed to GetInstance()
by Dan Smith 28 Jul '08

28 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1217258665 25200 # Node ID d1fb0dfbebaa98fd1e7fbcca1ce29dfb1bf44568 # Parent 3c80ea156a3c45bc321f9c465ba7692c011ab2e0 [TEST] Check that the DefineSystem() result can be passed to GetInstance() Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 3c80ea156a3c -r d1fb0dfbebaa suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_define_result.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_define_result.py Mon Jul 28 08:24:25 2008 -0700 @@ -0,0 +1,93 @@ +#!/usr/bin/python +# +# Copyright 2008 IBM Corp. +# +# Authors: +# Dan Smith <danms(a)us.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +sup_types = ['Xen', 'XenFV', 'KVM'] +default_dom = "define_test" + +import sys +import pywbem +from CimTest.ReturnCodes import FAIL, PASS +from CimTest.Globals import do_main +from CimTest.Globals import logger +from CimTest import Globals +from XenKvmLib import vsms +from XenKvmLib.classes import get_typed_class + +def define_system(host, virt, name, vssd, rasds): + vsms_class = eval("vsms." + \ + get_typed_class(virt, + "VirtualSystemManagementService")) + + service = vsms_class(host) + + rc, results = service.DefineSystem(SystemSettings=vssd, + ResourceSettings=rasds, + ReferenceConfiguration=' ') + + system = results["ResultingSystem"] + + return rc, system + +def get_instance_by_ref(host, ref): + conn = pywbem.WBEMConnection('http://%s' % host, + (Globals.CIM_USER, Globals.CIM_PASS), + ref.namespace) + return conn.GetInstance(ref) + +def define_test_system(options): + vssd_class = vsms.get_vssd_class(options.virt) + vssd = vssd_class(name=default_dom, virt=options.virt) + + mrasd_class = vsms.get_masd_class(options.virt) + mrasd = mrasd_class(32, default_dom) + + rc, system = define_system(options.ip, + options.virt, + default_dom, + vssd.mof(), + [mrasd.mof()]) + + return system + +@do_main(sup_types) +def main(): + options = main.options + + systemref = define_test_system(options) + logger.info("GetInstance(%s)" % systemref) + + if systemref.namespace is None: + logger.error("Returned reference had no namespace!") + return FAIL + + system = get_instance_by_ref(options.ip, systemref) + + if system["Name"] == default_dom: + logger.info("Validated resulting system instance") + return PASS + else: + logger.error("Result system was: %s instead of %s" % (system["Name"], + default_dom)) + return FAIL + +if __name__ == "__main__": + sys.exit(main())

1 0

[PATCH] Fix netpool issue in CS 22
by Kaitlin Rupert 25 Jul '08

25 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216860167 25200 # Node ID ab1e34deb7109d8a89d03b6b53c54f30a9c99888 # Parent 32d78f23f6e73f5443022179410128767896465d Fix netpool issue in CS 22 Don't use the existing netpool, create one for the test. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 32d78f23f6e7 -r ab1e34deb710 suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Wed Jul 23 17:42:47 2008 -0700 @@ -62,7 +62,7 @@ def main(): options = main.options - status, test_network = create_netpool_conf(options.ip, options.virt) + status, test_network = create_netpool_conf(options.ip, options.virt, False) if status != PASS: return FAIL

2 1

[PATCH] [TEST] Update HostedDependency.01~04 for XenFV support
by yunguol＠cn.ibm.com 24 Jul '08

24 Jul '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1216894242 25200 # Node ID 50c0e4d2d58d8075c010377c2dd5d662bf80c2b7 # Parent 32d78f23f6e73f5443022179410128767896465d [TEST] Update HostedDependency.01~04 for XenFV support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 32d78f23f6e7 -r 50c0e4d2d58d suites/libvirt-cim/cimtest/HostedDependency/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Thu Jul 24 03:10:42 2008 -0700 @@ -55,7 +55,7 @@ from CimTest.Globals import do_main from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'LXC'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "hd_domain" test_mac = "00:11:22:33:44:55" diff -r 32d78f23f6e7 -r 50c0e4d2d58d suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedDependency/02_reverse.py Thu Jul 24 03:10:42 2008 -0700 @@ -50,7 +50,7 @@ from CimTest.Globals import logger, do_m from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'LXC'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "hd_domain" test_mac = "00:11:22:33:44:55" diff -r 32d78f23f6e7 -r 50c0e4d2d58d suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py --- a/suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedDependency/03_enabledstate.py Thu Jul 24 03:10:42 2008 -0700 @@ -44,7 +44,7 @@ from XenKvmLib.devices import CIM_Instan from XenKvmLib.devices import CIM_Instance from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'XenFV'] test_dom = "hd_domain1" test_mac = "00:11:22:33:44:55" diff -r 32d78f23f6e7 -r 50c0e4d2d58d suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedDependency/04_reverse_errs.py Thu Jul 24 03:10:42 2008 -0700 @@ -38,7 +38,7 @@ from XenKvmLib.common_util import get_ho from XenKvmLib.common_util import get_host_info, try_assoc from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -sup_types = ['Xen', 'KVM', 'LXC'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "hd_domain1" test_mac = "00:11:22:33:44:55"

1 0

[PATCH] [TEST] #2 Update Network.02 and helper functions for LXC support
by yunguol＠cn.ibm.com 23 Jul '08

23 Jul '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1216867968 25200 # Node ID 12caeec9fd69e72808b0d9a5eb989e2063cfcb6a # Parent 32d78f23f6e73f5443022179410128767896465d [TEST] #2 Update Network.02 and helper functions for LXC support Updates: Add network devices in LXC guest, also take a mac address argument in guest define Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 32d78f23f6e7 -r 12caeec9fd69 suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py --- a/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/NetworkPort/02_np_gi_errors.py Wed Jul 23 19:52:48 2008 -0700 @@ -31,11 +31,11 @@ from XenKvmLib import assoc from XenKvmLib.common_util import try_getinstance from XenKvmLib.classes import get_typed_class -from XenKvmLib.vxml import XenXML, KVMXML, get_class +from XenKvmLib.vxml import XenXML, KVMXML, LXCXML, get_class from CimTest.ReturnCodes import PASS, SKIP from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { diff -r 32d78f23f6e7 -r 12caeec9fd69 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Wed Jul 23 19:52:48 2008 -0700 @@ -89,3 +89,4 @@ LXC_default_tty = '/dev/ptmx' LXC_default_mp = '/tmp' LXC_default_source = '/tmp/lxc_files' +LXC_default_mac = '11:22:33:aa:bb:cc' diff -r 32d78f23f6e7 -r 12caeec9fd69 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Jul 23 19:52:48 2008 -0700 @@ -700,19 +700,21 @@ def __init__(self, test_dom=const.default_domname, mem=const.default_memory, vcpus=const.default_vcpus, + mac=const.LXC_default_mac, + ntype=const.default_net_type, tty=const.LXC_default_tty): VirtXML.__init__(self, 'lxc', test_dom, set_uuid(), mem, vcpus) self._os(const.LXC_init_path) - self._devices(const.LXC_default_tty) + self._devices(mac, ntype, const.LXC_default_tty) self.create_lxc_file(CIM_IP, const.LXC_init_path) def _os(self, os_init): os = self.get_node('/domain/os') self.add_sub_node(os, 'init', os_init) - def _devices(self, tty_set): + def _devices(self, net_mac, net_type, tty_set): devices = self.get_node('/domain/devices') - + self.set_interface_details(devices, net_mac, net_type, virt_type='LXC') interface = self.add_sub_node(devices, 'console', tty = tty_set) def create_lxc_file(self, ip, lxc_file):

1 0

[PATCH] [TEST] #5 Update VSSDC.01 for KVM/XenFV/LXC support
by yunguol＠cn.ibm.com 23 Jul '08

23 Jul '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1216865247 25200 # Node ID fa1868af730e8c991e4c298620e7bdfcea98ae2f # Parent 32d78f23f6e73f5443022179410128767896465d [TEST] #5 Update VSSDC.01 for KVM/XenFV/LXC support The test defines non-bootloader guests for all platform types, also remove the part of thet test that verifies the bootloader Updates from 1 to 2: Pass test_disk and test_mac as parameters into init_list() function. Updates from 2 to 3: Remove build_vssd_info() and call compare_all_prop() in assoc_values() Updates from 3 to 4: 1) Remove otiose rlist define line for LXC option 2) change assoc_values comments, it verifies all of the values of instance 3) check compare_all_prop return, if it return fail, print a log message Updates from 4 to 5: Print instance classname instend of entire instance in log info Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 32d78f23f6e7 -r fa1868af730e suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Wed Jul 23 00:32:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Wed Jul 23 19:07:27 2008 -0700 @@ -52,32 +52,31 @@ import sys from XenKvmLib import enumclass from VirtLib import utils -from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all -from XenKvmLib.test_xml import testxml_bl -from XenKvmLib.test_xml import xml_get_dom_bootloader +from XenKvmLib.test_doms import destroy_and_undefine_all +from XenKvmLib.assoc import compare_all_prop from CimTest import Globals from XenKvmLib import assoc +from XenKvmLib import vxml +from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import FAIL, PASS -sup_types = ['Xen'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "VSSDC_dom" test_vcpus = 2 test_mac = "00:11:22:33:44:aa" test_disk = 'xvda' -status = 0 -VSType = "Xen" -def init_list(): +def init_list(test_disk, test_mac, virt='Xen'): """ Creating the lists that will be used for comparisons. """ - rlist = ['Xen_DiskResourceAllocationSettingData', - 'Xen_MemResourceAllocationSettingData', - 'Xen_NetResourceAllocationSettingData', - 'Xen_ProcResourceAllocationSettingData' + rlist = [get_typed_class(virt, 'DiskResourceAllocationSettingData'), + get_typed_class(virt, 'MemResourceAllocationSettingData'), + get_typed_class(virt, 'NetResourceAllocationSettingData'), + get_typed_class(virt, 'ProcResourceAllocationSettingData') ] prop_list = {rlist[0] : "%s/%s" % (test_dom, test_disk), @@ -85,57 +84,33 @@ rlist[2] : "%s/%s" % (test_dom, test_mac), rlist[3] : "%s/%s" % (test_dom, "proc") } + if virt == 'LXC': + prop_list = {rlist[1] : "%s/%s" % (test_dom, "mem")} return prop_list -def build_vssd_info(ip, vssd): - """ - Creating the vssd fileds lists that will be used for comparisons. - """ - - if vssd.Bootloader == "" or vssd.Caption == "" or \ - vssd.InstanceID == "" or vssd.ElementName == "" or \ - vssd.VirtualSystemIdentifier == "" or vssd.VirtualSystemType == "": - logger.error("One of the required VSSD details seems to be empty") - test_domain_function(test_dom, ip, "undefine") - return FAIL - - vssd_vals = {'Bootloader' : vssd.Bootloader, - 'Caption' : vssd.Caption, - 'InstanceID' : vssd.InstanceID, - 'ElementName' : vssd.ElementName, - 'VirtualSystemIdentifier' : vssd.VirtualSystemIdentifier, - 'VirtualSystemType' : vssd.VirtualSystemType - } - - return vssd_vals - -def assoc_values(ip, assoc_info, cn, an, vals): +def assoc_values(ip, assoc_info, cn, an, vssd): """ The association info of Xen_VirtualSystemSettingDataComponent with every RASDclass is - verified for following fields: - Caption, InstanceID, ElementName, VirtualSystemIdentifier, - VirtualSystemType, Bootloader + verified all of the values """ try: if len(assoc_info) != 1: - Globals.logger.error("%s returned %i resource objects for '%s'" % \ - (an, len(assoc_info), cn)) + logger.error("%s returned %i resource objects for '%s'" % \ + (an, len(assoc_info), cn)) return FAIL - - for prop, val in vals.iteritems(): - if assoc_info[0][prop] != val: - Globals.logger.error("%s mismatch: returned %s instead of %s" %\ - (prop, assoc_info[0][prop], val)) - return FAIL - - return PASS - + status = compare_all_prop(assoc_info[0], vssd) + if status != PASS: + logger.error("Properties of inst returned by %s didn't \ + match expected" % assoc_info[0].classname) + return FAIL except Exception, detail : logger.error("Exception in assoc_values function: %s" % detail) - return FAIL + return FAIL + + return PASS @do_main(sup_types) def main(): @@ -143,49 +118,53 @@ status = FAIL destroy_and_undefine_all(options.ip) - test_xml = testxml_bl(test_dom, vcpus = test_vcpus, \ - mac = test_mac, disk = test_disk, \ - server = options.ip,\ - gtype = 0) - ret = test_domain_function(test_xml, options.ip, cmd = "define") + prop_list = init_list(test_disk, test_mac, options.virt) + virt_xml = vxml.get_class(options.virt) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + else: + cxml = virt_xml(test_dom, vcpus = test_vcpus, \ + mac = test_mac, disk = test_disk) + ret = cxml.define(options.ip) if not ret: logger.error("Failed to define the dom: %s", test_dom) return FAIL - instIdval = "%s:%s" % (VSType, test_dom) + if options.virt == 'XenFV': + instIdval = "Xen:%s" % test_dom + else: + instIdval = "%s:%s" % (options.virt, test_dom) + keyname = "InstanceID" + key_list = { 'InstanceID' : instIdval } + vssd_cn = get_typed_class(options.virt, 'VirtualSystemSettingData') - key_list = { 'InstanceID' : instIdval } try: vssd = enumclass.getInstance(options.ip, \ - enumclass.Xen_VirtualSystemSettingData, \ - key_list) + 'VirtualSystemSettingData', \ + key_list, \ + options.virt) if vssd is None: logger.error("VSSD instance for %s not found" % test_dom) - test_domain_function(test_dom, options.ip, "undefine") + cxml.undefine(options.ip) return FAIL - - vssd_vals = build_vssd_info(options.ip, vssd) - except Exception, detail : - logger.error(Globals.CIM_ERROR_GETINSTANCE, \ - 'Xen_VirtualSystemSettingData') + logger.error(Globals.CIM_ERROR_GETINSTANCE, vssd_cn) logger.error("Exception : %s" % detail) - test_domain_function(test_dom, options.ip, "undefine") + cxml.undefine(options.ip) return FAIL - prop_list = init_list() try: # Looping through the RASD_cllist, call association # Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist - an = 'Xen_VirtualSystemSettingDataComponent' + an = get_typed_class(options.virt, 'VirtualSystemSettingDataComponent') for rasd_cname, prop in prop_list.iteritems(): assoc_info = assoc.Associators(options.ip, an, rasd_cname, - InstanceID = prop) + options.virt, InstanceID = prop) # Verify the association fields returned for particular rasd_cname. status = assoc_values(options.ip, assoc_info, rasd_cname, an, - vssd_vals) + vssd) if status != PASS: break @@ -194,7 +173,7 @@ logger.error("Exception : %s" % detail) status = FAIL - test_domain_function(test_dom, options.ip, "undefine") + cxml.undefine(options.ip) return status if __name__ == "__main__":

1 0

[PATCH] Remove unused variable from CS
by Kaitlin Rupert 23 Jul '08

23 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216851926 25200 # Node ID 39355b0cc610daa45f44ff842ae9b1382b68c611 # Parent dbf0ce65414cfcecb01286d012387f51816cce4a Remove unused variable from CS. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r dbf0ce65414c -r 39355b0cc610 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Jul 23 13:10:16 2008 -0700 +++ b/src/Virt_ComputerSystem.c Wed Jul 23 15:25:26 2008 -0700 @@ -674,7 +674,6 @@ { int ret; virConnectPtr conn = NULL; - virDomainInfo info; char *xml = NULL; conn = virDomainGetConnect(dom);

1 0

[PATCH] Fix units adherence in MemoryRASD processing in DefineSystem()
by Dan Smith 23 Jul '08

23 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1216828041 25200 # Node ID f542e90d4c672efa40a907b8c7040d6df714bd38 # Parent 8d236493f5d67a952bfab94a3fc19a34b3fdf394 Fix units adherence in MemoryRASD processing in DefineSystem() Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 8d236493f5d6 -r f542e90d4c67 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Jul 23 08:15:14 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Wed Jul 23 08:47:21 2008 -0700 @@ -469,12 +469,37 @@ static const char *mem_rasd_to_vdev(CMPIInstance *inst, struct virt_device *dev) { + const char *units; + int shift; + cu_get_u64_prop(inst, "VirtualQuantity", &dev->dev.mem.size); cu_get_u64_prop(inst, "Reservation", &dev->dev.mem.size); dev->dev.mem.maxsize = dev->dev.mem.size; cu_get_u64_prop(inst, "Limit", &dev->dev.mem.maxsize); - dev->dev.mem.size <<= 10; - dev->dev.mem.maxsize <<= 10; + + if (cu_get_str_prop(inst, "AllocationUnits", &units) != CMPI_RC_OK) { + CU_DEBUG("Memory RASD has no units, assuming bytes"); + units = "Bytes"; + } + + if (STREQC(units, "Bytes")) + shift = -10; + else if (STREQC(units, "KiloBytes")) + shift = 0; + else if (STREQC(units, "MegaBytes")) + shift = 10; + else if (STREQC(units, "GigaBytes")) + shift = 20; + else + return "Unknown AllocationUnits in Memory RASD"; + + if (shift < 0) { + dev->dev.mem.size >>= -shift; + dev->dev.mem.maxsize >>= -shift; + } else { + dev->dev.mem.size <<= shift; + dev->dev.mem.maxsize <<= shift; + } return NULL; }

2 1

[PATCH] Invert the bit of type-selection logic in resource_del() to match the other
by Dan Smith 23 Jul '08

23 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1216844705 25200 # Node ID 9c40868b04724e898011ecd6717162bc02c61781 # Parent 039b7c1f078d007f02224652235edea0a7113926 Invert the bit of type-selection logic in resource_del() to match the other functions. AFAICT, this still did succeeded and failed in the right places, but deeper down and with less appropriate error messages. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 039b7c1f078d -r 9c40868b0472 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Jul 23 13:23:03 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Wed Jul 23 13:25:05 2008 -0700 @@ -1258,14 +1258,14 @@ _list = find_list(dominfo, type, &count); if ((type == CIM_RES_TYPE_MEM) || (type == CIM_RES_TYPE_PROC) || - (_list != NULL)) - list = *_list; - else { + (*_list == NULL)) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Cannot delete resources of type %" PRIu16, type); goto out; } + + list = *_list; cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED,

2 1

[PATCH] Fix (again) domain_online()
by Dan Smith 23 Jul '08

23 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1216844583 25200 # Node ID 039b7c1f078d007f02224652235edea0a7113926 # Parent 3327f39024303cb8a218110d039e37bf9c2b12cd Fix (again) domain_online() In the neverending quest to get domain_online() to do the Right Thing(tm), this patch attempts to count VIR_DOMAIN_NOSTATE as running for Xen, and as offline for KVM and LXC. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 3327f3902430 -r 039b7c1f078d libxkutil/misc_util.c --- a/libxkutil/misc_util.c Wed Jul 23 12:22:04 2008 -0700 +++ b/libxkutil/misc_util.c Wed Jul 23 13:23:03 2008 -0700 @@ -383,21 +383,53 @@ { virDomainInfo info; virDomainPtr _dom; - bool rc; + bool rc = false; + virConnectPtr conn = NULL; + int flags[] = {VIR_DOMAIN_BLOCKED, + VIR_DOMAIN_RUNNING, + VIR_DOMAIN_NOSTATE, + }; + int compare_flags = 3; + int i; + + conn = virDomainGetConnect(dom); + if (conn == NULL) { + CU_DEBUG("Unknown connection type, assuming RUNNING,BLOCKED"); + compare_flags = 2; + } else if (STREQC(virConnectGetType(conn), "Xen")) { + CU_DEBUG("Type is Xen"); + compare_flags = 3; + } else if (STREQC(virConnectGetType(conn), "QEMU")) { + CU_DEBUG("Type is KVM"); + compare_flags = 2; + } else if (STREQC(virConnectGetType(conn), "LXC")) { + CU_DEBUG("Type is LXC"); + compare_flags = 2; + } else { + CU_DEBUG("Unknown type `%s', assuming RUNNING,BLOCKED", + virConnectGetType(conn)); + compare_flags = 2; + } _dom = virDomainLookupByName(virDomainGetConnect(dom), virDomainGetName(dom)); if (_dom == NULL) { CU_DEBUG("Unable to re-lookup domain"); - return false; + goto out; } - if (virDomainGetInfo(_dom, &info) != 0) + if (virDomainGetInfo(_dom, &info) != 0) { rc = false; - else - rc = (info.state == VIR_DOMAIN_BLOCKED) || - (info.state == VIR_DOMAIN_RUNNING) || - (info.state == VIR_DOMAIN_NOSTATE); + goto out; + } + + for (i = 0; i < compare_flags; i++) { + if (info.state == flags[i]) { + rc = true; + break; + } + } + out: virDomainFree(_dom); return rc;

2 1