# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1224136138 25200 # Node ID 58b1362db013915df27d5ce378a3150abef64cd0 # Parent 96d45b1dcc0801ade819413abe1af43b3957dde4 [TEST]#2 Update VSSD.04 to call new EnumNames Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r 96d45b1dcc08 -r 58b1362db013 suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Wed Oct 15 06:07:28 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Wed Oct 15 22:48:58 2008 -0700 @@ -104,7 +104,8 @@ def get_inst_from_list(classname, vssd_l # We expect only one record to be returned. if len(inst) != 1: - logger.error("%s returned %i %s objects, expected only 1" % (classname, len(inst), 'VSSD')) + logger.error("%s returned %i %s objects, expected only 1"\ + % (classname, len(inst), 'VSSD')) status = FAIL if status != PASS: @@ -117,9 +118,10 @@ def get_vssd_info(): status = PASS try: classname = get_typed_class(virt, 'VirtualSystemSettingData') - vssd = enumclass.enumerate_inst(server, eval('enumclass.' + classname), virt) + vssd = enumclass.EnumNames(server, classname) if len(vssd) < 1 : - logger.error("%s returned %i %s objects, expected atleast 1" % (classname, len(vssd), 'VSSD')) + logger.error("%s returned %i %s objects, expected atleast 1" \ + % (classname, len(vssd), 'VSSD')) status = FAIL except Exception, detail: