# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com&gt; # Date 1207024496 -28800 # Node ID 9fa6fb76969e211c8cc41f35b4eaa4a83060496a # Parent f6ec7e2665e05f5335f768ea9f863b5a9237a075 SettingsDefine 02_reverse XenFV & KVM support Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com&gt; diff -r f6ec7e2665e0 -r 9fa6fb76969e suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Tue Apr 01 12:34:53 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Tue Apr 01 12:34:56 2008 +0800 @@ -55,46 +55,38 @@ from CimTest.Globals import log_param, l from CimTest.Globals import log_param, logger, do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP from VirtLib import utils -from XenKvmLib.test_xml import testxml -from XenKvmLib.test_doms import test_domain_function from XenKvmLib import assoc +from XenKvmLib import vxml +from XenKvmLib.classes import get_typed_class, get_class_basename from XenKvmLib.rasd import InstId_err -from XenKvmLib.devices import Xen_NetworkPort, Xen_Memory, Xen_LogicalDisk, Xen_Processor - - -sup_types = ['Xen'] + + +sup_types = ['Xen', 'KVM', 'XenFV'] test_dom = "virtgst" test_vcpus = 1 test_mem = 128 test_mac = "00:11:22:33:44:aa" -test_disk = 'xvdb' -VSType = "Xen" - -resources = { - "proc" : (test_dom + '/' + `0` ), \ - "net" : (test_dom + '/' + test_mac), \ - "disk" : (test_dom + '/' + test_disk), \ - "mem" : (test_dom + '/' + 'mem' ) - } - -def call_assoc(ip, inst, exp_id, ccn): + + +def call_assoc(ip, inst, exp_id, ccn, virt): if inst['InstanceID'] != exp_id: InstId_err(inst, exp_id) return FAIL try: - associnf = assoc.Associators(ip, 'Xen_SettingsDefineState', ccn, \ - InstanceID = exp_id) + associnf = assoc.Associators(ip, 'SettingsDefineState', + ccn, virt, + InstanceID = exp_id) except BaseException, detail : logger.error("Exception %s " % detail) logger.error("Error while associating Xen_SettingsDefineState with %s" % ccn) return FAIL - return SettingsDefineStateAssoc(ip, associnf) - -def VSSDCAssoc(ip, assocn): + return SettingsDefineStateAssoc(ip, associnf, virt) + +def VSSDCAssoc(ip, assocn, virt): """ The association info of Xen_VirtualSystemSettingDataComponent is verified. @@ -106,22 +98,10 @@ def VSSDCAssoc(ip, assocn): return status try: - for i in range(len(assocn)): - if assocn[i].classname == 'Xen_ProcResourceAllocationSettingData': - status = call_assoc(ip, assocn[i], resources['proc'], \ - 'Xen_ProcResourceAllocationSettingData') - - elif assocn[i].classname == 'Xen_NetResourceAllocationSettingData': - status = call_assoc(ip, assocn[i], resources['net'], \ - 'Xen_NetResourceAllocationSettingData') - - elif assocn[i].classname =='Xen_DiskResourceAllocationSettingData': - status = call_assoc(ip, assocn[i], resources['disk'], \ - 'Xen_DiskResourceAllocationSettingData') - - elif assocn[i].classname == 'Xen_MemResourceAllocationSettingData': - status = call_assoc(ip, assocn[i], resources['mem'], \ - 'Xen_MemResourceAllocationSettingData') + for rasd in assocn: + rasd_cn = get_class_basename(rasd.classname) + if rasd_cn in rasd_devid.keys(): + status = call_assoc(ip, rasd, rasd_devid[rasd_cn], rasd_cn, virt) else: status = FAIL @@ -141,7 +121,7 @@ def check_id(inst, exp_id): return PASS -def SettingsDefineStateAssoc(ip, associnfo_setDef): +def SettingsDefineStateAssoc(ip, associnfo_setDef, virt): """ The association info of Xen_SettingsDefineState is verified. """ @@ -152,20 +132,10 @@ def SettingsDefineStateAssoc(ip, associn return status try: - for i in range(len(associnfo_setDef)): - - if associnfo_setDef[i]['CreationClassName'] == 'Xen_Processor': - status = check_id(associnfo_setDef[i], resources['proc']) - - elif associnfo_setDef[i]['CreationClassName'] == 'Xen_NetworkPort': - status = check_id(associnfo_setDef[i], resources['net']) - - elif associnfo_setDef[i]['CreationClassName'] == 'Xen_LogicalDisk': - status = check_id(associnfo_setDef[i], resources['disk']) - - elif associnfo_setDef[i]['CreationClassName'] == 'Xen_Memory': - status = check_id(associnfo_setDef[i], resources['mem']) - + for dev in associnfo_setDef: + dev_cn = get_class_basename(dev['CreationClassName']) + if dev_cn in dev_devid.keys(): + status = check_id(dev, dev_devid[dev_cn]) else: status = FAIL @@ -177,42 +147,70 @@ def SettingsDefineStateAssoc(ip, associn logger.error("Exception in SettingsDefineStateAssoc function: %s" % detail) status = FAIL - test_domain_function(test_dom, ip, "destroy") - - return status + + return status + @do_main(sup_types) def main(): options = main.options + vt = options.virt + if vt == 'Xen': + test_disk = 'xvdb' + else: + test_disk = 'hdb' + status = PASS log_param() - test_domain_function(test_dom, options.ip, "destroy") - bld_xml = testxml(test_dom, mem = test_mem, vcpus = test_vcpus, - mac = test_mac, disk = test_disk) - - ret = test_domain_function(bld_xml, options.ip, cmd = "create") + virt_xml = vxml.get_class(options.virt) + cxml = virt_xml(test_dom, mem = test_mem, vcpus = test_vcpus, + mac = test_mac, disk = test_disk) + ret = cxml.create(options.ip) if not ret: logger.error("Failed to create the dom: %s", test_dom) status = FAIL return status + + if vt == 'XenFV': + VSType = 'Xen' + else: + VSType = vt + instIdval = "%s:%s" % (VSType, test_dom) + vssdc_cn = get_typed_class(vt, 'VirtualSystemSettingDataComponent') + vssd_cn = get_typed_class(vt, 'VirtualSystemSettingData') + sds_cn = get_typed_class(vt, 'SettingsDefineState') + + global rasd_devid + rasd_devid = { + 'ProcResourceAllocationSettingData' : '%s/%s' % (test_dom, test_vcpus-1), + 'NetResourceAllocationSettingData' : '%s/%s' % (test_dom, test_mac), + 'DiskResourceAllocationSettingData' : '%s/%s' % (test_dom, test_disk), + 'MemResourceAllocationSettingData' : '%s/%s' % (test_dom, 'mem')} + global dev_devid + dev_devid = { + 'Processor' : '%s/%s' % (test_dom, test_vcpus-1), + 'NetworkPort' : '%s/%s' % (test_dom, test_mac), + 'LogicalDisk' : '%s/%s' % (test_dom, test_disk), + 'Memory' : '%s/%s' % (test_dom, 'mem')} + try: - assocn = assoc.AssociatorNames(options.ip, - 'Xen_VirtualSystemSettingDataComponent', - 'Xen_VirtualSystemSettingData', + assocn = assoc.AssociatorNames(options.ip, vssdc_cn, vssd_cn, + virt = options.virt, InstanceID = instIdval) - status = VSSDCAssoc(options.ip, assocn) - - except BaseException, detail : - logger.error(Globals.CIM_ERROR_ASSOCIATORS, - 'Xen_VirtualSystemSettingDataComponent') + + status = VSSDCAssoc(options.ip, assocn, options.virt) + + except BaseException, detail : + logger.error(Globals.CIM_ERROR_ASSOCIATORS, vssdc_cn) logger.error("Exception : %s" % detail) status = FAIL - test_domain_function(test_dom, options.ip, "destroy") + cxml.destroy(options.ip) + cxml.undefine(options.ip) return status if __name__ == "__main__":

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com&gt; # Date 1207024497 -28800 # Node ID 11e60ff72c22ca02118c052d50b7a5de26d612b8 # Parent 306b41f451ea89ca590907f886401d6b642c1b14 SettingsDefine 04_sds_rev_errs XenFV & KVM support Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com&gt; diff -r 306b41f451ea -r 11e60ff72c22 suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Tue Apr 01 12:34:57 2008 +0800 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Tue Apr 01 12:34:57 2008 +0800 @@ -56,20 +56,18 @@ import pywbem import pywbem from VirtLib import utils from XenKvmLib import assoc -from XenKvmLib.test_xml import testxml +from XenKvmLib import vxml from XenKvmLib.common_util import try_assoc -from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all +from XenKvmLib.classes import get_typed_class from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, log_param, logger from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS -sup_types = ['Xen'] +sup_types = ['Xen', 'KVM', 'XenFV'] -ac_classname = 'Xen_SettingsDefineState' test_dom = "domu1" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 -test_disk = 'xvda' expr_values = { "INVALID_InstID_Keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \ @@ -78,13 +76,14 @@ expr_values = { 'desc' : 'No such instance (INVALID_InstID_Keyval)'} } -def try_invalid_assoc(classname, name_val, i, field): +def try_invalid_assoc(classname, name_val, i, field, virt): keys = {} temp = name_val[i] name_val[i] = field for j in range(len(name_val)/2): k = j * 2 keys[name_val[k]] = name_val[k+1] + ac_classname = get_typed_class(virt, 'SettingsDefineState') ret_val = try_assoc(conn, classname, ac_classname, keys, field_name=field, \ expr_values=expr_values[field], bug_no='') if ret_val != PASS: @@ -96,18 +95,20 @@ def try_invalid_assoc(classname, name_va @do_main(sup_types) def main(): options = main.options - if not options.ip: - parser.print_help() - return FAIL log_param() status = PASS - destroy_and_undefine_all(options.ip) - test_xml = testxml(test_dom, vcpus = test_vcpus, mac = test_mac, \ - disk = test_disk) + if options.virt == 'Xen': + test_disk = 'xvda' + else: + test_disk = 'hda' + + virt_xml = vxml.get_class(options.virt) + cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, + disk = test_disk) - ret = test_domain_function(test_xml, options.ip, cmd = "create") + ret = cxml.create(options.ip) if not ret: logger.error("Failed to Create the dom: %s", test_dom) return FAIL @@ -116,11 +117,12 @@ def main(): conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, \ CIM_PASS), CIM_NS) + rasd_base= 'ResourceAllocationSettingData' class_id = { - 'Xen_DiskResourceAllocationSettingData' : test_disk, \ - 'Xen_MemResourceAllocationSettingData' : 'mem', \ - 'Xen_NetResourceAllocationSettingData' : test_mac, \ - 'Xen_ProcResourceAllocationSettingData' : '0' + get_typed_class(options.virt, 'Disk' + rasd_base) : test_disk, + get_typed_class(options.virt, 'Mem' + rasd_base) : 'mem', + get_typed_class(options.virt, 'Net' + rasd_base) : test_mac, + get_typed_class(options.virt, 'Proc' + rasd_base) : test_vcpus - 1 } tc_scen = ['INVALID_InstID_Keyname', 'INVALID_InstID_Keyval'] @@ -129,11 +131,12 @@ def main(): devid = "%s/%s" % (test_dom, devid) name_val = ['InstanceID', devid] for i in range(len(tc_scen)): - retval = try_invalid_assoc(classname, name_val, i, tc_scen[i]) + retval = try_invalid_assoc(classname, name_val, i, tc_scen[i], options.virt) if retval != PASS: status = retval - test_domain_function(test_dom, options.ip, cmd = "destroy") + cxml.destroy(options.ip) + cxml.undefine(options.ip) return status if __name__ == "__main__":