# HG changeset patch # User Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> # Date 1211376912 25200 # Node ID 9b9ca7b60c72f3efb3262dda68bfd327f8ed44bb # Parent f8e46a162b44e421f2638035aa98f8861f846455 [TEST] Fixing 01_forward.py tc of SettingsDefine. Signed-off-by: Deepti B. Kalakeri <deeptik@linux.vnet.ibm.com> diff -r f8e46a162b44 -r 9b9ca7b60c72 suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Wed May 21 05:34:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Wed May 21 06:35:12 2008 -0700 @@ -32,6 +32,7 @@ from XenKvmLib import assoc from XenKvmLib import assoc from XenKvmLib import devices from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import CIM_REV from CimTest import Globals from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -41,6 +42,7 @@ test_dom = "domu1" test_dom = "domu1" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 +proc_instid_rev = 590 def print_error(cn, detail): @@ -83,12 +85,18 @@ def main(): 'NetworkPort' : test_mac, 'Processor' : test_vcpus -1 } + devlist = {} logelelst = {} exp_inst_id_val = {} for cn in cn_id.keys(): key_list = get_keys(cn, cn_id[cn], 'ComputerSystem', options.virt) - exp_inst_id_val[cn] = key_list['DeviceID'] + + if CIM_REV >= proc_instid_rev and cn == 'Processor': + exp_inst_id_val[cn] = "%s/%s" % (test_dom, "proc") + else: + exp_inst_id_val[cn] = key_list['DeviceID'] + try: dev_class = devices.get_class(get_typed_class(options.virt, cn)) devlist[cn] = dev_class(options.ip, key_list) @@ -98,7 +106,6 @@ def main(): cxml.destroy(options.ip) cxml.undefine(options.ip) return FAIL - sccn = get_typed_class(options.virt, 'ComputerSystem') for cn in logelelst.keys(): try: