# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1224122345 25200
# Node ID 066002ecfb3df8ddb69fd33ce3cadb44433aa7c0
# Parent cfc2c9d1212d80b4ee2ddf37c5e9398b4e349b26
[TEST] Modify ElementCapabilities/01_forward.py to call new EnumInstances
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r cfc2c9d1212d -r 066002ecfb3d
suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Wed Oct 15 05:57:17
2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Wed Oct 15 18:59:05
2008 -0700
@@ -30,7 +30,7 @@ from CimTest.Globals import logger, CIM_
from CimTest.Globals import logger, CIM_ERROR_ASSOCIATORNAMES
from XenKvmLib.const import do_main
from CimTest.ReturnCodes import PASS, FAIL, SKIP, XFAIL_RC
-from XenKvmLib.enumclass import enumerate
+from XenKvmLib.enumclass import EnumInstances
from XenKvmLib.common_util import get_host_info
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
@@ -38,8 +38,8 @@ bug_sblim = "00007"
bug_sblim = "00007"
def append_to_list(server, virt, poolname, valid_elc_id):
- keys_list = ['InstanceID']
- pool_list = enumerate(server, poolname, keys_list, virt)
+ poolname = get_typed_class(virt, poolname)
+ pool_list = EnumInstances(server, poolname)
if len(pool_list) > 0:
for pool in pool_list:
valid_elc_id.append(pool.InstanceID)