- CIM - libvirt List Archives

Re: [Libvirt-cim] Test report on KVM]
by Guo Lian Yun 08 Apr '08

08 Apr '08

> > > -------- Original Message -------- > > Subject: > > Re: [Libvirt-cim] Test report on KVM > > Date: > > Mon, 07 Apr 2008 16:35:41 -0700 > > From: > > Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> > > Reply-To: > > List for discussion and development of libvirt CIM <libvirt-cim(a)redhat.com> > > To: > > List for discussion and development of libvirt CIM <libvirt-cim(a)redhat.com> > > References: > > <OFAD9AADA1.133E354C-ON48257424.002E03B9-48257424.002FEC58(a)cn.ibm.com> > > > Dan, I see basically the same results you see. Except I see log entries > for the failing tests. > > This is on a system with the following: > > F8 > xen-3.1.0-13.fc8 > libvirt-0.4.1-3.fc9 > > I did a clone of the cimtest tree and the provider tree. I also have a > KVM guest defined. > > > > > ElementCapabilities - 01_forward.py: FAIL > > > > CIM_ERR_NOT_FOUND: The requested object could not be found: "No > > > such instance (CreationClassName)" > > It passed during my test. > > This failed for me. There's definitely a test case problem. The > offending code: > > elec = assoc.AssociatorNames(options.ip, > "ElementCapabilities", > "ComputerSystem", > options.virt, > Name = system, > CreationClassName = > "Xen_ComputerSystem") > > The CreationClassName shouldn't be hardcoded to Xen_ComputerSystem. Good catch, I fix it today. > > > > > > > ElementCapabilities - 05_hostsystem_cap.py: FAIL > > > > CIM_ERR_NOT_FOUND: The requested object could not be found: "No > > > such instance" > > > > > It fails because of missing argument, I fixed it already. > > This test passes for me. It looks like Daisy's fix for this went into > the tree sometime earlier today. Yup, fixed yesterady and Dan applied it already. > > > > > > > > ElementConforms - 01_forward.py: FAIL > > > > ElementConforms - 02_reverse.py: FAIL > > > > > > The log: > > > > > > > ====01_forward.py Log==== > > > > 1. Property values for CIM:DSP1057-VirtualSystem-1.0.0a and domain > > > Domain-0 is > > > > EnabState = 2 EnabDefault = 2 ReqSt = 12 > > > > 2. Values for CIM:DSP1042-SystemVirtualization-1.0.0 and host > > > guaranine.danplanet.com is > > > > EnabState = 5 EnabDefault = 2 ReqSt = 12 > > > > ====02_reverse.py Log==== > > > > > > The lack of a log for 02 is troubling. > > I get a log here. I see: > > Mon, 24 Mar 2008 14:51:57:TEST LOG:INFO - ====02_reverse.py Log==== > Mon, 24 Mar 2008 14:51:59:TEST LOG:ERROR - Failed to get > associators information for RegisteredProfile > Mon, 24 Mar 2008 14:51:59:TEST LOG:ERROR - Exception: > u'KVM_ComputerSystem' > > It is troubling that you didn't see any log output during your run. Fix them today. > > > > > > > > HostSystem - 02_hostsystem_to_rasd.py: FAIL > > > > Traceback (most recent call last): > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit > > > > msg = self.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format > > > > return fmt.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format > > > > record.message = record.getMessage() > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 288, in > > getMessage > > > > msg = msg % self.args > > > > TypeError: not enough arguments for format string > > > > > Also passed during my test. > > This fails for me. In addition to the python errors, I see the > following in the log: > > ERROR:TEST LOG:AllocationUnits Mismatch > ERROR:TEST LOG:Mistmatching association values > > I think there's a few testcase issues here: > > 1) In XenKvmLib/rasd.py: > > Globals.logger.error("Returned %s instead of %s or %s", \ > assoc_info['AllocationUnits'], > memrasd_list['AllocationUnits']) > > The string takes 3 arguments, but only 2 are given. The third argument > should be removed. > > 2) I think HostSystem - 02_hostsystem_to_rasd.py needs to be updated to > reflect the recent provider change. The provider returns KiloBytes as > the unit, but the test is expecting MegaBytes. > > > > > > Looks like a testcase error. > > > > > > > RASD - 01_verify_rasd_fields.py: FAIL > > > > > > No log for this one either. > > I see the following in the log: > > TEST LOG:ERROR - Define or start domain failed > > > > > > > > RASD - 02_enum.py: FAIL > > > > Traceback (most recent call last): > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit > > > > msg = self.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format > > > > return fmt.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format > > > > record.message = record.getMessage() > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 288, in > > getMessage > > > > msg = msg % self.args > > > > TypeError: not enough arguments for format string > > > > > > Same as above. > > Also passed during my running test. > > This failed for me. > > > > > > > > SettingsDefine - 01_forward.py: FAIL > > > > SettingsDefine - 02_reverse.py: FAIL > > > > SettingsDefine - 03_sds_fwd_errs.py: FAIL > > > > > > No log. > > I got log messages for these 3 tests. > > > > > > > > SystemDevice - 01_forward.py: FAIL > > > > > > Log: > > > > > > > ====01_forward.py Log==== > > > > Examined test_domain/00:11:22:33:44:55 > > > > Examined test_domain/mem > > > > Examined test_domain/xvdb > > > > Examined test_domain/0 > > > > > > > SystemDevice - 03_fwderrs.py: FAIL > > > > Traceback (most recent call last): > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit > > > > msg = self.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format > > > > return fmt.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format > > > > record.message = record.getMessage() > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 288, in > > getMessage > > > > msg = msg % self.args > > > > TypeError: not all arguments converted during string formatting > > > > > > This is repeated a bunch of times, but I've snipped them out. > > > > > > > VSSD - 04_vssd_to_rasd.py: FAIL > > > > Traceback (most recent call last): > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 744, in emit > > > > msg = self.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 630, in format > > > > return fmt.format(record) > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 418, in format > > > > record.message = record.getMessage() > > > > File "/usr/lib64/python2.5/logging/__init__.py", line 288, in > > getMessage > > > > msg = msg % self.args > > > > TypeError: not enough arguments for format string > > > > > > Seems to be a common issue. > > > > > > > VirtualSystemManagementService - 05_destroysystem_neg.py: FAIL > > > > > > Log: > > > > > > > destroy_fail>>nonexistent: Got expected return code 4 > > > > destroy_fail>>nonexistent: Got expected return code 4 > > > > > > > VirtualSystemMigrationSettingData - 01_enum.py: FAIL > > > > > > No log. > > ERROR:TEST LOG:ClassName Mismatch > ERROR:TEST LOG:Returned Xen_VirtualSystemMigrationSettingData instead of > KVM_VirtualSystemMigrationSettingData > The fails because of enumclass call, fix and update to reflect the recent lib changes > > > > > > > VirtualSystemSnapshotServiceCapabilities - 01_enum.py: FAIL > > > > > > No log. > > ERROR:TEST LOG:ClassName Mismatch > ERROR:TEST LOG:Returned Xen_VirtualSystemSnapshotServiceCapabilities > instead of KVM_VirtualSystemSnapshotServiceCapabilities > Same as above, fix also. > -- > Kaitlin Rupert > IBM Linux Technology Center > kaitlin(a)linux.vnet.ibm.com > > _______________________________________________ > Libvirt-cim mailing list > Libvirt-cim(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvirt-cim > > > -- > - Zhengang

2 1

[PATCH] [TEST] Fix domain created error in RASD.01
by Guo Lian Yun 08 Apr '08

08 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1207560373 25200 # Node ID 4578382726b1d2099c9b467a0532052b67af42e9 # Parent bedc7fc28125f9d6cc21f7a6752b479313f070e5 [TEST] Fix domain created error in RASD.01 Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r bedc7fc28125 -r 4578382726b1 suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Fri Apr 04 12:25:02 2008 +0530 +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Mon Apr 07 02:26:13 2008 -0700 @@ -54,11 +54,12 @@ from XenKvmLib.test_doms import destroy_ from XenKvmLib.test_doms import destroy_and_undefine_all import XenKvmLib from XenKvmLib import assoc -from XenKvmLib.vxml import XenXML, KVMXML, get_class +from XenKvmLib import vxml from XenKvmLib.classes import get_typed_class from XenKvmLib.rasd import verify_procrasd_values, verify_netrasd_values, \ verify_diskrasd_values, verify_memrasd_values from CimTest.Globals import log_param, logger +from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'KVM', 'XenFV'] @@ -66,7 +67,6 @@ test_vcpus = 1 test_vcpus = 1 test_mem = 128 test_mac = "00:11:22:33:44:aa" -test_disk = 'xvda' def init_list(virt="Xen"): """ @@ -86,7 +86,7 @@ def init_list(virt="Xen"): "CreationClassName": get_typed_class(virt, 'NetResourceAllocationSettingData') } - address = vsxml.xml_get_disk_source() + address = cxml.xml_get_disk_source() diskrasd = { "InstanceID" : '%s/%s' %(test_dom, test_disk), \ "ResourceType" : 17, \ @@ -133,28 +133,24 @@ def assoc_values(ip, assoc_info, virt="X @do_main(sup_types) def main(): - global vsxml + global cxml options = main.options status = 0 rc = 1 log_param() destroy_and_undefine_all(options.ip) - vsxml = get_class(options.virt)(test_dom, \ - mem=test_mem, \ - vcpus = test_vcpus, \ - mac = test_mac, \ - disk = test_disk) - try: - rc = vsxml.define(options.ip) - sc = vsxml.start(options.ip) - if rc == 0 or sc == 0: - logger.error("Define or start domain failed") - status = 1 - except Exception, details: - logger.error("Unknonw exception happened") - logger.error("Exception : %s" % details) - status = 1 - + global test_disk + if options.virt == 'Xen': + test_disk = 'xvda' + else: + test_disk = 'hda' + + virt_xml = vxml.get_class(options.virt) + cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, mac = test_mac, disk = test_disk) + ret = cxml.define(options.ip) + if not ret: + logger.error('Unable to create domain %s' % test_dom) + return FAIL if status == 1: destroy_and_undefine_all(options.ip) return 1 @@ -177,8 +173,8 @@ def main(): status = 1 try: - vsxml.destroy(options.ip) - vsxml.undefine(options.ip) + cxml.destroy(options.ip) + cxml.undefine(options.ip) except Exception: logger.error("Destroy or undefine domain failed") return status

3 3

[PATCH] [TEST] fix argument to reflect the lib changes
by Guo Lian Yun 08 Apr '08

08 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1207634991 25200 # Node ID e18737bad0e695f010045c5ed44ff36f6fb03ec4 # Parent 851b6729397e782b7ac6fbadee849ee7da9b16d3 [TEST] fix argument to reflect the lib changes Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 851b6729397e -r e18737bad0e6 suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Mon Apr 07 08:27:46 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py Mon Apr 07 23:09:51 2008 -0700 @@ -45,9 +45,8 @@ def main(): try: vsmsd = enumclass.enumerate_inst(options.ip, - eval('enumclass.' + \ - get_typed_class(options.virt, \ - "VirtualSystemMigrationSettingData"))) + "VirtualSystemMigrationSettingData", + options.virt) except Exception, detail: logger.error(CIM_ERROR_ENUMERATE, cn) logger.error("Exception: %s", detail)

1 0

[PATCH] [TEST] fix hardcode in ElementConforms.02 tc
by Guo Lian Yun 08 Apr '08

08 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1207633493 25200 # Node ID 345186013001e3e3290c0a85c3fdffe65d7d02a0 # Parent 851b6729397e782b7ac6fbadee849ee7da9b16d3 [TEST] fix hardcode in ElementConforms.02 tc Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 851b6729397e -r 345186013001 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Mon Apr 07 08:27:46 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Mon Apr 07 22:44:53 2008 -0700 @@ -50,20 +50,21 @@ from XenKvmLib.test_doms import destroy_ from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib import enumclass from XenKvmLib.vxml import XenXML, KVMXML, get_class +from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM'] test_dom = "domgst" -def build_exp_prof_list(proflist): +def build_exp_prof_list(proflist, virt="Xen"): list = {} - + for item in proflist: if item.InstanceID.find('-VirtualSystem-') >= 0: - list['Xen_ComputerSystem'] = item + list[get_typed_class(virt, 'ComputerSystem')] = item elif item.InstanceID.find('-SystemVirtualization-') >= 0: - list['Xen_HostSystem'] = item + list[get_typed_class(virt, 'HostSystem')] = item return list @@ -89,9 +90,9 @@ def main(): virt_xml = get_class(options.virt) cxml = virt_xml(test_dom) - ret = cxml.create(options.ip) + ret = cxml.define(options.ip) if not ret: - logger.error("ERROR: Failed to Create the dom: %s" % test_dom) + logger.error("ERROR: Failed to Define the dom: %s" % test_dom) return status inst_list = [] @@ -145,7 +146,7 @@ def main(): Globals.CIM_NS = prev_namespace - exp_list = build_exp_prof_list(proflist) + exp_list = build_exp_prof_list(proflist, options.virt) # Loop through the assoc results returned on test_dom and hostsystem try: @@ -171,7 +172,6 @@ def main(): logger.error("Exception: %s", detail) status = FAIL - cxml.destroy(options.ip) cxml.undefine(options.ip) return status

1 0

[PATCH] [TEST] fix ElementConforms.01 tc error, define a domain for both Xen and KVM support
by Guo Lian Yun 08 Apr '08

08 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1207630929 25200 # Node ID 5ea1e67b44af3077c3e229f64e5d0ce4969e14d1 # Parent 851b6729397e782b7ac6fbadee849ee7da9b16d3 [TEST] fix ElementConforms.01 tc error, define a domain for both Xen and KVM support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 851b6729397e -r 5ea1e67b44af suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Mon Apr 07 08:27:46 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Mon Apr 07 22:02:09 2008 -0700 @@ -37,11 +37,13 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.classes import get_typed_class +from XenKvmLib import vxml from CimTest.Globals import log_param, logger, CIM_ERROR_ASSOCIATORS, do_main from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL sup_types = ['Xen', 'XenFV', 'KVM'] +test_dom = "domU" def verify_cs(item, id): if item['EnabledState'] != 2 and \ @@ -83,6 +85,13 @@ def main(): status = PASS destroy_and_undefine_all(options.ip, options.virt) + virt_xml = vxml.get_class(options.virt) + cxml = virt_xml(test_dom) + ret = cxml.define(options.ip) + if not ret: + logger.error('Unable to define domain %s' % test_dom) + return FAIL + prev_namespace = Globals.CIM_NS Globals.CIM_NS = 'root/interop' host = live.hostname(options.ip) @@ -115,8 +124,7 @@ def main(): count = 0 for info in assoc_info: if info['CreationClassName'] == cs : - if options.virt == "Xen" or options.virt == "XenFV": - if info['Name'] == 'Domain-0' : + if info['Name'] == 'domU' : count = count + 1 verify_cs(info, devid) @@ -143,6 +151,7 @@ def main(): logger.error("Exception: %s" % detail) status = FAIL + cxml.undefine(options.ip) Globals.CIM_NS = prev_namespace return status

1 0

[PATCH] [TEST] fix argument error in VirtualSystemSnapshotService.01, update to reflect the recent lib changes
by Guo Lian Yun 07 Apr '08

07 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1207621070 25200 # Node ID 0b6d22b9d4b6d32e129893c96132a5f1a7489ffd # Parent 851b6729397e782b7ac6fbadee849ee7da9b16d3 [TEST] fix argument error in VirtualSystemSnapshotService.01, update to reflect the recent lib changes Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 851b6729397e -r 0b6d22b9d4b6 suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Mon Apr 07 08:27:46 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSnapshotService/01_enum.py Mon Apr 07 19:17:50 2008 -0700 @@ -45,9 +45,8 @@ def main(): return status try: vs_sservice = enumclass.enumerate_inst(options.ip, - eval('enumclass.' + \ - get_typed_class(options.virt, \ - "VirtualSystemSnapshotService"))) + "VirtualSystemSnapshotService", + options.virt) except Exception, detail: logger.error(CIM_ERROR_ENUMERATE, cn) logger.error("Exception: %s", detail)

1 0

[PATCH] [TEST] fix hardcode key in ElementCapabilities.01
by Guo Lian Yun 07 Apr '08

07 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1207620138 25200 # Node ID 2e9e53bc63a24cb1bbadac51d09c7c14832bad38 # Parent 851b6729397e782b7ac6fbadee849ee7da9b16d3 [TEST] fix hardcode key in ElementCapabilities.01 Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 851b6729397e -r 2e9e53bc63a2 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Mon Apr 07 08:27:46 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Mon Apr 07 19:02:18 2008 -0700 @@ -80,7 +80,7 @@ def main(): "ComputerSystem", options.virt, Name = system, - CreationClassName = "Xen_ComputerSystem") + CreationClassName = get_typed_class(options.virt, "ComputerSystem")) except Exception: Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % system) return FAIL

1 0

[PATCH] [TEST] fix missing argument in 05_hostsystem_cap.py
by Guo Lian Yun 07 Apr '08

07 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1207556107 25200 # Node ID 2c5375b6b0e80e41d719aaf152f965480facb294 # Parent bedc7fc28125f9d6cc21f7a6752b479313f070e5 [TEST] fix missing argument in 05_hostsystem_cap.py Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r bedc7fc28125 -r 2c5375b6b0e8 suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Apr 04 12:25:02 2008 +0530 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Mon Apr 07 01:15:07 2008 -0700 @@ -196,7 +196,7 @@ def main(): qcn = 'Service' name = host_name # Get the service available on the host - status, service_assoc_info = get_assoc_info(server, cn, an, qcn, name) + status, service_assoc_info = get_assoc_info(server, cn, an, qcn, name, options.virt) if status != PASS or len(service_assoc_info) == 0: return status @@ -223,7 +223,7 @@ def main(): # Query ElementCapabilities and verify the MigrationCapabilities information. service_fieldname = 'MigrationService' cap_key = 'MigrationCapabilities' - status = verify_cap_fields(server, service_fieldname, cap_key) + status = verify_cap_fields(server, service_fieldname, cap_key, options.virt) if status != PASS: logger.error("MigrationCapabilities Verification failed") return status

1 0

[PATCH] Returning 0 domains is not an error
by Dan Smith 04 Apr '08

04 Apr '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1207239285 25200 # Node ID 589af2d7c4466eea7e75765222835db46772f1ac # Parent 1e1c2cd2ef0bff684df37d5c94d7b66b6189295c Returning 0 domains is not an error Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 1e1c2cd2ef0b -r 589af2d7c446 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Fri Mar 28 13:34:34 2008 -0700 +++ b/src/Virt_ComputerSystem.c Thu Apr 03 09:14:45 2008 -0700 @@ -400,7 +400,7 @@ CMPIStatus enum_domains(const CMPIBroker goto out; count = get_domain_list(conn, &list); - if (count <= 0) { + if (count < 0) { cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, "Failed to get domain list");

2 1

[PATCH] [TEST] Modifying 02_profile_to_elec.py tc to:
by Deepti B. Kalakeri 04 Apr '08

04 Apr '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1207310123 -19800 # Node ID e9825a1d392c5b70d5d58675b240f3a1a70ce102 # Parent ee93a545e27b467ac3cf473ace7ffdfd1930d880 [TEST] Modifying 02_profile_to_elec.py tc to: 1) Use the cim_define() function 2) Fixed the tc. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r ee93a545e27b -r e9825a1d392c suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py --- a/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py Fri Apr 04 15:35:16 2008 +0530 +++ b/suites/libvirt-cim/cimtest/Profile/02_profile_to_elec.py Fri Apr 04 17:25:23 2008 +0530 @@ -38,11 +38,10 @@ # ComputerSystem instance of the guest. import sys -import pywbem from XenKvmLib import enumclass from XenKvmLib.assoc import Associators -from XenKvmLib.common_util import create_using_definesystem -from XenKvmLib.test_doms import undefine_test_domain, destroy_and_undefine_all +from XenKvmLib.vxml import get_class +from XenKvmLib.test_doms import destroy_and_undefine_all from CimTest import Globals from CimTest.Globals import log_param, logger, CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORNAMES from CimTest.Globals import do_main @@ -55,14 +54,15 @@ def setup_env(server): def setup_env(server): rc = -1 status = PASS - + csxml_info = None try: destroy_and_undefine_all(server) - rc = create_using_definesystem(test_dom, server) + virt_xml = get_class(virt) + csxml_info = virt_xml(test_dom) + rc = csxml_info.cim_define(server) - if rc != 0: - logger.error("Unable define domain %s using DefineSystem() %s" \ - % test_dom) + if not rc: + logger.error("Unable define domain %s using DefineSystem() " % test_dom) status = FAIL except Exception, detail: @@ -70,31 +70,31 @@ def setup_env(server): logger.error("Exception: %s", detail) status = FAIL - return status + return status, csxml_info def print_err(err, detail, cn): - logger.error(err % cn) - logger.error("Exception: %s", detail) + logger.error(err % cn) + logger.error("Exception: %s", detail) def get_inst_from_list(server, cn, qcn, list, filter, exp_val): - status = PASS - ret = -1 - inst = None + status = PASS + ret = -1 + inst = None - if len(list) < 1: - logger.error("%s returned %i %s objects" % (qcn, len(list), cn)) - return FAIL, None + if len(list) < 1: + logger.error("%s returned %i %s objects" % (qcn, len(list), cn)) + return FAIL, None - for inst in list: - if inst[filter['key']] == exp_val: - ret = PASS - break; + for inst in list: + if inst[filter['key']] == exp_val: + ret = PASS + break - if ret != PASS: - status = FAIL - logger.error("%s with %s was not returned" % (cn, exp_val)) - - return PASS, inst + if ret != PASS: + status = FAIL + logger.error("%s with %s was not returned" % (cn, exp_val)) + + return PASS, inst def get_profile(server): registeredname = 'Virtual System Profile' @@ -178,32 +178,39 @@ def get_elec(server, cs): @do_main(sup_types) def main(): + global virt + global csxml options = main.options + virt = options.virt + server = options.ip log_param() status = PASS - status = setup_env(options.ip) + status, csxml = setup_env(server) if status != PASS: return status prev_namespace = Globals.CIM_NS Globals.CIM_NS = 'root/interop' - status, prof = get_profile(options.ip) + status, prof = get_profile(server) if status != PASS or prof == None: + csxml.undefine(server) return status - status, cs = get_cs(options.ip, prof) + status, cs = get_cs(server, prof) if status != PASS or cs == None: + csxml.undefine(server) return status Globals.CIM_NS = prev_namespace - status, elec = get_elec(options.ip, cs) + status, elec = get_elec(server, cs) if status != PASS or elec == None: return status + csxml.undefine(server) return status

1 0