# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1223891987 25200
# Node ID 7cf9ca34ef7b5f8a9f3762f68185c6bd42252e67
# Parent c7eaf17bd591f313b93ff2b2087cee11b25789e0
[TEST] Modify ComputerSystem/04_defineStartVS.py and VSSDC.01 to call new GetInstance
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r c7eaf17bd591 -r 7cf9ca34ef7b
suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py
--- a/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Fri Oct 10 03:08:12
2008 -0700
+++ b/suites/libvirt-cim/cimtest/ComputerSystem/04_defineStartVS.py Mon Oct 13 02:59:47
2008 -0700
@@ -62,11 +62,12 @@
# otherwise.
for i in range(1, (timeout + 1)):
sleep(1)
+ cs_class = get_typed_class(options.virt, 'ComputerSystem')
keys = {
'Name' : test_dom,
- 'CreationClassName' : get_typed_class(options.virt,
'ComputerSystem')
+ 'CreationClassName' : cs_class
}
- cs = enumclass.getInstance(options.ip, 'ComputerSystem', keys,
options.virt)
+ cs = enumclass.GetInstance(options.ip, cs_class, keys)
if cs.Name != test_dom:
Globals.logger.error("VS %s is not defined" % test_dom)
break
diff -r c7eaf17bd591 -r 7cf9ca34ef7b
suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py
--- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Fri Oct
10 03:08:12 2008 -0700
+++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Mon Oct
13 02:59:47 2008 -0700
@@ -146,10 +146,7 @@
vssd_cn = get_typed_class(options.virt, 'VirtualSystemSettingData')
try:
- vssd = enumclass.getInstance(options.ip, \
- 'VirtualSystemSettingData', \
- key_list, \
- options.virt)
+ vssd = enumclass.GetInstance(options.ip, vssd_cn, key_list)
if vssd is None:
logger.error("VSSD instance for %s not found" % test_dom)
cxml.undefine(options.ip)