[Libvirt-cim] [PATCH] [TEST] Modify RPCC.01 and VSMSD.01 to call new EnumInstances

[yunguol at cn.ibm.com]

# HG changeset patch
# User Guolian Yun <yunguol at cn.ibm.com>
# Date 1224123791 25200
# Node ID 1ea2c899795ca1f259b09c1f6813d728f074b56a
# Parent  96d45b1dcc0801ade819413abe1af43b3957dde4
[TEST] Modify RPCC.01 and VSMSD.01 to call new EnumInstances

Signed-off-by: Guolian Yun <yunguol at cn.ibm.com>

diff -r 96d45b1dcc08 -r 1ea2c899795c suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py
--- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py	Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/01_enum.py	Wed Oct 15 19:23:11 2008 -0700
@@ -23,6 +23,7 @@
 
 import sys
 from XenKvmLib import enumclass
+from XenKvmLib.classes import get_typed_class
 from CimTest import Globals
 from XenKvmLib.const import do_main
 from CimTest.ReturnCodes import PASS, FAIL
@@ -32,15 +33,11 @@ sup_types = ['Xen', 'XenFV', 'KVM', 'LXC
 @do_main(sup_types)
 def main():
     options = main.options
-
-    key_list = ["InstanceID"]
+    cn = get_typed_class(options.virt, "ResourcePoolConfigurationCapabilities")
     try:
-        rpcc = enumclass.enumerate(options.ip,
-                                   "ResourcePoolConfigurationCapabilities",
-                                   key_list,
-                                   options.virt)
+        rpcc = enumclass.EnumInstances(options.ip, cn)
     except Exception:
-        Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, '%s_ResourcePoolConfigurationCapabilities' % options.virt)
+        Globals.logger.error(Globals.CIM_ERROR_ENUMERATE, cn)
         return FAIL
      
     if len(rpcc) != 1:
diff -r 96d45b1dcc08 -r 1ea2c899795c suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py	Wed Oct 15 06:07:28 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationSettingData/01_enum.py	Wed Oct 15 19:23:11 2008 -0700
@@ -45,9 +45,7 @@ def main():
     priority = 0 
 
     try:
-        vsmsd = enumclass.enumerate_inst(options.ip,
-                                         "VirtualSystemMigrationSettingData",
-                                         options.virt)
+        vsmsd = enumclass.EnumNames(options.ip, cn)
     except Exception, detail:
         logger.error(CIM_ERROR_ENUMERATE, cn)
         logger.error("Exception: %s", detail)