# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com&gt; # Date 1223887006 25200 # Node ID 889637339f4dad55b11e7ee153cd4f1ba89eac85 # Parent c7eaf17bd591f313b93ff2b2087cee11b25789e0 [TEST] Modify VSSD.01&04 to call new EnumInstances and EnumNames Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com&gt; diff -r c7eaf17bd591 -r 889637339f4d suites/libvirt-cim/cimtest/VSSD/01_enum.py --- a/suites/libvirt-cim/cimtest/VSSD/01_enum.py Fri Oct 10 03:08:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/01_enum.py Mon Oct 13 01:36:46 2008 -0700 @@ -31,6 +31,7 @@ from XenKvmLib import enumclass from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.vxml import get_class +from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger from XenKvmLib.const import do_main from CimTest.ReturnCodes import PASS, FAIL @@ -53,9 +54,8 @@ try: live_cs = live.domain_list(options.ip, options.virt) - key_list = ["InstanceID"] - syslst = enumclass.enumerate(options.ip, "VirtualSystemSettingData", - key_list, options.virt) + vssd_class = get_typed_class(options.virt, 'VirtualSystemSettingData') + syslst = enumclass.EnumInstances(options.ip, vssd_class) found = 0 for vssd in syslst :

diff -r c7eaf17bd591 -r 889637339f4d suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Fri Oct 10 03:08:12 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Mon Oct 13 01:36:46 2008 -0700 @@ -117,7 +117,7 @@ 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')) status = FAIL

_______________________________________________ Libvirt-cim mailing list Libvirt-cim(a)redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim

libvirt-cim-bounces(a)redhat.com wrote on 2008-10-13 21:46:18: > > > yunguol(a)cn.ibm.com wrote: > > # HG changeset patch > > # User Guolian Yun <yunguol(a)cn.ibm.com&gt; > > # Date 1223887006 25200 > > # Node ID 889637339f4dad55b11e7ee153cd4f1ba89eac85 > > # Parent c7eaf17bd591f313b93ff2b2087cee11b25789e0 > > [TEST] Modify VSSD.01&04 to call new EnumInstances and EnumNames > > > > Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com&gt; > > > > diff -r c7eaf17bd591 -r 889637339f4d suites/libvirt- > cim/cimtest/VSSD/01_enum.py > > --- a/suites/libvirt-cim/cimtest/VSSD/01_enum.py Fri Oct 10 03: > 08:12 2008 -0700 > > +++ b/suites/libvirt-cim/cimtest/VSSD/01_enum.py Mon Oct 13 01: > 36:46 2008 -0700 > > @@ -31,6 +31,7 @@ > > from XenKvmLib import enumclass > > from XenKvmLib.test_doms import destroy_and_undefine_all > > from XenKvmLib.vxml import get_class > > +from XenKvmLib.classes import get_typed_class > > from CimTest.Globals import logger > > from XenKvmLib.const import do_main > > from CimTest.ReturnCodes import PASS, FAIL > > @@ -53,9 +54,8 @@ > > > > try: > > live_cs = live.domain_list(options.ip, options.virt) > > - key_list = ["InstanceID"] > > - syslst = enumclass.enumerate(options.ip, > "VirtualSystemSettingData", > > - key_list, options.virt) > > + vssd_class = get_typed_class(options.virt, > 'VirtualSystemSettingData') > > + syslst = enumclass.EnumInstances(options.ip, vssd_class) > > > > found = 0 > > for vssd in syslst : > > > +1 for above. > > diff -r c7eaf17bd591 -r 889637339f4d suites/libvirt- > cim/cimtest/VSSD/04_vssd_to_rasd.py > > --- a/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Fri Oct > 10 03:08:12 2008 -0700 > > +++ b/suites/libvirt-cim/cimtest/VSSD/04_vssd_to_rasd.py Mon Oct > 13 01:36:46 2008 -0700 > > @@ -117,7 +117,7 @@ > > 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')) > > status = FAIL > > > This fails with sblim-base-provider with the following error: > VSSD - 04_vssd_to_rasd.py: FAIL > ERROR - Xen_VirtualSystemSettingDataComponent returned 3 > Xen_VirtualSystemSettingData objects, expected 4 Good catch. This tc fails for me without modification. All my test are tested without sblim base provider. If it also fails without my updates, would you please add this tc to the sblim-tc-failure-list? Also, do you think it's better to apply it firstly, then follow up patches to fix them with sblim-base provider. Thanks!