[Libvirt-cim] [PATCH 2 of 3] [TEST] update EC.03 for XenFV and KVM support
# HG changeset patch
# User Guolian Yun <yunguol(a)cn.ibm.com>
# Date 1206945214 25200
# Node ID 8a88d71e2fc844fcf4a2fd45924c9971e1639dac
# Parent 0c1a7077faebe978965e537505e978117f623929
[TEST] update EC.03 for XenFV and KVM support
Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com>
diff -r 0c1a7077faeb -r 8a88d71e2fc8
suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py
--- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Sun Mar 30
23:28:06 2008 -0700
+++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Sun Mar 30
23:33:34 2008 -0700
@@ -25,11 +25,12 @@ from pywbem.cim_obj import CIMInstanceNa
from pywbem.cim_obj import CIMInstanceName
from XenKvmLib import assoc
from XenKvmLib import hostsystem
+from XenKvmLib.classes import get_typed_class
from CimTest import Globals
from CimTest.Globals import log_param, logger, do_main
from CimTest.ReturnCodes import PASS, FAIL
-sup_types = ['Xen']
+sup_types = ['Xen', 'XenFV', 'KVM']
exp_rc = 6 #CIM_ERR_NOT_FOUND
exp_desc = "No such instance"
@@ -38,13 +39,12 @@ def try_assoc(ref, ref_class, exp_rc, ex
conn = assoc.myWBEMConnection('http://%s' % options.ip,
(Globals.CIM_USER, Globals.CIM_PASS),
Globals.CIM_NS)
- log_param()
status = FAIL
rc = -1
names = []
try:
- names = conn.AssociatorNames(ref, AssocClass =
"Xen_ElementCapabilities")
+ names = conn.AssociatorNames(ref, AssocClass = get_typed_class(options.virt,
"ElementCapabilities"))
rc = 0
except pywbem.CIMError, (rc, desc):
if rc == exp_rc and desc.find(exp_desc) >= 0:
@@ -57,7 +57,8 @@ def try_assoc(ref, ref_class, exp_rc, ex
logger.error(details)
finally:
if rc == 0:
- logger.error("Xen_ElementCapabilities associator should NOT return
excepted result with a wrong key name and value of %s input" % ref_class)
+ logger.error("ElementCapabilities associator should NOT return excepted
result \
+ with a wrong key name and value of %s input" % ref_class)
status = FAIL
return status
@@ -67,18 +68,20 @@ def main():
def main():
options = main.options
rc = PASS
+ log_param()
- instanceref = CIMInstanceName("Xen_HostSystem",
+ instanceref = CIMInstanceName(get_typed_class(options.virt, "HostSystem"),
keybindings = {"Name" : "wrong",
"CreationClassName" : "wrong"})
- rc = try_assoc(instanceref, "Xen_HostSystem", exp_rc, exp_desc, options)
+ rc = try_assoc(instanceref, get_typed_class(options.virt, "HostSystem"),
exp_rc, exp_desc, options)
if rc != PASS:
status = FAIL
return status
- instance_cs = CIMInstanceName("Xen_ComputerSystem",
- keybindings = {"Name" : "wrong",
"CreationClassName" : "Xen_ComputerSystem"})
- rc = try_assoc(instance_cs, "Xen_ComputerSystem", exp_rc, exp_desc,
options)
+ instance_cs = CIMInstanceName(get_typed_class(options.virt,
"ComputerSystem"),
+ keybindings = {"Name" : "wrong",
+ "CreationClassName" :
get_typed_class(options.virt,"ComputerSystem")})
+ rc = try_assoc(instance_cs, get_typed_class(options.virt,
"ComputerSystem"), exp_rc, exp_desc, options)
if rc != PASS:
status = FAIL
return status