[PATCH 00 of 10] [TEST] Association parameter changes.
This patchset contains changes to around 27 test cases for Association parameter changes. The changes have been tested with Xen, XenFV( with current sources on RHEL5.2) and with KVM (currents sources, F9). Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com>
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223019106 25200 # Node ID 2705a9d336f7b6285cc4c7500002c8efcd1c53ba # Parent 0f1b710a1eb30ca3721930575b59db37a924c6f0 [TEST] Updating 02_reverse.py of EAFP for Association parameter changes . Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 0f1b710a1eb3 -r 2705a9d336f7 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Fri Oct 03 00:30:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Fri Oct 03 00:31:46 2008 -0700 @@ -137,7 +137,7 @@ def verify_eafp_values(server, virt, in_ an = get_typed_class(virt, "ElementAllocatedFromPool") for cn, instid in sorted(in_pllist.iteritems()): try: - assoc_info = Associators(server, an, cn, virt, InstanceID = instid) + assoc_info = Associators(server, an, cn, InstanceID = instid) assoc_inst_list = get_inst_for_dom(assoc_info) if len(assoc_inst_list) < 1 : logger.error("'%s' with '%s' did not return any records for"
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223019216 25200 # Node ID 01ae33b1d27a009ef0401cd55797825ff7771a72 # Parent 2705a9d336f7b6285cc4c7500002c8efcd1c53ba [TEST] Updating ElementCapabilities 05_hostsystem_cap.py tc for Association parameter changes . Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 2705a9d336f7 -r 01ae33b1d27a suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Oct 03 00:31:46 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/05_hostsystem_cap.py Fri Oct 03 00:33:36 2008 -0700 @@ -88,7 +88,6 @@ def get_assoc_info(server, cn, an, qcn, assoc_info = AssociatorNames(server, an, cn, - virt, CreationClassName = cn, Name = name,) if len(assoc_info) < 1: @@ -112,7 +111,6 @@ def get_association_info(server, service assoc_info = AssociatorNames(server, an, cn, - virt, CreationClassName = cn, Name = name, SystemCreationClassName=sccname,
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223019788 25200 # Node ID fb25a0a695a9389ee4608d1b61a9c39b2f84644c # Parent 01ae33b1d27a009ef0401cd55797825ff7771a72 [TEST] Updating ElementConforms 02_reverse.py tc for Association parameter changes Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 01ae33b1d27a -r fb25a0a695a9 suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Oct 03 00:33:36 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/02_reverse.py Fri Oct 03 00:43:08 2008 -0700 @@ -143,10 +143,10 @@ def main(): for item in inst_list: cn = item.CreationClassName name = item.Name + an = get_typed_class(options.virt, "ElementConformsToProfile") profs = assoc.Associators(options.ip, - "ElementConformsToProfile", + an, cn, - options.virt, CreationClassName=cn, Name=name) if len(profs) != 1:
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223022789 25200 # Node ID fae408bcf9a3cac00a84499ea01b9606ca51defa # Parent fb25a0a695a9389ee4608d1b61a9c39b2f84644c [TEST] Fixed and updating ElementSettingData tc for Association parameter changes 1) Fixed the log stmt of 01_forward.py tc and updated it for Association parameter changes 2) updated 03_esd_assoc_with_rasd_errs.py for Association parameter changes Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r fb25a0a695a9 -r fae408bcf9a3 suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Fri Oct 03 00:43:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/01_forward.py Fri Oct 03 01:33:09 2008 -0700 @@ -83,21 +83,22 @@ def get_inst(ip, virt, cn, key): def test_assoc(host, acn, cn, virt, inst): id = inst.InstanceID - + acn = get_typed_class(virt, acn) + cn = get_typed_class(virt, cn) try: - ret_inst = Associators(host, acn, cn, virt, InstanceID=id) + ret_inst = Associators(host, acn, cn, InstanceID=id) except Exception: logger.error(CIM_ERROR_ASSOCIATORS, acn) return FAIL if len(ret_inst) != 1: - logger.error("%s returned %i %s instances" % (an, len(ret_inst), cn)) + logger.error("%s returned %i %s instances", acn, len(ret_inst), cn) return FAIL ret_id = ret_inst[0]['InstanceID'] if ret_id != id: - logger.error("%s returned %s inst with wrong id %s" % (acn, cn, ret_id)) + logger.error("%s returned %s inst with wrong id %s", acn, cn, ret_id) return FAIL status = compare_all_prop(ret_inst[0], inst) diff -r fb25a0a695a9 -r fae408bcf9a3 suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py --- a/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Fri Oct 03 00:43:08 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementSettingData/03_esd_assoc_with_rasd_errs.py Fri Oct 03 01:33:09 2008 -0700 @@ -94,11 +94,12 @@ def main(): if options.virt == "XenFV": options.virt = "Xen" try: + an = get_typed_class(options.virt, vssdc_cn) + cn = get_typed_class(options.virt, vssd_cn) instid = '%s:%s' % (options.virt, test_dom) - rasd_list = assoc.Associators(options.ip, vssdc_cn, vssd_cn, - options.virt, InstanceID=instid) + rasd_list = assoc.Associators(options.ip, an, cn, InstanceID=instid) except Exception: - logger.error(CIM_ERROR_ASSOCIATORS, vssdc_cn) + logger.error(CIM_ERROR_ASSOCIATORS, an) cxml.destroy(options.ip) cxml.undefine(options.ip) return FAIL
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223024080 25200 # Node ID c005ad2d0cd20f21ea75ec35b0476a9ea98a36ce # Parent fae408bcf9a3cac00a84499ea01b9606ca51defa [TEST] Updating HS tc's for Association parameter changes Updated 02_hostsystem_to_rasd.py, 03_hs_to_settdefcap.py, 04_hs_to_EAPF.py, 06_hs_to_vsms.py for Association parameter changes. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py --- a/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Oct 03 01:33:09 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/02_hostsystem_to_rasd.py Fri Oct 03 01:54:40 2008 -0700 @@ -119,7 +119,6 @@ def get_assoc_info(server, cn, an, qcn, assoc_info = AssociatorNames(server, an, cn, - virt, CreationClassName = cn, Name = name) if len(assoc_info) < 1: @@ -157,7 +156,6 @@ def verify_RASD_values(server, sd_assoc_ assoc_info = Associators(server, an, cn, - virt, DeviceID = devid, CreationClassName = cn, SystemName = test_dom, diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py --- a/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Oct 03 01:33:09 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/03_hs_to_settdefcap.py Fri Oct 03 01:54:40 2008 -0700 @@ -128,7 +128,6 @@ def get_hostrespool(server, hostsys, cls assoc_info = Associators(server, an1, ccn1, - virt, CreationClassName = clsname, Name = hostsys) if len(assoc_info) < 4: @@ -167,10 +166,9 @@ def get_alloccap(server, devpool, virt=" for inst in devpool: try: assoc_info = Associators(server, - an, - inst.classname, - virt, - InstanceID = inst['InstanceID']) + an, + inst.classname, + InstanceID = inst['InstanceID']) if len(assoc_info) < 1: logger.error("ElementCapabilities has returned %i objects", len(assoc_info)) @@ -221,7 +219,6 @@ def get_rasddetails(server, alloccap, vi assoc_info = Associators(server, an, ccn, - virt, InstanceID = ap['InstanceID']) if len(assoc_info) != 4: diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py --- a/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Fri Oct 03 01:33:09 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/04_hs_to_EAPF.py Fri Oct 03 01:54:40 2008 -0700 @@ -154,7 +154,6 @@ def get_assocname_info(server, cn, an, q assoc_info = AssociatorNames(server, an, cn, - virt, CreationClassName=cn, Name = hostname) if len(assoc_info) < 1: @@ -184,7 +183,7 @@ def verify_eafp_values(server, in_pllist for cn, instid in sorted(in_pllist.items()): qcn = cn try: - assoc_info = Associators(server, an, cn, virt, InstanceID = instid) + assoc_info = Associators(server, an, cn, InstanceID = instid) inst_list = get_inst_for_dom(assoc_info) status = check_len(an, inst_list, qcn, exp_len) if status != PASS: diff -r fae408bcf9a3 -r c005ad2d0cd2 suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py --- a/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Fri Oct 03 01:33:09 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostSystem/06_hs_to_vsms.py Fri Oct 03 01:54:40 2008 -0700 @@ -85,9 +85,11 @@ def get_assocnames_info(server, cn, an, status = PASS assoc_info = [] try: - assoc_info = AssociatorNames(server, an, cn, virt, Name = name, CreationClassName = cn) + assoc_info = AssociatorNames(server, an, cn, Name = name, + CreationClassName = cn) if len(assoc_info) < 0 : - logger.error("%s returned %i %s objects, expected atleast 3", an, len(assoc_info), qcn) + logger.error("%s returned %i %s objects, expected atleast 3", + an, len(assoc_info), qcn) status = FAIL except Exception, detail: print_err(CIM_ERROR_ASSOCIATORNAMES, detail, an) @@ -120,8 +122,10 @@ def get_vsmcap_from_ec(vsms_list): sccn = vsms_info['SystemCreationClassName'] assoc_info = [] try: - assoc_info = AssociatorNames(server, assoc_name, cn, virt, CreationClassName = cn, - SystemName = sn, Name = name, SystemCreationClassName = sccn) + assoc_info = AssociatorNames(server, assoc_name, cn, + CreationClassName = cn, + SystemName = sn, Name = name, + SystemCreationClassName = sccn) if len(assoc_info) != 1: logger.error("%s returned %i %s objects, expected only 1", assoc_name, len(assoc_info), req_cn) status = FAIL @@ -139,10 +143,11 @@ def get_vsmsd_from_sdc(vsmsd_list): instid = vsmsd_info['InstanceID'] assoc_info = [] try: - assoc_info = Associators(server, assoc_name, cn, virt, CreationClassName = cn, - InstanceID = instid) + assoc_info = Associators(server, assoc_name, cn, + CreationClassName = cn, InstanceID = instid) if len(assoc_info) != 1: - logger.error("%s returned %i %s objects, expected only 1", assoc_name, len(assoc_info), req_cn) + logger.error("%s returned %i %s objects, expected only 1", + assoc_name, len(assoc_info), req_cn) status = FAIL except Exception, detail:
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223027430 25200 # Node ID f3b93c41440495aca1d37f6a135ebe0644a3a574 # Parent c005ad2d0cd20f21ea75ec35b0476a9ea98a36ce [TEST] Fixing and Updating HostedDependency and HostedService tc for Association parameter changes 1) Upated HostedDependency - 01_forward.py for Association parameter changes. 2) Fixed HostedService - 01_forward.py to include the ConsoleRedirectionService. Included get_host_info() to get the host information. Included check to verify if the service and the list used for the verification is the same. Updated it for Association parameter changes. 333) Fixed HostedService - 02_reverse.py log stmt Included get_host_info() to get the host information. Updated it for Association parameter changes. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r c005ad2d0cd2 -r f3b93c414404 suites/libvirt-cim/cimtest/HostedDependency/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Fri Oct 03 01:54:40 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedDependency/01_forward.py Fri Oct 03 02:50:30 2008 -0700 @@ -49,7 +49,7 @@ from XenKvmLib import vxml from XenKvmLib import vxml from XenKvmLib import assoc from XenKvmLib import enumclass -from XenKvmLib.classes import get_class_basename +from XenKvmLib.classes import get_typed_class from CimTest.Globals import CIM_ERROR_ENUMERATE, CIM_ERROR_ASSOCIATORS, logger from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -92,12 +92,12 @@ def main(): cxml.undefine(server) return FAIL - hs_cn = "HostedDependency" + hs_cn = get_typed_class(virt, "HostedDependency") try: for system in cs: - ccn = get_class_basename(system.CreationClassName) - hs = assoc.Associators(server, hs_cn, ccn, virt, - CreationClassName=system.CreationClassName, + ccn = system.CreationClassName + hs = assoc.Associators(server, hs_cn, ccn, + CreationClassName=ccn, Name=system.name) if not hs: diff -r c005ad2d0cd2 -r f3b93c414404 suites/libvirt-cim/cimtest/HostedService/01_forward.py --- a/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri Oct 03 01:54:40 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/01_forward.py Fri Oct 03 02:50:30 2008 -0700 @@ -30,40 +30,52 @@ from XenKvmLib.const import do_main from XenKvmLib.const import do_main from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL +from XenKvmLib.common_util import get_host_info sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @do_main(sup_types) def main(): options = main.options - keys = ['Name', 'CreationClassName'] + virt = options.virt try: - host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] - except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.name) - return FAIL - try: + status, host_name, host_ccn = get_host_info(options.ip, virt) + if status != PASS: + logger.error("Failed to get host info.") + return status + + an = get_typed_class(virt, "HostedService") service = assoc.AssociatorNames(options.ip, - "HostedService", - "HostSystem", - options.virt, - CreationClassName = host_sys.CreationClassName, - Name = host_sys.Name) - except Exception: - logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % host_sys.Name) + an, host_ccn, + CreationClassName = host_ccn, + Name = host_name) + except Exception, deatils: + logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % host_name) + logger.error("Exception: details %s", details) return FAIL if service == None: logger.error("No association return") return FAIL - valid_services = [get_typed_class(options.virt, "ResourcePoolConfigurationService"), - get_typed_class(options.virt, "VirtualSystemManagementService"), - get_typed_class(options.virt, "VirtualSystemMigrationService")] + valid_services = [get_typed_class(virt, "ResourcePoolConfigurationService"), + get_typed_class(virt, "VirtualSystemManagementService"), + get_typed_class(virt, "VirtualSystemMigrationService"), + get_typed_class(virt, "ConsoleRedirectionService")] + + ccn_list = [] for item in service: - ccn = item.keybindings["CreationClassName"] + ccn_list.append(item.keybindings["CreationClassName"]) + + if len(ccn_list) != len(valid_services): + logger.error("'%s' returned %d, expected %d", + an, len(valid_services), len(ccn_list)) + return FAIL + + for ccn in ccn_list: if ccn not in valid_services: - logger.error("HostedService association to associate HostSystem and %s is wrong " % ccn) + logger.error("Invalid Value '%s' returned for association '%s'", + ccn, an) return FAIL diff -r c005ad2d0cd2 -r f3b93c414404 suites/libvirt-cim/cimtest/HostedService/02_reverse.py --- a/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri Oct 03 01:54:40 2008 -0700 +++ b/suites/libvirt-cim/cimtest/HostedService/02_reverse.py Fri Oct 03 02:50:30 2008 -0700 @@ -30,47 +30,49 @@ from XenKvmLib.const import do_main from XenKvmLib.const import do_main from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, XFAIL +from XenKvmLib.common_util import get_host_info sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @do_main(sup_types) def main(): options = main.options - keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(options.ip, 'HostSystem', keys, options.virt)[0] - except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % host_sys.CreationClassName) - return FAIL + virt = options.virt + servicelist = {"ResourcePoolConfigurationService" : "RPCS", "VirtualSystemManagementService" : "Management Service", "VirtualSystemMigrationService" : "MigrationService"} + + status, host_name, host_ccn = get_host_info(options.ip, virt) + if status != PASS: + logger.error("Failed to get host info.") + return status + an = get_typed_class(virt, "HostedService") for k, v in servicelist.iteritems(): + cn = get_typed_class(virt, k) try: - assoc_host = assoc.AssociatorNames(options.ip, - "HostedService", - k, - options.virt, + assoc_host = assoc.AssociatorNames(options.ip, an, cn, Name = v, - CreationClassName = get_typed_class(options.virt, k), - SystemCreationClassName = host_sys.CreationClassName, - SystemName = host_sys.Name) + CreationClassName = cn, + SystemCreationClassName = host_ccn, + SystemName = host_name) except Exception: - logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % item) + logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, an) return FAIL if len(assoc_host) != 1: - logger.error("Too many hosts error") + logger.error("Too many hosts") return FAIL ccn = assoc_host[0].keybindings['CreationClassName'] name = assoc_host[0].keybindings['Name'] - if ccn != get_typed_class(options.virt, "HostSystem"): + if ccn != host_ccn: logger.error("CreationClassName Error") return FAIL - elif name != host_sys.Name: + + elif name != host_name: logger.error("CCN Error") return FAIL
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223027784 25200 # Node ID 84f0b85c6afc80ac8f54dbea8713503e695bdcd1 # Parent f3b93c41440495aca1d37f6a135ebe0644a3a574 [TEST] Updated devices.py for Association parameter changes Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r f3b93c414404 -r 84f0b85c6afc suites/libvirt-cim/lib/XenKvmLib/devices.py --- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Fri Oct 03 02:50:30 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Fri Oct 03 02:56:24 2008 -0700 @@ -137,13 +137,10 @@ def device_of(server, key_list): return t(server, key_list) def get_dom_devs(vs_type, ip, dom_name): - cn = "ComputerSystem" - - devs = assoc.AssociatorNames(ip, "SystemDevice", - cn, - vs_type, - Name=dom_name, - CreationClassName= get_typed_class(vs_type, cn)) + cn = get_typed_class(vs_type, "ComputerSystem") + an = get_typed_class(vs_type, "SystemDevice") + devs = assoc.AssociatorNames(ip, an, cn, Name=dom_name, + CreationClassName= cn) if devs == None: Globals.logger.error("System association failed") return 1
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223029001 25200 # Node ID ea47af48530d8cdfe804deb7367e0e586a2df0d7 # Parent 84f0b85c6afc80ac8f54dbea8713503e695bdcd1 [TEST] Updated RASD, ReferencedProfile, RAFP tc for Association parameter changes Updated the following tc for Association parameter changes RASD/01_verify_rasd_fields.py ReferencedProfile/01_verify_refprof.py ResourceAllocationFromPool/01_forward.py ResourceAllocationFromPool/02_reverse.py Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 84f0b85c6afc -r ea47af48530d suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Fri Oct 03 02:56:24 2008 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Fri Oct 03 03:16:41 2008 -0700 @@ -113,15 +113,17 @@ def assoc_values(assoc_info, xml, disk, @do_main(sup_types) def main(): options = main.options + virt = options.virt status = PASS + destroy_and_undefine_all(options.ip) - if options.virt == 'Xen': + if virt == 'Xen': test_disk = 'xvda' else: test_disk = 'hda' - virt_xml = vxml.get_class(options.virt) - if options.virt == 'LXC': + virt_xml = vxml.get_class(virt) + if virt == 'LXC': cxml = virt_xml(test_dom) else: cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, @@ -133,21 +135,20 @@ def main(): if status == 1: destroy_and_undefine_all(options.ip) return FAIL - if options.virt == "XenFV": + if virt == "XenFV": instIdval = "Xen:%s" % test_dom else: - instIdval = "%s:%s" % (options.virt, test_dom) + instIdval = "%s:%s" % (virt, test_dom) - vssdc_cn = 'VirtualSystemSettingDataComponent' - vssd_cn = 'VirtualSystemSettingData' + vssdc_cn = get_typed_class(virt, 'VirtualSystemSettingDataComponent') + vssd_cn = get_typed_class(virt, 'VirtualSystemSettingData') try: assoc_info = assoc.Associators(options.ip, vssdc_cn, vssd_cn, - options.virt, InstanceID = instIdval) - status = assoc_values(assoc_info, cxml, test_disk, options.virt) + status = assoc_values(assoc_info, cxml, test_disk, virt) except Exception, details: logger.error(Globals.CIM_ERROR_ASSOCIATORS, - get_typed_class(options.virt, vssdc_cn)) + get_typed_class(virt, vssdc_cn)) logger.error("Exception : %s" % details) status = FAIL diff -r 84f0b85c6afc -r ea47af48530d suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py --- a/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py Fri Oct 03 02:56:24 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ReferencedProfile/01_verify_refprof.py Fri Oct 03 03:16:41 2008 -0700 @@ -138,7 +138,7 @@ def get_refprof_verify_info(proflist): for instid in proflist: try: assoc_info = Associators(server, assoc_name, reg_classname, - virt, InstanceID = instid, + InstanceID = instid, CreationClassName = reg_classname) if len(assoc_info) < 1: logger.error("%s returned %i %s objects, expected atleast 1", diff -r 84f0b85c6afc -r ea47af48530d suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Fri Oct 03 02:56:24 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/01_forward.py Fri Oct 03 03:16:41 2008 -0700 @@ -86,10 +86,10 @@ def get_instance(server, pool, list, vir def verify_rasd(server, assoc_cn, cn, virt, list, rasd): try: + assoc_cn = get_typed_class(virt, assoc_cn) data = assoc.AssociatorNames(server, assoc_cn, - cn, - virt, + get_typed_class(virt, cn), InstanceID=list) except Exception: logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % cn) diff -r 84f0b85c6afc -r ea47af48530d suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Fri Oct 03 02:56:24 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Fri Oct 03 03:16:41 2008 -0700 @@ -116,8 +116,9 @@ def verify_pool_from_RAFP(server, virt, def verify_pool_from_RAFP(server, virt, inst, pool_id, cn): pool = [] try: - pool = assoc.AssociatorNames(server, "ResourceAllocationFromPool", - cn, virt, InstanceID = inst.InstanceID) + an = get_typed_class(virt, "ResourceAllocationFromPool") + cn = get_typed_class(virt, cn) + pool = assoc.AssociatorNames(server, an, cn, InstanceID=inst.InstanceID) except Exception: logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID) return FAIL
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223030236 25200 # Node ID 93041fa7f05b5db0ef3aeb9fbcf072c5d427454f # Parent ea47af48530d8cdfe804deb7367e0e586a2df0d7 [TEST] Fixing and updating SettingDefine and SystemDevice tc for Association parameter changes 1) updated 01_forward.py for Association parameter changes 2) updated 02_reverse.py for Association parameter changes Fixed BaseException, included Exception instead 3) updated SystemDevice 01_forward.py for Association parameter changes 4) updated SystemDevice 02_reverse.py for Association parameter changes Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r ea47af48530d -r 93041fa7f05b suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Fri Oct 03 03:16:41 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Fri Oct 03 03:37:16 2008 -0700 @@ -111,9 +111,8 @@ def main(): for cn in logelelst.keys(): try: ccn = get_typed_class(options.virt, cn) - assoc_info = assoc.AssociatorNames(options.ip, - 'SettingsDefineState', - cn, virt=options.virt, + an = get_typed_class(options.virt, 'SettingsDefineState') + assoc_info = assoc.AssociatorNames(options.ip, an, ccn, DeviceID = logelelst[cn], CreationClassName = ccn, SystemName = test_dom, diff -r ea47af48530d -r 93041fa7f05b suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Fri Oct 03 03:16:41 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Fri Oct 03 03:37:16 2008 -0700 @@ -74,10 +74,10 @@ def call_assoc(ip, inst, exp_id, ccn, vi return FAIL try: - associnf = assoc.Associators(ip, 'SettingsDefineState', - ccn, virt, - InstanceID = exp_id) - except BaseException, detail : + an = get_typed_class(virt, 'SettingsDefineState') + ccn = get_typed_class(virt, ccn) + associnf = assoc.Associators(ip, an, ccn, InstanceID = exp_id) + except Exception, detail : logger.error("Exception %s " % detail) logger.error("Error while associating Xen_SettingsDefineState with %s" % ccn) @@ -108,7 +108,7 @@ def VSSDCAssoc(ip, assocn, virt): logger.error("Mistmatching value for VSSDComponent association") break - except BaseException, detail : + except Exception, detail : logger.error("Exception in VSSDCAssoc function: %s" % detail) status = FAIL @@ -142,7 +142,7 @@ def SettingsDefineStateAssoc(ip, associn logger.error("Mistmatching value for SettingsDefineState assoc") break - except BaseException, detail : + except Exception, detail : logger.error("Exception in SettingsDefineStateAssoc function: %s" % detail) status = FAIL @@ -201,12 +201,11 @@ def main(): try: assocn = assoc.AssociatorNames(options.ip, vssdc_cn, vssd_cn, - virt = options.virt, InstanceID = instIdval) status = VSSDCAssoc(options.ip, assocn, options.virt) - except BaseException, detail : + except Exception, detail : logger.error(Globals.CIM_ERROR_ASSOCIATORS, vssdc_cn) logger.error("Exception : %s" % detail) status = FAIL diff -r ea47af48530d -r 93041fa7f05b suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Fri Oct 03 03:16:41 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Fri Oct 03 03:37:16 2008 -0700 @@ -64,7 +64,6 @@ def main(): cs_classname = get_typed_class(options.virt, 'ComputerSystem') devs = assoc.AssociatorNames(options.ip, sd_classname, cs_classname, - virt=options.virt, Name=test_dom, CreationClassName=cs_classname) if devs == None: logger.error("System association failed") diff -r ea47af48530d -r 93041fa7f05b suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py --- a/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Fri Oct 03 03:16:41 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Fri Oct 03 03:37:16 2008 -0700 @@ -33,6 +33,7 @@ from CimTest.Globals import logger from CimTest.Globals import logger from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import get_typed_class sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] @@ -70,12 +71,13 @@ def main(): continue try: - systems = assoc.AssociatorNames(options.ip, - "SystemDevice", items, virt=options.virt, - DeviceID=dev.DeviceID, - CreationClassName=dev.CreationClassName, - SystemName=dev.SystemName, - SystemCreationClassName=dev.SystemCreationClassName) + an = get_typed_class(options.virt, "SystemDevice") + cn = dev.CreationClassName + systems = assoc.AssociatorNames(options.ip, an, cn, + DeviceID=dev.DeviceID, + CreationClassName=cn, + SystemName=dev.SystemName, + SystemCreationClassName=dev.SystemCreationClassName) except Exception, detail: logger.error("Exception: %s" % detail) cxml.destroy(options.ip)
# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1223037335 25200 # Node ID e437224852a71d5123f66c998a15d7893e1528dc # Parent 93041fa7f05b5db0ef3aeb9fbcf072c5d427454f [TEST] Updating VSSD, VSMS, ElementCapabilities, ElementConforms tc for Association parameter changes 1) updated 04_vssd_to_rasd.py for Association parameter changes 2) updated 12_referenced_config.py, 13_refconfig_additional_devs.py for Association parameter changes 3) updated VirtualSystemSettingDataComponent - 01_forward.py, 02_reverse.py for Association parameter changes. 4) updated ElementCapabilities - 01_forward.py for Association parameter changes 5) updated ElementConforms - 01_forward.py for Association parameter changes Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r 93041fa7f05b -r e437224852a7 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Oct 03 03:37:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Fri Oct 03 05:35:35 2008 -0700 @@ -31,6 +31,7 @@ from XenKvmLib.const import do_main from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP from XenKvmLib.enumclass import enumerate +from XenKvmLib.common_util import get_host_info sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] @@ -60,22 +61,21 @@ def main(): options = main.options server = options.ip virt = options.virt - keys = ['Name', 'CreationClassName'] - try: - host_sys = enumclass.enumerate(server, 'HostSystem', keys, virt)[0] - except Exception: - logger.error(CIM_ERROR_ENUMERATE, get_typed_class(virt, 'HostSystem')) - return FAIL + + status, host_name, host_ccn = get_host_info(server, virt) + if status != PASS: + logger.error("Failed to get host info") + return status + try: + an = get_typed_class(virt, "ElementCapabilities") elc = assoc.AssociatorNames(server, - "ElementCapabilities", - "HostSystem", - virt, - Name = host_sys.Name, - CreationClassName = host_sys.CreationClassName) + an, host_ccn, + Name = host_name, + CreationClassName = host_ccn) except Exception: - logger.error(CIM_ERROR_ASSOCIATORNAMES % host_sys.Name) + logger.error(CIM_ERROR_ASSOCIATORNAMES, an) return FAIL @@ -107,10 +107,7 @@ def main(): for system in cs: try: elec = assoc.AssociatorNames(server, - "ElementCapabilities", - "ComputerSystem", - virt, - Name = system, + an, ccn, Name = system, CreationClassName = ccn) except Exception: logger.error(CIM_ERROR_ASSOCIATORNAMES % system) diff -r 93041fa7f05b -r e437224852a7 suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri Oct 03 03:37:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri Oct 03 05:35:35 2008 -0700 @@ -160,8 +160,8 @@ def get_proflist(server, reg_classname, def verify_ectp_assoc(server, virt): - reg_classname = "RegisteredProfile" - an = "ElementConformsToProfile" + reg_classname = get_typed_class(virt, "RegisteredProfile") + an = get_typed_class(virt,"ElementConformsToProfile") status, inst_lst = get_proflist(server, reg_classname, virt) if status != PASS: @@ -174,7 +174,6 @@ def verify_ectp_assoc(server, virt): assoc_info = assoc.Associators(server, an, reg_classname, - virt, InstanceID = devid) if len(assoc_info) < 1: status = FAIL diff -r 93041fa7f05b -r e437224852a7 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Fri Oct 03 03:37:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Fri Oct 03 05:35:35 2008 -0700 @@ -145,12 +145,14 @@ def get_rasd_values_from_vssdc_assoc(vss qcn = vssd_values[0].classname assoc_cname = get_typed_class(virt, 'VirtualSystemSettingDataComponent') try: - vssdc_assoc_info = assoc.Associators(server, assoc_cname, qcn, virt, InstanceID = instIdval) + vssdc_assoc_info = assoc.Associators(server, assoc_cname, qcn, + InstanceID = instIdval) if len(vssdc_assoc_info) == 1 and \ vssdc_assoc_info[0].classname == 'LXC_MemResourceAllocationSettingData': logger.info("%s returned expect objects" % assoc_cname) elif len(vssdc_assoc_info) < 4: - logger.error("%s returned %i %s objects, expected 4" % (assoc_cname, len(vssdc_assoc_info), qcn)) + logger.error("%s returned %i %s objects, expected 4", + assoc_cname, len(vssdc_assoc_info), qcn) status = FAIL except Exception, details: diff -r 93041fa7f05b -r e437224852a7 suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py Fri Oct 03 03:37:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/12_referenced_config.py Fri Oct 03 05:35:35 2008 -0700 @@ -69,8 +69,8 @@ def get_vssd_ref(ip, virt): cn = "ComputerSystem" ccn = get_typed_class(virt, cn) - vssd = AssociatorNames(ip, 'SettingsDefineState', cn, virt=virt, - Name = test_dom, CreationClassName = ccn) + an = get_typed_class(virt, 'SettingsDefineState') + vssd = AssociatorNames(ip, an, ccn, Name = test_dom, CreationClassName = ccn) if len(vssd) != 1: logger.error("Returned %i vssd insts for '%s'", len(vssd), test_dom) diff -r 93041fa7f05b -r e437224852a7 suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py Fri Oct 03 03:37:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/13_refconfig_additional_devs.py Fri Oct 03 05:35:35 2008 -0700 @@ -48,8 +48,8 @@ def get_vssd_ref(ip, virt): cn = "ComputerSystem" ccn = get_typed_class(virt, cn) - vssd = AssociatorNames(ip, 'SettingsDefineState', cn, virt=virt, - Name = test_dom, CreationClassName = ccn) + an = get_typed_class(virt, 'SettingsDefineState') + vssd = AssociatorNames(ip, an, ccn, Name = test_dom, CreationClassName = ccn) if len(vssd) != 1: logger.error("Returned %i vssd insts for '%s'", len(vssd), test_dom) diff -r 93041fa7f05b -r e437224852a7 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Fri Oct 03 03:37:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Fri Oct 03 05:35:35 2008 -0700 @@ -166,8 +166,9 @@ def main(): # Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist an = get_typed_class(options.virt, 'VirtualSystemSettingDataComponent') for rasd_cname, prop in prop_list.iteritems(): + logger.error("DEBUG rasd_cname is %s", rasd_cname) assoc_info = assoc.Associators(options.ip, an, rasd_cname, - options.virt, InstanceID = prop) + InstanceID = prop) # Verify the association fields returned for particular rasd_cname. status = assoc_values(options.ip, assoc_info, rasd_cname, an, vssd) diff -r 93041fa7f05b -r e437224852a7 suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Fri Oct 03 03:37:16 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/02_reverse.py Fri Oct 03 05:35:35 2008 -0700 @@ -156,10 +156,9 @@ def main(): instIdval = "%s:%s" % (options.virt, test_dom) try: - assoc_info = assoc.AssociatorNames(options.ip, - 'VirtualSystemSettingDataComponent', - 'VirtualSystemSettingData', - options.virt, + an = get_typed_class(options.virt, 'VirtualSystemSettingDataComponent') + cn = get_typed_class(options.virt, 'VirtualSystemSettingData') + assoc_info = assoc.AssociatorNames(options.ip, an, cn, InstanceID = instIdval) status = assoc_values(options.ip, assoc_info, options.virt) except Exception, detail :
participants (1)
-
Deepti B. Kalakeri