- CIM - libvirt List Archives

[PATCH] [TEST] #2 Use enumclass.py to cover computersystem.py behavior and update commom_util.py
by yunguol＠cn.ibm.com 03 Sep '08

03 Sep '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1220235476 25200 # Node ID 57b15d9bb761cb09f48dc86a793f3d2f79e59e19 # Parent 946fd46b96866adaab356876f9c8bbf937f0b3d6 [TEST] #2 Use enumclass.py to cover computersystem.py behavior and update commom_util.py Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 946fd46b9686 -r 57b15d9bb761 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Sun Aug 31 19:17:56 2008 -0700 @@ -28,7 +28,6 @@ from XenKvmLib.test_xml import * from XenKvmLib.test_doms import * from XenKvmLib import vsms -from XenKvmLib import computersystem from XenKvmLib import enumclass from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance @@ -54,7 +53,7 @@ def get_cs_instance(domain_name, ip, virt='Xen'): cs = None try: - cs = computersystem.get_cs_class(virt)(ip, domain_name) + cs = get_typed_class(virt, 'ComputerSystem')(ip, domain_name) if cs.Name != domain_name: logger.error("VS %s is not found" % domain_name) @@ -169,7 +168,7 @@ def poll_for_state_change(server, virt, dom, exp_state, timeout=30): dom_cs = None - cs = computersystem.get_cs_class(virt) + cs = get_typed_class(virt, 'ComputerSystem') try: for i in range(1, (timeout + 1)): diff -r 946fd46b9686 -r 57b15d9bb761 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Thu Aug 28 14:07:25 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Sun Aug 31 19:17:56 2008 -0700 @@ -26,7 +26,7 @@ import pywbem from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance -from XenKvmLib.classes import get_typed_class +from XenKvmLib.classes import get_typed_class, virt_types from CimTest import Globals class CIM_MyClass(CIM_Instance): @@ -45,7 +45,32 @@ CIM_Instance.__init__(self, inst) + def __invoke(self, method, params): + try: + return self.conn.InvokeMethod(method, + self.ref, + **params) + except pywbem.CIMError, arg: + print 'InvokeMethod(%s): %s' % (method, arg[1]) + raise + + def __getattr__(self, attr): + if self.inst.has_key(attr): + return self.inst[attr] + else: + return CimExt._Method(self.__invoke, attr) + + class CIM_System(CIM_MyClass): + pass + +class Xen_ComputerSystem(CIM_System): + pass + +class KVM_ComputerSystem(CIM_System): + pass + +class LXC_ComputerSystem(CIM_System): pass class CIM_AllocationCapabilities(CIM_MyClass):

2 1

[PATCH] Fix memory XML parsing so that max_size is set to the memory value
by Kaitlin Rupert 03 Sep '08

03 Sep '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1220392087 25200 # Node ID 2796fd3e2eaa202206430ad59c01dd01cd982ccd # Parent 2db1158cea318cfee11a77724c97a0b4758ffb2c Fix memory XML parsing so that max_size is set to the memory value... And size is set to the value of currentMem. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 2db1158cea31 -r 2796fd3e2eaa libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Fri Aug 29 08:16:56 2008 -0700 +++ b/libxkutil/device_parsing.c Tue Sep 02 14:48:07 2008 -0700 @@ -407,9 +407,9 @@ content = get_node_content(node); - if (XSTREQ(node->name, "memory")) + if (XSTREQ(node->name, "currentMemory")) sscanf(content, "%" PRIu64, &mdev->size); - else if (XSTREQ(node->name, "currentMemory")) + else if (XSTREQ(node->name, "memory")) sscanf(content, "%" PRIu64, &mdev->maxsize); free(content);

1 0

[PATCH] [TEST] Update commom_util.py to call from enumclass not computersystem
by yunguol＠cn.ibm.com 31 Aug '08

31 Aug '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1219987072 25200 # Node ID 6c04dcf4211c9d244a77595ce207c78af7899f09 # Parent a9978826a31d881a7fcaa2ca277a44322511a624 [TEST] Update commom_util.py to call from enumclass not computersystem Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r a9978826a31d -r 6c04dcf4211c suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Thu Aug 28 22:17:52 2008 -0700 @@ -28,7 +28,7 @@ from XenKvmLib.test_xml import * from XenKvmLib.test_doms import * from XenKvmLib import vsms -from XenKvmLib import computersystem +from XenKvmLib import enumclass from XenKvmLib import enumclass from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance @@ -54,7 +54,7 @@ def get_cs_instance(domain_name, ip, virt='Xen'): cs = None try: - cs = computersystem.get_cs_class(virt)(ip, domain_name) + cs = enumclass.get_cs_class(virt)(ip, domain_name) if cs.Name != domain_name: logger.error("VS %s is not found" % domain_name) @@ -169,7 +169,7 @@ def poll_for_state_change(server, virt, dom, exp_state, timeout=30): dom_cs = None - cs = computersystem.get_cs_class(virt) + cs = enumclass.get_cs_class(virt) try: for i in range(1, (timeout + 1)):

3 2

[PATCH 0 of 4] Update test cases to use do_main from const.py
by Kaitlin Rupert 31 Aug '08

31 Aug '08

2 8

[PATCH] [TEST] Use enumclass.py to cover computersystem.py behavior and update CS tests
by yunguol＠cn.ibm.com 29 Aug '08

29 Aug '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1219986526 25200 # Node ID a10801bed98fb176effa2ccc9eb3fe3765a1ea14 # Parent a9978826a31d881a7fcaa2ca277a44322511a624 [TEST] Use enumclass.py to cover computersystem.py behavior and update CS tests More update patches related to this change to follow, and at last remove computersystem.py Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/01_enum.py Thu Aug 28 22:08:46 2008 -0700 @@ -24,7 +24,7 @@ import sys from CimTest.Globals import do_main -from XenKvmLib import computersystem +from XenKvmLib import enumclass from VirtLib import live from VirtLib import utils from CimTest import Globals @@ -36,9 +36,10 @@ def main(): options = main.options status = PASS - + + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) live_cs = live.domain_list(options.ip, options.virt) for system in cs: name = system.name diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Thu Aug 28 22:08:46 2008 -0700 @@ -24,7 +24,7 @@ import sys import pywbem -from XenKvmLib import computersystem +from XenKvmLib import enumclass from VirtLib import live from VirtLib import utils from CimTest.Globals import logger, CIM_ERROR_ENUMERATE @@ -49,9 +49,9 @@ return SKIP cn = "%s_ComputerSystem" % options.virt - + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) except Exception, details: logger.error(CIM_ERROR_ENUMERATE, cn) diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/03_defineVS.py Thu Aug 28 22:08:46 2008 -0700 @@ -27,7 +27,7 @@ # 26-Sep-2007 import sys -from XenKvmLib import computersystem +from XenKvmLib import enumclass from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from VirtLib import utils @@ -49,8 +49,9 @@ Globals.logger.error(Globals.VIRSH_ERROR_DEFINE % test_dom) return status + keys = ['Name', 'CreationClassName'] try: - cs = computersystem.enumerate(options.ip, options.virt) + cs = enumclass.enumerate(options.ip, 'ComputerSystem', keys, options.virt) if len(cs) == 0: raise Exception('No cs instance returned') for dom in cs: diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Thu Aug 28 22:08:46 2008 -0700 @@ -32,7 +32,7 @@ import sys from time import sleep from XenKvmLib import vxml -from XenKvmLib import computersystem +from XenKvmLib import enumclass from CimTest import Globals from XenKvmLib.classes import get_typed_class from CimTest.Globals import do_main @@ -62,7 +62,7 @@ # otherwise. for i in range(1, (timeout + 1)): sleep(1) - cs = computersystem.get_cs_class(options.virt)(options.ip, + cs = enumclass.get_cs_class(options.virt)(options.ip, test_dom) if cs.Name != test_dom: Globals.logger.error("VS %s is not defined" % test_dom) diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/05_activate_defined_start.py Thu Aug 28 22:08:46 2008 -0700 @@ -42,7 +42,7 @@ # Date : 17-10-2007 import sys -from XenKvmLib import computersystem +from XenKvmLib import enumclass from XenKvmLib import vxml from VirtLib import utils from CimTest.Globals import logger @@ -73,7 +73,7 @@ logger.error("ERROR: VS %s was not defined" % test_dom) return status - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + cs = enumclass.get_cs_class(options.virt)(options.ip, test_dom) if cs.Name == test_dom: from_State = cs.EnabledState else: @@ -95,7 +95,7 @@ #Get the value of the EnabledState property and RequestedState property. try: - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) + cs = enumclass.get_cs_class(options.virt)(options.ip, test_dom) if cs.Name == test_dom: to_RequestedState = cs.RequestedState enabledState = cs.EnabledState diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/06_paused_active_suspend.py Thu Aug 28 22:08:46 2008 -0700 @@ -41,7 +41,6 @@ # Date :18-10-2007 import sys -from XenKvmLib import computersystem from XenKvmLib import vxml from VirtLib import utils from XenKvmLib.test_doms import destroy_and_undefine_all diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Thu Aug 28 22:08:46 2008 -0700 @@ -29,7 +29,6 @@ # Date: 14-12-2007 import sys -from XenKvmLib import computersystem from VirtLib import utils from XenKvmLib import vxml from XenKvmLib.test_doms import destroy_and_undefine_domain diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/41_cs_to_settingdefinestate.py Thu Aug 28 22:08:46 2008 -0700 @@ -58,7 +58,6 @@ import sys from VirtLib import utils -from XenKvmLib import computersystem from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class from XenKvmLib.test_doms import destroy_and_undefine_all diff -r a9978826a31d -r a10801bed98f suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Thu Aug 28 22:08:46 2008 -0700 @@ -26,7 +26,7 @@ import pywbem from pywbem.cim_obj import CIMInstanceName from XenKvmLib.devices import CIM_Instance -from XenKvmLib.classes import get_typed_class +from XenKvmLib.classes import get_typed_class, virt_types from CimTest import Globals class CIM_MyClass(CIM_Instance): @@ -45,7 +45,32 @@ CIM_Instance.__init__(self, inst) + def __invoke(self, method, params): + try: + return self.conn.InvokeMethod(method, + self.ref, + **params) + except pywbem.CIMError, arg: + print 'InvokeMethod(%s): %s' % (method, arg[1]) + raise + + def __getattr__(self, attr): + if self.inst.has_key(attr): + return self.inst[attr] + else: + return CimExt._Method(self.__invoke, attr) + + class CIM_System(CIM_MyClass): + pass + +class Xen_ComputerSystem(CIM_System): + pass + +class KVM_ComputerSystem(CIM_System): + pass + +class LXC_ComputerSystem(CIM_System): pass class CIM_AllocationCapabilities(CIM_MyClass): @@ -357,3 +382,12 @@ return None return inst + +def get_cs_class(virt): + if virt in virt_types: + return eval(get_typed_class(virt, 'ComputerSystem')) + +def system_of(server, iname): + t = eval(iname["CreationClassName"]) + + return t(server, iname["Name"])

2 1

[PATCH] Fix ConcreteComponent schema
by Dan Smith 29 Aug '08

29 Aug '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1220023016 25200 # Node ID 2db1158cea318cfee11a77724c97a0b4758ffb2c # Parent e2c21aedef202a43dfc29f64d4849589ca581292 Fix ConcreteComponent schema The registration file mentions KVM_ twice instead of LXC. This was causing pegasus to complain on postinstall, but *only* if the CIMOM was running at the time. If it was not running, it didn't complain. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r e2c21aedef20 -r 2db1158cea31 schema/ConcreteComponent.registration --- a/schema/ConcreteComponent.registration Fri Aug 29 07:43:52 2008 -0700 +++ b/schema/ConcreteComponent.registration Fri Aug 29 08:16:56 2008 -0700 @@ -2,4 +2,4 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ConcreteComponent root/virt Virt_ConcreteComponent Virt_ConcreteComponent association KVM_ConcreteComponent root/virt Virt_ConcreteComponent Virt_ConcreteComponent association -KVM_ConcreteComponent root/virt Virt_ConcreteComponent Virt_ConcreteComponent association +LXC_ConcreteComponent root/virt Virt_ConcreteComponent Virt_ConcreteComponent association

2 1

[PATCH] Fix VSMigrationService schema to remove duplicate method name
by Dan Smith 29 Aug '08

29 Aug '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1220021032 25200 # Node ID e2c21aedef202a43dfc29f64d4849589ca581292 # Parent a8130304d2f225657fd8c58c0eedb5d0eea37b7f Fix VSMigrationService schema to remove duplicate method name Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r a8130304d2f2 -r e2c21aedef20 schema/VSMigrationService.mof --- a/schema/VSMigrationService.mof Fri Aug 22 10:50:48 2008 -0700 +++ b/schema/VSMigrationService.mof Fri Aug 29 07:43:52 2008 -0700 @@ -49,7 +49,7 @@ CIM_ConcreteJob REF Job ); - uint32 MigrateVirtualSystemToHost( + uint32 MigrateVirtualSystemToSystem( [In] CIM_ComputerSystem REF ComputerSystem, [In]

2 1

[PATCH] [TEST]#2 Add HRP.01~04 to support disk and net pool, user default or return name instead of hard code
by yunguol＠cn.ibm.com 29 Aug '08

29 Aug '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1219984629 25200 # Node ID 10fde478001991f40209fb6e18aca5231c41cc14 # Parent a9978826a31d881a7fcaa2ca277a44322511a624 [TEST]#2 Add HRP.01~04 to support disk and net pool, user default or return name instead of hard code Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r a9978826a31d -r 10fde4780019 suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/01_forward.py Thu Aug 28 21:37:09 2008 -0700 @@ -26,17 +26,25 @@ import sys from XenKvmLib import assoc from XenKvmLib import enumclass +from XenKvmLib.const import default_network_name from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(sup_types) def main(): options = main.options status = FAIL + + status, dpool_name = create_diskpool_conf(options.ip, options.virt) + if status != PASS: + logger.error("Failed to create diskpool") + return FAIL + keys = ['Name', 'CreationClassName'] try: host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] @@ -70,6 +78,13 @@ status = PASS if cname.find("ProcessorPool") >=0 and items['InstanceID'] == "ProcessorPool/0": status = PASS + if cname.find("NetworkPool") >=0 and \ + items['InstanceID'] == "NetworkPool/%s" %default_network_name: + status = PASS + if cname.find("DiskPool") >=0 and items['InstanceID'] == "DiskPool/%s" %dpool_name: + status = PASS + + cleanup_restore(options.ip, options.virt) return status if __name__ == "__main__": diff -r a9978826a31d -r 10fde4780019 suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/02_reverse.py Thu Aug 28 21:37:09 2008 -0700 @@ -25,17 +25,25 @@ import sys from XenKvmLib import assoc from XenKvmLib import enumclass +from XenKvmLib.const import default_network_name from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf sup_types=['Xen', 'KVM', 'XenFV', 'LXC'] @do_main(sup_types) def main(): options = main.options status = PASS + + status, dpool_name = create_diskpool_conf(options.ip, options.virt) + if status != PASS: + logger.error("Failed to create diskpool") + return FAIL + keys = ['Name', 'CreationClassName'] try: host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] @@ -46,7 +54,14 @@ assoc_cn = get_typed_class(options.virt, "HostedResourcePool") proc_cn = get_typed_class(options.virt, "ProcessorPool") mem_cn = get_typed_class(options.virt, "MemoryPool") - poollist = { mem_cn : "MemoryPool/0", proc_cn : "ProcessorPool/0"} + net_cn = get_typed_class(options.virt, "NetworkPool") + disk_cn = get_typed_class(options.virt, "DiskPool") + poollist = { + mem_cn : "MemoryPool/0", + proc_cn : "ProcessorPool/0", + net_cn : "NetworkPool/%s" %default_network_name, + disk_cn : "DiskPool/%s" %dpool_name + } for k, v in poollist.items(): try: @@ -64,6 +79,7 @@ status = FAIL if status != PASS: break + cleanup_restore(options.ip, options.virt) return status if __name__ == "__main__": sys.exit(main()) diff -r a9978826a31d -r 10fde4780019 suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Wed Aug 27 01:04:31 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedResourcePool/04_reverse_errs.py Thu Aug 28 21:37:09 2008 -0700 @@ -24,12 +24,14 @@ import sys import pywbem from XenKvmLib import assoc +from XenKvmLib.const import default_network_name from XenKvmLib.common_util import try_assoc from CimTest import Globals from CimTest.Globals import logger from CimTest.ReturnCodes import PASS from CimTest.Globals import do_main from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { @@ -48,14 +50,26 @@ options = main.options status = PASS + status, dpool_name = create_diskpool_conf(options.ip, options.virt) + if status != PASS: + logger.error("Failed to create diskpool") + return FAIL + assoc_classname = get_typed_class(options.virt, "HostedResourcePool") proc_cn = get_typed_class(options.virt, "ProcessorPool") mem_cn = get_typed_class(options.virt, "MemoryPool") + net_cn = get_typed_class(options.virt, "NetworkPool") + disk_cn = get_typed_class(options.virt, "DiskPool") conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) - poollist = {mem_cn : "MemoryPool/0", proc_cn : "ProcessorPool/0"} + poollist = { + mem_cn : "MemoryPool/0", + proc_cn : "ProcessorPool/0", + net_cn : "NetworkPool/%s" %default_network_name, + disk_cn : "DiskPool/%s" %dpool_name + } for k, v in poollist.items(): keys = { "Wrong" : v} ret = try_assoc(conn, k, assoc_classname, keys, "InstanceID", \ @@ -73,6 +87,7 @@ logger.error("------ FAILED: Invalid Name Key Value.------") status = ret + cleanup_restore(options.ip, options.virt) return status if __name__ == "__main__": sys.exit(main())

1 0

[PATCH 0 of 2] Clean up Globals.py
by Kaitlin Rupert 29 Aug '08

29 Aug '08

More cleanup patches related to this change to follow.

2 3

Xen on Pegasus Test Run Summary for Aug 27 2008 with sblim-cmpi-base provider
by Guo Lian Yun 28 Aug '08

28 Aug '08

================================================= Xen on Pegasus Test Run Summary for Aug 27 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: 672 (I update the libvirt-cim to the latest revision of 674 and install, but I don't know why the revision number is still 672) Libvirt-cim changeset: 90ac6766de08 ================================================= FAIL : 29 XFAIL : 0 SKIP : 3 PASS : 103 ----------------- Total : 135 ================================================= FAIL Test Summary: ElementCapabilities - 01_forward.py: FAIL ElementCapabilities - 02_reverse.py: FAIL ElementCapabilities - 05_hostsystem_cap.py: FAIL ElementConforms - 01_forward.py: FAIL ElementConforms - 02_reverse.py: FAIL HostSystem - 01_enum.py: FAIL HostSystem - 02_hostsystem_to_rasd.py: FAIL HostSystem - 03_hs_to_settdefcap.py: FAIL HostSystem - 04_hs_to_EAPF.py: FAIL HostSystem - 05_hs_gi_errs.py: FAIL HostSystem - 06_hs_to_vsms.py: FAIL HostedDependency - 01_forward.py: FAIL HostedDependency - 02_reverse.py: FAIL HostedDependency - 03_enabledstate.py: FAIL HostedDependency - 04_reverse_errs.py: FAIL HostedResourcePool - 01_forward.py: FAIL HostedResourcePool - 02_reverse.py: FAIL HostedResourcePool - 03_forward_errs.py: FAIL HostedService - 01_forward.py: FAIL HostedService - 02_reverse.py: FAIL HostedService - 03_forward_errs.py: FAIL HostedService - 04_reverse_errs.py: FAIL ResourcePoolConfigurationService - 01_enum.py: FAIL ResourcePoolConfigurationService - 02_rcps_gi_errors.py: FAIL VSSD - 02_bootldr.py: FAIL VirtualSystemManagementService - 06_addresource.py: FAIL VirtualSystemManagementService - 08_modifyresource.py: FAIL VirtualSystemSnapshotService - 01_enum.py: FAIL VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: FAIL ================================================= SKIP Test Summary: ComputerSystem - 02_nosystems.py: SKIP LogicalDisk - 02_nodevs.py: SKIP NetworkPort - 03_user_netport.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: FAIL ERROR - Failed to enumerate the class of Xen_HostSystem -------------------------------------------------------------------- ElementCapabilities - 02_reverse.py: FAIL ERROR - Expected 1 host, got 0 -------------------------------------------------------------------- ElementCapabilities - 03_forward_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 04_reverse_errs.py: PASS -------------------------------------------------------------------- ElementCapabilities - 05_hostsystem_cap.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range -------------------------------------------------------------------- ElementConforms - 01_forward.py: FAIL ERROR - ElementConformsToProfile returned 0 RegisteredProfile objects -------------------------------------------------------------------- ElementConforms - 02_reverse.py: FAIL ERROR - ERROR: Enumerate returned 0 host instances -------------------------------------------------------------------- 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 - Expected 1 Xen_HostSystem instance returned -------------------------------------------------------------------- HostSystem - 02_hostsystem_to_rasd.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range -------------------------------------------------------------------- HostSystem - 03_hs_to_settdefcap.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - Hostname mismatch Xen_HostSystem : elm3b217.beaverton.ibm.com -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range -------------------------------------------------------------------- HostSystem - 05_hs_gi_errs.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range -------------------------------------------------------------------- HostSystem - 06_hs_to_vsms.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - Did not get the expected MigrationService record -------------------------------------------------------------------- HostedDependency - 01_forward.py: FAIL ERROR - Failed to enumerate the class of Hostsystem ERROR - Exception: list index out of range -------------------------------------------------------------------- HostedDependency - 02_reverse.py: FAIL ERROR - list index out of range -------------------------------------------------------------------- HostedDependency - 03_enabledstate.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - Failed to get host info -------------------------------------------------------------------- HostedDependency - 04_reverse_errs.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - --- FAILED: Invalid Name Key Name.--- ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - --- FAILED: Invalid Name Key Value.--- ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - --- FAILED: Invalid CreationClassName Key Name--- ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - --- FAILED: Invalid CreationClassName Key Value--- -------------------------------------------------------------------- HostedResourcePool - 01_forward.py: FAIL ERROR - Failed to enumerate the class of Xen_HostSystem -------------------------------------------------------------------- HostedResourcePool - 02_reverse.py: FAIL ERROR - Failed to enumerate the class of Xen_HostSystem -------------------------------------------------------------------- HostedResourcePool - 03_forward_errs.py: FAIL ERROR - Failed to enumerate the class of Xen_HostSystem -------------------------------------------------------------------- HostedResourcePool - 04_reverse_errs.py: PASS -------------------------------------------------------------------- HostedService - 01_forward.py: FAIL ERROR - UnboundLocalError : local variable 'host_sys' referenced before assignment Traceback (most recent call last): File "/data/users/daisy/cimtest/lib/CimTest/Globals.py", line 133, in do_try rc = f() File "01_forward.py", line 42, in main logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) UnboundLocalError: local variable 'host_sys' referenced before assignment ERROR - None -------------------------------------------------------------------- HostedService - 02_reverse.py: FAIL ERROR - UnboundLocalError : local variable 'host_sys' referenced before assignment Traceback (most recent call last): File "/data/users/daisy/cimtest/lib/CimTest/Globals.py", line 133, in do_try rc = f() File "02_reverse.py", line 42, in main logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.CreationClassName) UnboundLocalError: local variable 'host_sys' referenced before assignment ERROR - None -------------------------------------------------------------------- HostedService - 03_forward_errs.py: FAIL ERROR - UnboundLocalError : local variable 'host_sys' referenced before assignment Traceback (most recent call last): File "/data/users/daisy/cimtest/lib/CimTest/Globals.py", line 133, in do_try rc = f() File "03_forward_errs.py", line 46, in main logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) UnboundLocalError: local variable 'host_sys' referenced before assignment ERROR - None -------------------------------------------------------------------- HostedService - 04_reverse_errs.py: FAIL ERROR - UnboundLocalError : local variable 'host_sys' referenced before assignment Traceback (most recent call last): File "/data/users/daisy/cimtest/lib/CimTest/Globals.py", line 133, in do_try rc = f() File "04_reverse_errs.py", line 46, in main logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) UnboundLocalError: local variable 'host_sys' referenced before assignment ERROR - None -------------------------------------------------------------------- LogicalDisk - 01_disk.py: PASS -------------------------------------------------------------------- LogicalDisk - 02_nodevs.py: SKIP ERROR - System has defined domains; unable to run -------------------------------------------------------------------- LogicalDisk - 03_ld_gi_errs.py: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: FAIL ERROR - Failed to enumerate the class of Xen_HostSystem -------------------------------------------------------------------- ResourcePoolConfigurationService - 02_rcps_gi_errors.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range ERROR - Problem getting host information -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: FAIL ERROR - NameError : global name 'BaseException' is not defined Traceback (most recent call last): File "/data/users/daisy/cimtest/lib/CimTest/Globals.py", line 133, in do_try rc = f() File "02_bootldr.py", line 72, in main except BaseException, detail : NameError: global name 'BaseException' is not defined ERROR - None CIM_ERR_NOT_FOUND: No such instance (dom) -------------------------------------------------------------------- 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: FAIL ERROR - Error invoking AddRS: add_disk_res ERROR - (1, u"CIM_ERR_FAILED: Unknown system `rstest_domain'") InvokeMethod(AddResourceSettings): CIM_ERR_FAILED: Unknown system `rstest_domain' -------------------------------------------------------------------- VirtualSystemManagementService - 07_addresource_neg.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 08_modifyresource.py: FAIL ERROR - Error invoking ModifyRS: mod_vcpu_res ERROR - (1, u"CIM_ERR_FAILED: Unknown system `rstest_domain'") InvokeMethod(ModifyResourceSettings): CIM_ERR_FAILED: Unknown system `rstest_domain' -------------------------------------------------------------------- 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: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range -------------------------------------------------------------------- VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: FAIL ERROR - Failed to enumerate the class of HostSystem ERROR - Exception: list index out of range -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS -------------------------------------------------------------------- VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS --------------------------------------------------------------------

3 2