# HG changeset patch # User Guolian Yun <yunguol@cn.ibm.com> # Date 1224035857 25200 # Node ID c8fb99643549b9e20efc7854dcbcde9474fbd242 # Parent b22a7a3c7972648a8067b88189ff5a7a8509b160 [TEST] #2 Update common_util.py to call new EnumInstances Signed-off-by: Guolian Yun <yunguol@cn.ibm.com> diff -r b22a7a3c7972 -r c8fb99643549 suites/libvirt-cim/lib/XenKvmLib/common_util.py --- a/suites/libvirt-cim/lib/XenKvmLib/common_util.py Mon Oct 13 22:48:51 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/common_util.py Tue Oct 14 18:57:37 2008 -0700 @@ -217,7 +217,8 @@ def get_host_info(server, virt="Xen"): # sblim-base-provider provider related changes ret, linux_cs = check_sblim(server) - host_info = enumclass.enumerate(server, 'HostSystem', keys, virt) + hs_class = get_typed_class(virt, 'HostSystem') + host_info = enumclass.EnumInstances(server, hs_class) if ret == PASS: host_sys = linux_cs elif len(host_info) == 1: @@ -499,8 +500,9 @@ def check_sblim(server, virt='Xen'): Globals.CIM_NS = 'root/cimv2' keys = ['Name', 'CreationClassName'] linux_cs = None + cs = 'Linux_ComputerSystem' try: - linux = enumclass.enumerate(server, 'ComputerSystem', keys, 'Linux') + linux = enumclass.EnumInstances(server, cs) if len(linux) == 1: status = PASS linux_cs = linux[0]