# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com&gt; # Date 1218028082 25200 # Node ID 61d83397310fc918956d079a7500d83c67637718 # Parent 3add446da91108d419ce8adae434ebc78039fa34 [TEST] Adding KVM support to 27_define_suspend_errs.py tc of CS provider. Changes: -------- 1) Added KVM support. 2) Using the library function try_request_state_change() to verify the exception. 3) Added create_netpool_conf(), destroy_netpool() functions since VSMS requires networkpool. 4) Using destroy_and_undefine_domain() to destroy and undefine the domain. Tested with KVM, XenFV, Xen on current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com&gt; diff -r 3add446da911 -r 61d83397310f suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py Tue Aug 05 08:59:29 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/27_define_suspend_errs.py Wed Aug 06 06:08:02 2008 -0700 @@ -41,11 +41,12 @@ from VirtLib import utils from VirtLib import utils from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL -from XenKvmLib.test_doms import undefine_test_domain -from XenKvmLib.common_util import get_cs_instance +from XenKvmLib.test_doms import destroy_and_undefine_domain +from XenKvmLib.common_util import try_request_state_change from XenKvmLib.common_util import create_using_definesystem +from XenKvmLib.common_util import create_netpool_conf, destroy_netpool -sup_types = ['Xen', 'XenFV', 'LXC'] +sup_types = ['Xen', 'XenFV', 'LXC', 'KVM'] SUSPEND_STATE = 9 default_dom = 'test_domain' @@ -53,44 +54,42 @@ exp_rc = pywbem.CIM_ERR_FAILED exp_rc = pywbem.CIM_ERR_FAILED exp_desc = 'Domain not running' + @do_main(sup_types) def main(): options = main.options + server = options.ip + virt = options.virt + status = FAIL + + status, test_network = create_netpool_conf(server, virt, False) + if status != PASS: + return FAIL try: # define the vs - status = create_using_definesystem(default_dom, options.ip, - virt=options.virt) + status = create_using_definesystem(default_dom, server, virt=virt) if status != PASS: - logger.error("Unable to define domain %s using DefineSystem()", \ - default_dom) - return FAIL + logger.error("Unable to define domain '%s' using DefineSystem()", + default_dom) + return status - rc, cs = get_cs_instance(default_dom, options.ip, options.virt) - if rc != 0: - logger.error("GetInstance failed") - undefine_test_domain(default_dom, options.ip) - return FAIL - - # try to suspend - cs.RequestStateChange( \ - RequestedState=pywbem.cim_types.Uint16(SUSPEND_STATE), \ - TimeoutPeriod=pywbem.cim_types.CIMDateTime(TIME)) - - except pywbem.CIMError, (err_no, desc): - if err_no == exp_rc and desc.find(exp_desc) >= 0: - logger.info("Got expected exception where ") - logger.info("Errno is '%s' ", exp_rc) - logger.info("Error string is '%s'", exp_desc) - undefine_test_domain(default_dom, options.ip, options.virt) - return PASS - logger.error("Unexpected RC: %s & Desc. %s", err_no, desc) - undefine_test_domain(default_dom, options.ip, options.virt) + except Exception, details: + logger.error("Exception: %s", details) + destroy_netpool(server, virt, test_network) + destroy_and_undefine_domain(default_dom, server, virt) return FAIL - logger.error("Expected Defined -> Suspended state transition to fail") - undefine_test_domain(default_dom, options.ip, options.virt) - return FAIL + status = try_request_state_change(default_dom, server, + SUSPEND_STATE, TIME, exp_rc, + exp_desc, virt) + + if status != PASS: + logger.error("Expected Defined -> Suspended state transition to fail") + + destroy_netpool(server, virt, test_network) + destroy_and_undefine_domain(default_dom, server, virt) + return status if __name__ == "__main__": sys.exit(main())