# 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