# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1206952946 25200 # Node ID 9a6366dcdb01ebe19dceee945b9f59092e0f495d # Parent 612ccb311e273b091659fe14f0471567abe61d08 [TEST] update ElementConforms.03 for XenFV and KVM support Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 612ccb311e27 -r 9a6366dcdb01 suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri Mar 28 00:03:41 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Mon Mar 31 01:42:26 2008 -0700 @@ -3,6 +3,7 @@ # Copyright 2008 IBM Corp. # # Authors: +# Guolian Yun <yunguol@cn.ibm.com> # Anoop V Chakkalakkal<anoop.vijayan@in.ibm.com> # Guolian Yun <yunguol@cn.ibm.com> # This library is free software; you can redistribute it and/or @@ -55,14 +56,13 @@ from VirtLib import utils from VirtLib import utils from XenKvmLib import assoc from XenKvmLib.common_util import try_assoc +from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL from CimTest import Globals from CimTest.Globals import log_param, logger, CIM_USER, CIM_PASS, do_main -sup_types = ['Xen'] +sup_types = ['Xen', 'XenFV', 'KVM'] -classname = 'Xen_RegisteredProfile' -ac_classname = 'Xen_ElementConformsToProfile' bug = '92642' expr_values = { @@ -72,7 +72,9 @@ expr_values = { 'desc' : 'No such instance' } } -def try_invalid_assoc(name_val, i, field): +def try_invalid_assoc(name_val, i, field, virt='Xen'): + classname = get_typed_class(virt, "RegisteredProfile") + ac_classname = get_typed_class(virt, "ElementConformsToProfile") j = 0 keys = {} temp = name_val[i] @@ -106,7 +108,7 @@ def main(): tc_scen = ['INVALID_InstID_Keyname', 'INVALID_InstID_Keyvalue'] for i in range(len(tc_scen)): - retval = try_invalid_assoc(sv_name_val, i, tc_scen[i]) + retval = try_invalid_assoc(sv_name_val, i, tc_scen[i], options.virt) if retval != PASS: status = retval