6:20 p.m.
# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1229041208 28800
# Node ID 8ade254f085ce279c4d3c14f9c419350f10b0a23
# Parent c6c43892a8b9dd0fa801406b5fac2eed45e5c246
[TEST] Remove try_getinstance() from RPCC - 02_rpcc_gi_errs.py
try_getinstance() is no longer needed - this function can be implemented using
functions from enumclass.py. Plus, a conn needs to be passed to the function,
which is poor function design.
Removed the "invalid_instid_keyname" case - passing an invalid keyname only
tests the CIMOM, it does not test the providers.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r c6c43892a8b9 -r 8ade254f085c
suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py
---
a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py Thu
Dec 11 16:20:04 2008 -0800
+++
b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationCapabilities/02_rpcc_gi_errs.py Thu
Dec 11 16:20:08 2008 -0800
@@ -24,19 +24,12 @@
# --------------
# This tc is used to verify if appropriate exceptions are
# returned by Xen_RPCC on giving invalid inputs.
-# 1) Test by giving invalid Invalid InstanceID Key Name
-# Input:
-# ------
-# wbemcli gi http://localhost:5988/root/virt:\
-# Xen_ResourcePoolConfigurationCapabilities.Wrong="RPCC" -nl
#
-# 2) Test by passing Invalid InstanceID Key Value
+# 1) Test by passing Invalid InstanceID Key Value
# Input:
# ------
# wbemcli gi http://localhost:5988/root/virt:\
# Xen_ResourcePoolConfigurationCapabilities.InstanceID="Wrong" -nl
-#
-# Inboth the cases the following exception is verified.
#
# Output:
# -------
@@ -46,43 +39,49 @@
# -Date 20.02.2008
import sys
-import pywbem
-from XenKvmLib import assoc
+from pywbem import CIM_ERR_NOT_FOUND, CIMError
+from pywbem.cim_obj import CIMInstanceName
+from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.Globals import logger
from XenKvmLib.classes import get_typed_class
-from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
from XenKvmLib.const import do_main
-from CimTest.ReturnCodes import PASS, FAIL
-from XenKvmLib.common_util import try_getinstance
+from XenKvmLib.enumclass import GetInstance, CIM_CimtestClass
sup_types = ['Xen', 'XenFV', 'KVM', 'LXC']
-
-expr_values = {
- "invalid_instid" : { 'rc' :
pywbem.CIM_ERR_NOT_FOUND, \
- 'desc' : 'No such instance
(InstanceID)' }
- }
@do_main(sup_types)
def main():
options = main.options
- status = PASS
- conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, CIM_PASS),
CIM_NS)
- classname = get_typed_class(options.virt,
'ResourcePoolConfigurationCapabilities')
- field = 'INVALID_Instid_KeyName'
- keys = { field : "RPCC" }
- ret_value = try_getinstance(conn, classname, keys, field_name=field, \
- expr_values=expr_values['invalid_instid'],
bug_no="")
- if ret_value != PASS:
- logger.error("------ FAILED: Invalid InstanceID Key Name.------")
- status = ret_value
+ cn = get_typed_class(options.virt, 'ResourcePoolConfigurationCapabilities')
- field = 'INVALID_Instid_KeyValue'
- keys = { 'InstanceID' : field }
- ret_value = try_getinstance(conn, classname, keys, field_name=field, \
- expr_values=expr_values['invalid_instid'],
bug_no="")
- if ret_value != PASS:
+ expr_values = {
+ 'rc' : CIM_ERR_NOT_FOUND,
+ 'desc' : "No such instance (InstanceID)"
+ }
+
+ keys = { 'InstanceID' : 'INVALID_Instid_KeyValue' }
+
+ ref = CIMInstanceName(cn, keybindings=keys)
+
+ status = FAIL
+ try:
+ inst = CIM_CimtestClass(options.ip, ref)
+
+ except CIMError, (err_no, err_desc):
+ exp_rc = expr_values['rc']
+ exp_desc = expr_values['desc']
+
+ if err_no == exp_rc and err_desc.find(exp_desc) >= 0:
+ logger.info("Got expected exception: %s %s", exp_desc, exp_rc)
+ status = PASS
+ else:
+ logger.error("Unexpected errno %s and desc %s", err_no, err_desc)
+ logger.error("Got %s %s", err_desc, err_no)
+ status = FAIL
+
+ if status != PASS:
logger.error("------ FAILED: Invalid InstanceID Key Value.------")
- status = ret_value
return status
if __name__ == "__main__":