March 2008 - CIM - libvirt List Archives

[PATCH] [TEST] Add UUID workaround for python-2.4-based systems (i.e. RHEL5.x)
by Dan Smith 03 Apr '08

03 Apr '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206986066 25200 # Node ID ace377826c9c8f3b034f5c696ffb71dfb163d77b # Parent 5d47437104551b638aa75e2e525e49ec4b41e3ec [TEST] Add UUID workaround for python-2.4-based systems (i.e. RHEL5.x) Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 5d4743710455 -r ace377826c9c suites/libvirt-cim/lib/XenKvmLib/test_doms.py --- a/suites/libvirt-cim/lib/XenKvmLib/test_doms.py Mon Mar 31 07:54:19 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/test_doms.py Mon Mar 31 10:54:26 2008 -0700 @@ -22,11 +22,23 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # import tempfile -import uuid import os from VirtLib import utils from VirtLib import live from CimTest.Globals import CIM_FUUID + +try: + import uuid as _uuid + def uuid(): + return str(_uuid.uuid1()) +except ImportError: + def uuid(): + from commands import getstatusoutput as run + s, o = run('uuidgen') + if s == 0: + return o + else: + raise ImportError("Missing uuid library (and can't fake it)") def define_test_domain(xml, server, virt="Xen"): name = tempfile.mktemp() @@ -74,7 +86,7 @@ def set_uuid(myuuid=0): """Generate a random uuid and record it into CIM_FUUID""" if myuuid == 0: - myuuid = uuid.uuid1().urn[9:] + myuuid = uuid() f = file(CIM_FUUID, 'a') f.write('%s\n' % myuuid)

2 2

[PATCH] [TEST] Run basicConfig() on logger to make python-2.4 happy
by Dan Smith 02 Apr '08

02 Apr '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206986099 25200 # Node ID bde349d23ce5320d7c593e57df45335dcae62df8 # Parent ace377826c9c8f3b034f5c696ffb71dfb163d77b [TEST] Run basicConfig() on logger to make python-2.4 happy Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r ace377826c9c -r bde349d23ce5 lib/CimTest/Globals.py --- a/lib/CimTest/Globals.py Mon Mar 31 10:54:26 2008 -0700 +++ b/lib/CimTest/Globals.py Mon Mar 31 10:54:59 2008 -0700 @@ -50,6 +50,7 @@ CIM_PORT = "5988" CIM_PORT = "5988" NM = "TEST LOG" platform_sup = ["Xen", "KVM", "XenFV"] +logging.basicConfig() logger = logging.getLogger(NM) logging.PRINT = logging.DEBUG + 50 logging.addLevelName(logging.PRINT, "PRINT")

1 1

[PATCH 0 of 5] [TEST] update bundles of RAFP tc and devices lib for XenFV and KVM support
by Guo Lian Yun 01 Apr '08

01 Apr '08

Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

3 8

[PATCH 0 of 3] [TEST] update EC test cases for XenFV and KVM support
by Guo Lian Yun 01 Apr '08

01 Apr '08

Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

2 6

[PATCH 0 of 3] [TEST] SystemDevice XenFV & KVM support
by lizg＠cn.ibm.com 01 Apr '08

01 Apr '08

Add XenFV & KVM support for SystemDevice test cases. Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>

4 7

[PATCH] Make DestroySystem actually undefine a domain as it should
by Dan Smith 31 Mar '08

31 Mar '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206736474 25200 # Node ID 1e1c2cd2ef0bff684df37d5c94d7b66b6189295c # Parent 2eaed9da089f7b49d85eadeb75334c11c869ffc8 Make DestroySystem actually undefine a domain as it should Also clean up the error path and CMPIValue stuff in the method while we're swizzling Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 2eaed9da089f -r 1e1c2cd2ef0b src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Fri Mar 28 07:20:02 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri Mar 28 13:34:34 2008 -0700 @@ -479,54 +479,56 @@ static CMPIStatus destroy_system(CMPIMet CMPIArgs *argsout) { const char *dom_name = NULL; - CMPIStatus status = {CMPI_RC_OK, NULL}; - CMPIValue rc; + CMPIStatus status; + uint32_t rc = IM_RC_FAILED; CMPIObjectPath *sys; - - virConnectPtr conn; + virConnectPtr conn = NULL; + virDomainPtr dom = NULL; conn = connect_by_classname(_BROKER, CLASSNAME(reference), &status); - if (conn == NULL) { - rc.uint32 = IM_RC_FAILED; - goto error1; - } - - if (cu_get_ref_arg(argsin, "AffectedSystem", &sys) != CMPI_RC_OK) { - rc.uint32 = IM_RC_FAILED; - goto error2; - } + if (conn == NULL) + goto error; + + if (cu_get_ref_arg(argsin, "AffectedSystem", &sys) != CMPI_RC_OK) + goto error; dom_name = get_key_from_ref_arg(argsin, "AffectedSystem", "Name"); - if (dom_name == NULL) { - rc.uint32 = IM_RC_FAILED; - goto error2; - } + if (dom_name == NULL) + goto error; // Make sure system exists and destroy it. - if (domain_exists(conn, dom_name)) { - virDomainPtr dom = virDomainLookupByName(conn, dom_name); - if (!virDomainDestroy(dom)) { - rc.uint32 = IM_RC_OK; - } else { - rc.uint32 = IM_RC_FAILED; - cu_statusf(_BROKER, &status, - CMPI_RC_ERR_FAILED, - "Domain already exists"); - } - virDomainFree(dom); + if (!domain_exists(conn, dom_name)) + goto error; + + dom = virDomainLookupByName(conn, dom_name); + if (dom == NULL) { + CU_DEBUG("No such domain `%s', dom_name"); + rc = IM_RC_SYS_NOT_FOUND; + goto error; + } + + virDomainDestroy(dom); /* Okay for this to fail */ + if (virDomainUndefine(dom) == 0) { + rc = IM_RC_OK; trigger_indication(context, "ComputerSystemDeletedIndication", NAMESPACE(reference)); - } else { - rc.uint32 = IM_RC_SYS_NOT_FOUND; - } - - error2: + } + +error: + if (rc == IM_RC_SYS_NOT_FOUND) + cu_statusf(_BROKER, &status, + CMPI_RC_ERR_FAILED, + "Failed to find domain"); + else if (rc == IM_RC_OK) + status = (CMPIStatus){CMPI_RC_OK, NULL}; + + virDomainFree(dom); virConnectClose(conn); - error1: CMReturnData(results, &rc, CMPI_uint32); + return status; }

2 1

[PATCH] [TEST] update ElementConforms.03 for XenFV and KVM support
by Guo Lian Yun 31 Mar '08

31 Mar '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1206952946 25200 # Node ID 9a6366dcdb01ebe19dceee945b9f59092e0f495d # Parent 612ccb311e273b091659fe14f0471567abe61d08 [TEST] update ElementConforms.03 for XenFV and KVM support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 612ccb311e27 -r 9a6366dcdb01 suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri Mar 28 00:03:41 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Mon Mar 31 01:42:26 2008 -0700 @@ -3,6 +3,7 @@ # Copyright 2008 IBM Corp. # # Authors: +# Guolian Yun <yunguol(a)cn.ibm.com> # Anoop V Chakkalakkal<anoop.vijayan(a)in.ibm.com> # Guolian Yun <yunguol(a)cn.ibm.com> # This library is free software; you can redistribute it and/or @@ -55,14 +56,13 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import assoc from XenKvmLib.common_util import try_assoc +from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL from CimTest import Globals from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, do_main -sup_types = ['Xen'] +sup_types = ['Xen', 'XenFV', 'KVM'] -classname = 'Xen_RegisteredProfile' -ac_classname = 'Xen_ElementConformsToProfile' bug = '92642' expr_values = { @@ -72,7 +72,9 @@ expr_values = { 'desc' : 'No such instance' } } -def try_invalid_assoc(name_val, i, field): +def try_invalid_assoc(name_val, i, field, virt='Xen'): + classname = get_typed_class(virt, "RegisteredProfile") + ac_classname = get_typed_class(virt, "ElementConformsToProfile") j = 0 keys = {} temp = name_val[i] @@ -106,7 +108,7 @@ def main(): tc_scen = ['INVALID_InstID_Keyname', 'INVALID_InstID_Keyvalue'] for i in range(len(tc_scen)): - retval = try_invalid_assoc(sv_name_val, i, tc_scen[i]) + retval = try_invalid_assoc(sv_name_val, i, tc_scen[i], options.virt) if retval != PASS: status = retval

2 1

[PATCH] [TEST] Make 02_destroysystem actually test the right thing
by Dan Smith 31 Mar '08

31 Mar '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206736402 25200 # Node ID fe283ed5273e0983adf6355c9d6d8e1e81dcdde2 # Parent 612ccb311e273b091659fe14f0471567abe61d08 [TEST] Make 02_destroysystem actually test the right thing This test was passing incorrectly because it was only looking at the active domain list instead of active+inactive. The DestroySystem method in the provider was only doing a destroy, which means that it disappeared from the active list and this test considered that a PASS. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 612ccb311e27 -r fe283ed5273e suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Fri Mar 28 00:03:41 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/02_destroysystem.py Fri Mar 28 13:33:22 2008 -0700 @@ -25,7 +25,7 @@ import pywbem import pywbem from pywbem.cim_obj import CIMInstanceName from VirtLib import utils -from VirtLib.live import active_domain_list +from VirtLib.live import domain_list from XenKvmLib import vsms, vxml from XenKvmLib.classes import get_typed_class from CimTest.Globals import do_main @@ -50,7 +50,7 @@ def main(): 'Name':default_dom, 'CreationClassName':classname}) - list_before = active_domain_list(options.ip, options.virt) + list_before = domain_list(options.ip, options.virt) status = PASS rc = -1 @@ -62,7 +62,7 @@ def main(): logger.error(details) status = FAIL - list_after = active_domain_list(options.ip, options.virt) + list_after = domain_list(options.ip, options.virt) status = PASS if default_dom not in list_before:

2 2

[PATCH] [TEST] .2# Add kernel params in VSSD construction in vsms
by lizg＠cn.ibm.com 31 Mar '08

31 Mar '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1206712013 -28800 # Node ID c67d4960d4073c641beeb1fe5180862001c247ae # Parent 877558f5cbe913300335b7069d8e21a6257638a4 [TEST] .2# Add kernel params in VSSD construction in vsms Provider has added Kernel/Bootloader properties for para-virt. This is the change to utilize those properties. The non-default argument follows default argment error fixed in this version. Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 877558f5cbe9 -r c67d4960d407 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Mar 28 17:23:54 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Mar 28 21:46:53 2008 +0800 @@ -25,6 +25,7 @@ import pywbem import pywbem from CimTest.CimExt import CIMMethodClass, CIMClassMOF from CimTest import Globals +from VirtLib import live from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class, get_class_type, virt_types @@ -33,6 +34,10 @@ RASD_TYPE_NET_ETHER = 10 RASD_TYPE_NET_ETHER = 10 RASD_TYPE_NET_OTHER = 11 RASD_TYPE_DISK = 17 + +VSSD_RECOVERY_NONE = 2 +VSSD_RECOVERY_RESTART = 3 +VSSD_RECOVERY_PRESERVE = 123 def eval_cls(basename): def func(f): @@ -81,17 +86,25 @@ def enumerate_instances(server, virt='Xe # classes to define VSSD parameters class CIM_VirtualSystemSettingData(CIMClassMOF): - def __init__(self, name='test_domain', set_vs_id = True): + def __init__(self, name, virt): type = get_class_type(self.__class__.__name__) self.InstanceID = '%s:%s' % (type, name) self.Caption = self.Description = 'Virtual System' - self.ElementName = name + self.VirtualSystemIdentifier = self.ElementName = name self.VirtualSystemType = type self.CreationClassName = self.__class__.__name__ - self.isFullVirt = (type == 'KVM') + self.AutomaticShutdownAction = VSSD_RECOVERY_NONE + self.AutomaticRecoveryAction = VSSD_RECOVERY_NONE + + self.isFullVirt = (type == 'KVM' or virt == 'XenFV') + if self.isFullVirt: + self.BootDevice = 'hd' + else: + self.Bootloader = live.bootloader(Globals.CIM_IP, 0) + self.BootloaderArgs = '' + self.Kernel = vxml.XenXML.kernel_path + self.Ramdisk = vxml.XenXML.init_path - if set_vs_id == True: - self.VirtualSystemIdentifier = name class Xen_VirtualSystemSettingData(CIM_VirtualSystemSettingData): pass @@ -193,7 +206,7 @@ def default_vssd_rasd_str(dom_name='test mem_mb=512, virt='Xen'): class_vssd = get_vssd_class(virt) - vssd = class_vssd(name=dom_name) + vssd = class_vssd(name=dom_name, virt=virt) class_dasd = get_dasd_class(virt) if virt == 'KVM':

3 5

[PATCH] [CU] add one class to keep a list of received indications
by Guo Lian Yun 31 Mar '08

31 Mar '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1206942619 25200 # Node ID 66fc3211e0bf16d2be0d39e2f0a4d74b84fb15f9 # Parent e9037a5a7df99bb63ae5e90ade698592af7b7e92 [CU] add one class to keep a list of received indications Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r e9037a5a7df9 -r 66fc3211e0bf tools/indication_tester.py --- a/tools/indication_tester.py Mon Mar 10 12:05:59 2008 -0700 +++ b/tools/indication_tester.py Sun Mar 30 22:50:19 2008 -0700 @@ -286,6 +286,11 @@ class CIMIndication: def __str__(self): return self.name +class CIMIndicationServer(BaseHTTPServer.HTTPServer): + def __init__(self, *args): + BaseHTTPServer.HTTPServer.__init__(self, *args) + self.indications = [] + class CIMSocketHandler(BaseHTTPServer.BaseHTTPRequestHandler): def do_POST(self): length = self.headers.getheader('content-length') @@ -295,6 +300,7 @@ class CIMSocketHandler(BaseHTTPServer.Ba print "Got indication: %s" % indication if self.server.print_ind: print "%s\n\n" % data + self.server.indications.append(indication) class CIMIndicationSubscription: def __init__(self, name, typ, ns, print_ind, sysname): @@ -305,6 +311,7 @@ class CIMIndicationSubscription: self.server = BaseHTTPServer.HTTPServer(('', 8000), CIMSocketHandler) self.server.print_ind = print_ind + self.server.indications = [] self.port = 8000 self.filter_xml = filter_xml(name, typ, ns, sysname)

2 1

[PATCH 0 of 2] [TEST] bundles of ComputerSystemCreatedIndication tc
by Guo Lian Yun 31 Mar '08

31 Mar '08

The need patch of indication_tester is in libcmpiutil tree, you can copy it to cimtest lib make ComputerSystmeCreatedIndication tc work Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

1 2

[PATCH] Set status in all error cases for DestroySystem in VSMS
by Kaitlin Rupert 28 Mar '08

28 Mar '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1206730931 25200 # Node ID 95caba1628c467332ffb129f663cef5289039744 # Parent 321e3b4320ff3c849c684f1d940f0fa917f6555c Set status in all error cases for DestroySystem in VSMS. Be sure to set a status message for the IM_RC_FAILED case. In the case that connect_by_classname() fails, set rc = -1 because connect_by_classname() sets the status. Remove domain_exists() - this has been replaced by virDomainLookupByName(). Fix typo in CU_DEBUG() statement. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 321e3b4320ff -r 95caba1628c4 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Apr 09 10:57:05 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri Mar 28 12:02:11 2008 -0700 @@ -488,8 +488,10 @@ static CMPIStatus destroy_system(CMPIMet conn = connect_by_classname(_BROKER, CLASSNAME(reference), &status); - if (conn == NULL) + if (conn == NULL) { + rc = -1; goto error; + } if (cu_get_ref_arg(argsin, "AffectedSystem", &sys) != CMPI_RC_OK) goto error; @@ -498,13 +500,9 @@ static CMPIStatus destroy_system(CMPIMet if (dom_name == NULL) goto error; - // Make sure system exists and destroy it. - if (!domain_exists(conn, dom_name)) - goto error; - dom = virDomainLookupByName(conn, dom_name); if (dom == NULL) { - CU_DEBUG("No such domain `%s', dom_name"); + CU_DEBUG("No such domain `%s'", dom_name); rc = IM_RC_SYS_NOT_FOUND; goto error; } @@ -522,6 +520,10 @@ error: cu_statusf(_BROKER, &status, CMPI_RC_ERR_FAILED, "Failed to find domain"); + else if (rc == IM_RC_FAILED) + cu_statusf(_BROKER, &status, + CMPI_RC_ERR_FAILED, + "Unable to retrieve domain name."); else if (rc == IM_RC_OK) status = (CMPIStatus){CMPI_RC_OK, NULL};

1 0

[PATCH 0 of 3] [TEST] update VSMC test cases and helper function for XenFV and KVm support
by Guo Lian Yun 28 Mar '08

28 Mar '08

Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

3 5

[PATCH] Add missing newlines in some LXC schema lines
by lizg＠cn.ibm.com 28 Mar '08

28 Mar '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1206669991 -28800 # Node ID 888b094934bd3d17b95df1702a0ad654d5fdf5e2 # Parent c2b027700cb7a3075a9b9f56acd6d52cbd1f6fdf Add missing newlines in some LXC schema lines Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r c2b027700cb7 -r 888b094934bd schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Tue Mar 25 13:45:01 2008 -0700 +++ b/schema/HostedResourcePool.registration Fri Mar 28 10:06:31 2008 +0800 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association -KVM_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool associationLXC_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association +KVM_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association +LXC_HostedResourcePool root/virt Virt_HostedResourcePool Virt_HostedResourcePool association diff -r c2b027700cb7 -r 888b094934bd schema/NetPool.registration --- a/schema/NetPool.registration Tue Mar 25 13:45:01 2008 -0700 +++ b/schema/NetPool.registration Fri Mar 28 10:06:31 2008 +0800 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance -KVM_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instanceLXC_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance +KVM_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance +LXC_NetworkPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r c2b027700cb7 -r 888b094934bd schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Tue Mar 25 13:45:01 2008 -0700 +++ b/schema/ResourceAllocationFromPool.registration Fri Mar 28 10:06:31 2008 +0800 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association -KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool associationLXC_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association +KVM_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association +LXC_ResourceAllocationFromPool root/virt Virt_ResourceAllocationFromPool Virt_ResourceAllocationFromPool association diff -r c2b027700cb7 -r 888b094934bd schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Tue Mar 25 13:45:01 2008 -0700 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Fri Mar 28 10:06:31 2008 +0800 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance -KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instanceLXC_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance +KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance +LXC_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilities Virt_ResourcePoolConfigurationCapabilities instance diff -r c2b027700cb7 -r 888b094934bd schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Tue Mar 25 13:45:01 2008 -0700 +++ b/schema/ResourcePoolConfigurationService.registration Fri Mar 28 10:06:31 2008 +0800 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method -KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance methodLXC_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method +KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method +LXC_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationService Virt_ResourcePoolConfigurationService instance method diff -r c2b027700cb7 -r 888b094934bd schema/VSMigrationCapabilities.registration --- a/schema/VSMigrationCapabilities.registration Tue Mar 25 13:45:01 2008 -0700 +++ b/schema/VSMigrationCapabilities.registration Fri Mar 28 10:06:31 2008 +0800 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance -KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instanceLXC_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance +KVM_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance +LXC_VirtualSystemMigrationCapabilities root/virt Virt_VSMigrationCapabilities Virt_VSMigrationCapabilities instance diff -r c2b027700cb7 -r 888b094934bd schema/VSMigrationService.registration --- a/schema/VSMigrationService.registration Tue Mar 25 13:45:01 2008 -0700 +++ b/schema/VSMigrationService.registration Fri Mar 28 10:06:31 2008 +0800 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance method -KVM_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance methodLXC_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance method +KVM_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance method +LXC_VirtualSystemMigrationService root/virt Virt_VSMigrationService Virt_VSMigrationService instance method

2 1

[PATCH 0 of 3] [TEST] update EC test cases for XenFV and KVM support
by Guo Lian Yun 28 Mar '08

28 Mar '08

Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>

2 4

[PATCH] [TEST] Add kernel params in VSSD construction in vsms
by lizg＠cn.ibm.com 28 Mar '08

28 Mar '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1206696365 -28800 # Node ID f9d1d6a61670a3700c5a569d2eeb31d29b5f9da2 # Parent 877558f5cbe913300335b7069d8e21a6257638a4 [TEST] Add kernel params in VSSD construction in vsms Provider has added Kernel/Bootloader properties for para-virt. This is the change to utilize those properties. Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 877558f5cbe9 -r f9d1d6a61670 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Mar 28 17:23:54 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri Mar 28 17:26:05 2008 +0800 @@ -25,6 +25,7 @@ import pywbem import pywbem from CimTest.CimExt import CIMMethodClass, CIMClassMOF from CimTest import Globals +from VirtLib import live from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class, get_class_type, virt_types @@ -33,6 +34,10 @@ RASD_TYPE_NET_ETHER = 10 RASD_TYPE_NET_ETHER = 10 RASD_TYPE_NET_OTHER = 11 RASD_TYPE_DISK = 17 + +VSSD_RECOVERY_NONE = 2 +VSSD_RECOVERY_RESTART = 3 +VSSD_RECOVERY_PRESERVE = 123 def eval_cls(basename): def func(f): @@ -81,17 +86,25 @@ def enumerate_instances(server, virt='Xe # classes to define VSSD parameters class CIM_VirtualSystemSettingData(CIMClassMOF): - def __init__(self, name='test_domain', set_vs_id = True): + def __init__(self, name='test_domain', virt): type = get_class_type(self.__class__.__name__) self.InstanceID = '%s:%s' % (type, name) self.Caption = self.Description = 'Virtual System' - self.ElementName = name + self.VirtualSystemIdentifier = self.ElementName = name self.VirtualSystemType = type self.CreationClassName = self.__class__.__name__ - self.isFullVirt = (type == 'KVM') + self.AutomaticShutdownAction = VSSD_RECOVERY_NONE + self.AutomaticRecoveryAction = VSSD_RECOVERY_NONE + + self.isFullVirt = (type == 'KVM' or virt == 'XenFV') + if self.isFullVirt: + self.BootDevice = 'hd' + else: + self.Bootloader = live.bootloader(Globals.CIM_IP, 0) + self.BootloaderArgs = '' + self.Kernel = vxml.XenXML.kernel_path + self.Ramdisk = vxml.XenXML.init_path - if set_vs_id == True: - self.VirtualSystemIdentifier = name class Xen_VirtualSystemSettingData(CIM_VirtualSystemSettingData): pass @@ -193,7 +206,7 @@ def default_vssd_rasd_str(dom_name='test mem_mb=512, virt='Xen'): class_vssd = get_vssd_class(virt) - vssd = class_vssd(name=dom_name) + vssd = class_vssd(name=dom_name, virt=virt) class_dasd = get_dasd_class(virt) if virt == 'KVM':

2 1

[PATCH] [TEST] Add virt tag to set_uuid in common_util.py
by lizg＠cn.ibm.com 28 Mar '08

28 Mar '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1206685818 -28800 # Node ID 0ffa3f03d77302fb7f289f8ddb537380fc885040 # Parent c9bb4d898469450c851139d5faa58a5818835e08 [TEST] Add virt tag to set_uuid in common_util.py Otherwise, KVM domain's uuid is not recorded. Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r c9bb4d898469 -r 0ffa3f03d773 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Thu Mar 27 11:07:12 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Fri Mar 28 14:30:18 2008 +0800 @@ -93,7 +93,7 @@ def create_using_definesystem(domain_nam undefine_test_domain(dname, options.ip, virt=virt) return XFAIL_RC(bug) - set_uuid(viruuid(domain_name, ip)) + set_uuid(viruuid(domain_name, ip, virt=virt)) myxml = dumpxml(domain_name, ip, virt=virt) name = xml_get_dom_name(myxml)

1 0

Announcement: test suite now available
by Dan Smith 27 Mar '08

27 Mar '08

I'm pleased to announce that our internal test suite has been made public. The tree is available here: http://libvirt.org/hg/cimtest I'm sure that there will be all kinds of brokenness exposed as people try to use it outside of our environment. Please post any issues that you may have. The suite uses pywbem (current svn snapshot required) for the CIM client tasks and ssh to connect to the machine under test to validate against virsh. The cimtest_sshkey.pub file must be added to root's authorized_keys file to enable this. Changes to allow generation of a site ssh key will need to be made to mitigate the obvious risk involved. A sample invocation looks like this: % export CIM_USER=root % export CIM_PASS=password % export CIM_NS=root/virt % ./runtests libvirt-cim -i localhost We will start posting regular test results on various platforms using this soon, which should provide a baseline to compare against. More detail will need to be added to the website, I'm sure, but this should be enough to get people started. Please post issues you have and test results if you can get them! -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms(a)us.ibm.com

1 0

[PATCH] (#2) Make isMigratable return true if it makes it all the way through the checks,
by Dan Smith 27 Mar '08

27 Mar '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206553643 25200 # Node ID 055180f1b8538a497dac8272a02ff63c626f3190 # Parent c2b027700cb7a3075a9b9f56acd6d52cbd1f6fdf (#2) Make isMigratable return true if it makes it all the way through the checks, false otherwise. These should be independent of the return code and the status, which the patch fixes. Changes: - Removed stupidity Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c2b027700cb7 -r 055180f1b853 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Tue Mar 25 13:45:01 2008 -0700 +++ b/src/Virt_VSMigrationService.c Wed Mar 26 10:47:23 2008 -0700 @@ -543,7 +543,7 @@ static CMPIStatus vs_migratable(const CM CMPIStatus s; virConnectPtr conn = NULL; virConnectPtr dconn = NULL; - uint32_t retcode = 1; + uint32_t retcode = CIM_SVPC_RETURN_COMPLETED; CMPIBoolean isMigratable = 0; uint16_t type; virDomainPtr dom = NULL; @@ -598,14 +598,13 @@ static CMPIStatus vs_migratable(const CM goto out; } - retcode = CIM_SVPC_RETURN_COMPLETED; + isMigratable = 1; cu_statusf(_BROKER, &s, CMPI_RC_OK, ""); out: CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32); - isMigratable = (retcode == 0); CMAddArg(argsout, "IsMigratable", (CMPIValue *)&isMigratable, CMPI_boolean);

2 2

[PATCH] Make isMigratable return true if it makes it all the way through the checks,
by Dan Smith 27 Mar '08

27 Mar '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206551684 25200 # Node ID 19f1da7d9a42f35ab345699b36e22d6981b26342 # Parent c2b027700cb7a3075a9b9f56acd6d52cbd1f6fdf Make isMigratable return true if it makes it all the way through the checks, false otherwise. These should be independent of the return code and the status, which the patch fixes. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c2b027700cb7 -r 19f1da7d9a42 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Tue Mar 25 13:45:01 2008 -0700 +++ b/src/Virt_VSMigrationService.c Wed Mar 26 10:14:44 2008 -0700 @@ -543,7 +543,7 @@ static CMPIStatus vs_migratable(const CM CMPIStatus s; virConnectPtr conn = NULL; virConnectPtr dconn = NULL; - uint32_t retcode = 1; + uint32_t retcode = SVPC_RETURN_COMPLETED; CMPIBoolean isMigratable = 0; uint16_t type; virDomainPtr dom = NULL; @@ -598,14 +598,13 @@ static CMPIStatus vs_migratable(const CM goto out; } - retcode = CIM_SVPC_RETURN_COMPLETED; + isMigratable = 1; cu_statusf(_BROKER, &s, CMPI_RC_OK, ""); out: CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32); - isMigratable = (retcode == 0); CMAddArg(argsout, "IsMigratable", (CMPIValue *)&isMigratable, CMPI_boolean);

2 1

[PATCH 0 of 2] Add beginnings of LXC XML parsing
by Dan Smith 26 Mar '08

26 Mar '08

This set adds system and disk device parsing for LXC guests.

2 4

[PATCH 0 of 2] (#2) Add first bits of LXC support
by Dan Smith 25 Mar '08

25 Mar '08

Updated the previous set to include all LXC schema changes

2 4

[PATCH] Relax permissions on schema install temporary directory
by Dan Smith 25 Mar '08

25 Mar '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206375916 25200 # Node ID 6cc2fd98582341e8a5068efaa19fb6dc2f61c140 # Parent ff7434bc724db507c23a8c4f9628d82dcae44ec7 Relax permissions on schema install temporary directory This eliminates a failure if the pegasus utilities are setuid to the Pegasus user Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r ff7434bc724d -r 6cc2fd985823 base_schema/install_base_schema.sh.in --- a/base_schema/install_base_schema.sh.in Fri Mar 21 09:40:51 2008 -0700 +++ b/base_schema/install_base_schema.sh.in Mon Mar 24 09:25:16 2008 -0700 @@ -6,6 +6,7 @@ SCHEMA_VERSION="2.16" SCHEMA_VERSION="2.16" TMPDIR=$(mktemp -d /tmp/cim_schema.XXXXX) +chmod a+x $TMPDIR if [ ! -z "$CIM_DEBUG" ]; then set -x

2 1

[PATCH] Add kernel/initrd support to Xen_VSSD
by Dan Smith 25 Mar '08

25 Mar '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1206117651 25200 # Node ID ff7434bc724db507c23a8c4f9628d82dcae44ec7 # Parent 6c2d68b9722a23a94075172270acffad1bbbad6f Add kernel/initrd support to Xen_VSSD Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 6c2d68b9722a -r ff7434bc724d schema/VSSD.mof --- a/schema/VSSD.mof Fri Mar 21 08:29:49 2008 -0700 +++ b/schema/VSSD.mof Fri Mar 21 09:40:51 2008 -0700 @@ -15,6 +15,12 @@ class Xen_VirtualSystemSettingData : CIM "para-virtualized mode")] string Bootloader; string BootloaderArgs; + + [Description ("The direct-boot kernel for PV guests not using a bootloader")] + string Kernel; + + [Description ("The direct-boot ramdisk for PV guests not using a bootloader")] + string Ramdisk; [Description ("The device to boot from when in fully-virtualized mode." "One of hd,fd,cdrom.")] diff -r 6c2d68b9722a -r ff7434bc724d src/Virt_VSSD.c --- a/src/Virt_VSSD.c Fri Mar 21 08:29:49 2008 -0700 +++ b/src/Virt_VSSD.c Fri Mar 21 09:40:51 2008 -0700 @@ -70,6 +70,16 @@ static void _set_pv_prop(struct domain * if (dominfo->bootloader_args != NULL) CMSetProperty(inst, "BootloaderArgs", (CMPIValue *)dominfo->bootloader_args, + CMPI_chars); + + if (dominfo->os_info.pv.kernel != NULL) + CMSetProperty(inst, "Kernel", + (CMPIValue *)dominfo->os_info.pv.kernel, + CMPI_chars); + + if (dominfo->os_info.pv.initrd != NULL) + CMSetProperty(inst, "Ramdisk", + (CMPIValue *)dominfo->os_info.pv.initrd, CMPI_chars); } diff -r 6c2d68b9722a -r ff7434bc724d src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Fri Mar 21 08:29:49 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri Mar 21 09:40:51 2008 -0700 @@ -90,19 +90,33 @@ static int xenpv_vssd_to_domain(CMPIInst domain->type = DOMAIN_XENPV; + free(domain->bootloader); ret = cu_get_str_prop(inst, "Bootloader", &val); - if (ret != CMPI_RC_OK) - val = ""; - - free(domain->bootloader); - domain->bootloader = strdup(val); - + if (ret == CMPI_RC_OK) + domain->bootloader = strdup(val); + else + domain->bootloader = NULL; + + free(domain->bootloader_args); ret = cu_get_str_prop(inst, "BootloaderArgs", &val); - if (ret != CMPI_RC_OK) - val = ""; - - free(domain->bootloader_args); - domain->bootloader_args = strdup(val); + if (ret == CMPI_RC_OK) + domain->bootloader_args = strdup(val); + else + domain->bootloader_args = NULL; + + free(domain->os_info.pv.kernel); + ret = cu_get_str_prop(inst, "Kernel", &val); + if (ret == CMPI_RC_OK) + domain->os_info.pv.kernel = strdup(val); + else + domain->os_info.pv.kernel = NULL; + + free(domain->os_info.pv.initrd); + ret = cu_get_str_prop(inst, "Ramdisk", &val); + if (ret == CMPI_RC_OK) + domain->os_info.pv.initrd = strdup(val); + else + domain->os_info.pv.initrd = NULL; return 1; }

2 1

[PATCH 0 of 2] Implement restart-style migration
by Dan Smith 25 Mar '08

25 Mar '08

Adds restart migration, which shuts down a guest, moves the config to a remote host, and then restarts the domain. Also includes a fix to domain_online() This seems like a pretty effective and safe way to move a guest around if you don't need it to stay up in the process.

2 6