- CIM - libvirt List Archives

[PATCH 0 of 2] Correctly place the ValueRole, ValueRange, and PropertyPolicy attributes
by Dan Smith 02 May '08

02 May '08

This set (which includes my previous patch) creates a reference function to set the mentioned attributes on the SDC reference, as well as removing the code to set the on the RASD.

2 3

[PATCH] Add the ValueRole to the SDC reference
by Dan Smith 01 May '08

01 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1209667072 25200 # Node ID df67e47476756c5cfdb77a976308677ac1742186 # Parent d4ea8516ae04a2e3ab0060f297035b107b59b81d Add the ValueRole to the SDC reference This extends the default make_reference() function to set the proper ValueRole and ValueRange properties for the AC->RASD reference. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r d4ea8516ae04 -r df67e4747675 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Thu May 01 10:45:16 2008 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Thu May 01 11:37:52 2008 -0700 @@ -1063,6 +1063,49 @@ static CMPIStatus vsmsd_to_migrate_cap(c return s; } +static CMPIInstance *make_ref_valuerole(const CMPIObjectPath *source_ref, + const CMPIInstance *target_inst, + struct std_assoc_info *info, + struct std_assoc *assoc) +{ + CMPIInstance *ref_inst = NULL; + uint16_t valuerole = SDC_ROLE_SUPPORTED; + uint16_t valuerange; + const char *iid = NULL; + + ref_inst = make_reference(_BROKER, + source_ref, + target_inst, + info, + assoc); + + if (cu_get_str_prop(target_inst, "InstanceID", &iid) != CMPI_RC_OK) { + CU_DEBUG("Target instance does not have an InstanceID"); + goto out; + } + + if (strstr("Default", iid) != NULL) + valuerange = SDC_RANGE_POINT; + else if (strstr("Increment", iid) != NULL) + valuerange = SDC_RANGE_INC; + else if (strstr("Maximum", iid) != NULL) + valuerange = SDC_RANGE_MAX; + else if (strstr("Minimum", iid) != NULL) + valuerange = SDC_RANGE_MIN; + else + CU_DEBUG("Unknown default RASD type: `%s'", iid); + + if (valuerange == SDC_RANGE_POINT) + valuerole = SDC_ROLE_DEFAULT; + + CMSetProperty(ref_inst, "ValueRole", + (CMPIValue *)&valuerole, CMPI_uint16); + CMSetProperty(ref_inst, "ValueRange", + (CMPIValue *)&valuerange, CMPI_uint16); + out: + return ref_inst; +} + LIBVIRT_CIM_DEFAULT_MAKEREF() static char* group_component[] = { @@ -1105,7 +1148,7 @@ static struct std_assoc _alloc_cap_to_ra .assoc_class = (char**)&assoc_classname, .handler = alloc_cap_to_rasd, - .make_ref = make_ref + .make_ref = make_ref_valuerole }; static struct std_assoc _rasd_to_alloc_cap = {

2 1

[PATCH] Remove PKG_CONFIG_PATH override
by Dan Smith 01 May '08

01 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1209661530 25200 # Node ID d50126c4ae1c0faca291f5c1e816de9dac65c605 # Parent ffa1024f9012873e29c732a9b355199bd61d0440 Remove PKG_CONFIG_PATH override ...so that you can actually set it if you need to :) Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r ffa1024f9012 -r d50126c4ae1c configure.ac --- a/configure.ac Wed Apr 30 11:24:37 2008 -0700 +++ b/configure.ac Thu May 01 10:05:30 2008 -0700 @@ -134,7 +134,6 @@ CHECK_CIMSERVER CHECK_CIMSERVER # Check for presence of libraries -PKG_CONFIG_PATH=/usr/local/lib/pkgconfig CHECK_LIBVIRT CHECK_LIBXML2 CHECK_LIBCU

2 1

[PATCH 0 of 2] Move MAC generation to DefineSystem
by Dan Smith 01 May '08

01 May '08

This set moves the MAC generation to DefineSystem and out of the example NetRASD from AC.

2 3

[PATCH] [TEST] modified the changeset number and add branch of err exp in RAFP.03
by Guo Lian Yun 01 May '08

01 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1209518087 25200 # Node ID 4262862cb05d918bc8516e4528918a0b65f5232a # Parent b3969776fb077e2575effe7cd3c914778d86b63c [TEST] modified the changeset number and add branch of err exp in RAFP.03 Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r b3969776fb07 -r 4262862cb05d suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Tue Apr 29 01:44:18 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/03_forward_errs.py Tue Apr 29 18:14:47 2008 -0700 @@ -28,12 +28,10 @@ from CimTest import Globals from CimTest import Globals from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, XFAIL +from XenKvmLib.const import CIM_REV sup_types = ['Xen', 'XenFV', 'KVM'] - -exp_rc = 6 #CIM_ERR_NOT_FOUND -exp_desc = "No such instance (wrong) - resource pool type mismatch" - +rev = 417 @do_main(sup_types) def main(): @@ -47,6 +45,13 @@ def main(): conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) + + exp_rc = 6 #CIM_ERR_NOT_FOUND + exp_desc = "No such instance (wrong) - resource pool type mismatch" + if CIM_REV < rev: + exp_rc = 1 # CIM_ERR_FAILED + exp_desc = "Invalid InstanceID or unsupported pool type" + for k, v in poollist.items(): instanceref = CIMInstanceName(k, keybindings = {"InstanceID" : v})

2 1

[PATCH] [TEST] Making use of the lib fn conf_file(), cleanup_restore() and create_diskpool_file()
by Deepti B. Kalakeri 30 Apr '08

30 Apr '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1208960298 -19800 # Node ID 70e13e2a2abf57a666c8e4d5029d06ecd017ea69 # Parent 0123ff5809dc099c0b7840fce65eca5bce0921e6 [TEST] Making use of the lib fn conf_file(), cleanup_restore() and create_diskpool_file(). Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 0123ff5809dc -r 70e13e2a2abf suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Wed Apr 23 19:40:48 2008 +0530 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Wed Apr 23 19:48:18 2008 +0530 @@ -59,6 +59,9 @@ from XenKvmLib.test_xml import testxml_b from XenKvmLib.test_xml import testxml_bridge from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all from VirtLib.live import network_by_bridge +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file + sup_types = ['Xen'] @@ -68,42 +71,9 @@ test_mem = 128 test_mem = 128 test_vcpus = 4 test_disk = "xvdb" -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "02_reverse" diskid = "%s/%s" % ("DiskPool", test_dpath) memid = "%s/%s" % ("MemoryPool", 0) procid = "%s/%s" % ("ProcessorPool", 0) - -def conf_file(): - """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = SKIP - sys.exit(status) - -def clean_up_restore(ip): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = SKIP - ret = test_domain_function(test_dom, ip, \ - cmd = "destroy") - sys.exit(status) - def get_or_bail(ip, id, pool_class): """ @@ -116,10 +86,9 @@ def get_or_bail(ip, id, pool_class): except Exception, detail: Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, '%s', pool_class) Globals.logger.error("Exception: %s", detail) - clean_up_restore(ip) + cleanup_restore() status = FAIL - ret = test_domain_function(test_dom, ip, \ - cmd = "destroy") + ret = test_domain_function(test_dom, ip, cmd = "destroy") sys.exit(status) return instance @@ -133,19 +102,19 @@ def init_list(ip, disk, mem, net, proc): """ pllist = { - "Xen_DiskPool" : disk.InstanceID, \ - "Xen_MemoryPool" : mem.InstanceID, \ - "Xen_NetworkPool" : net.InstanceID, \ + "Xen_DiskPool" : disk.InstanceID, + "Xen_MemoryPool" : mem.InstanceID, + "Xen_NetworkPool" : net.InstanceID, "Xen_ProcessorPool": proc.InstanceID } cllist = [ - "Xen_LogicalDisk", \ - "Xen_Memory", \ - "Xen_NetworkPort", \ + "Xen_LogicalDisk", + "Xen_Memory", + "Xen_NetworkPort", "Xen_Processor" ] - prop_list = ["%s/%s" % (test_dom, test_disk), test_disk, \ - "%s/%s" % (test_dom, "mem"), test_mem, \ + prop_list = ["%s/%s" % (test_dom, test_disk), test_disk, + "%s/%s" % (test_dom, "mem"), test_mem, "%s/%s" % (test_dom, test_mac), test_mac ] proc_prop = [] @@ -166,8 +135,8 @@ def get_spec_fields_list(inst_list, fiel global status specific_fields = { } if (len(inst_list)) != 1: - Globals.logger.error("Got %s record for Memory/Network/LogicalDisk instead of \ -1", len(inst_list)) + Globals.logger.error("Got %s record for Memory/Network/LogicalDisk \ + instead of 1", len(inst_list)) status = FAIL return # verifying the Name field for LogicalDisk @@ -181,7 +150,7 @@ 1", len(inst_list)) else: field_value = ((int(inst_list[0]['NumberOfBlocks'])*4096)/1024) specific_fields = { - "field_name" : field_name,\ + "field_name" : field_name, "field_value" : field_value } except Exception, detail: @@ -254,43 +223,39 @@ def main(): Globals.logger.error("Failed to Create the dom: %s", test_dom) return FAIL - # Taking care of already existing diskconf file - # Creating diskpool.conf if it does not exist - # Otherwise backing up the prev file and create new one. - os.system("rm -f %s" % back_disk_file ) - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + ret = test_domain_function(test_dom, server, cmd = "destroy") + return status + try : - disk = get_or_bail(server, id=diskid, \ - pool_class=enumclass.Xen_DiskPool) - mem = get_or_bail(server, id = memid, \ + disk = get_or_bail(server, id=diskid, pool_class=enumclass.Xen_DiskPool) + mem = get_or_bail(server, id = memid, pool_class=enumclass.Xen_MemoryPool) netid = "%s/%s" % ("NetworkPool", virt_network) - net = get_or_bail(server, id = netid, \ + net = get_or_bail(server, id = netid, pool_class=enumclass.Xen_NetworkPool) - proc = get_or_bail(server, id = procid, \ + proc = get_or_bail(server, id = procid, pool_class=enumclass.Xen_ProcessorPool) except Exception, detail: Globals.logger.error("Exception: %s", detail) - clean_up_restore(server) + cleanup_restore() status = FAIL - ret = test_domain_function(test_dom, server, \ - cmd = "destroy") + ret = test_domain_function(test_dom, server, cmd = "destroy") return status - pllist, cllist, prop_list, proc_prop = init_list(server, disk, mem, net, proc) + pllist, cllist, prop_list, proc_prop = init_list(server, disk, mem, net, + proc) # Looping through the pllist to get association for various pools. for cn, instid in sorted(pllist.items()): try: - assoc_info = assoc.Associators(server, \ - "Xen_ElementAllocatedFromPool", \ - cn, \ - InstanceID = instid) + assoc_info = assoc.Associators(server, + "Xen_ElementAllocatedFromPool", + cn, + InstanceID = instid) # Verifying the Creation Class name for all the records returned for each # pool class queried inst_list = get_inst_for_dom(assoc_info) @@ -300,16 +265,16 @@ the specified domain: %s", test_dom) status = FAIL break - assoc_values(assoc_list=inst_list, field="CreationClassName", \ - list=cllist, \ - index=loop) + assoc_values(assoc_list=inst_list, field="CreationClassName", + list=cllist, + index=loop) # verifying the DeviceID if inst_list[0]['CreationClassName'] == 'Xen_Processor': # The DeviceID for the processor varies from 0 to (vcpu - 1 ) list_index = 0 - assoc_values(assoc_list=inst_list, field="DeviceID", \ - list=proc_prop, \ - index=list_index) + assoc_values(assoc_list=inst_list, field="DeviceID", + list=proc_prop, + index=list_index) else: # For LogicalDisk, Memory and NetworkPort if inst_list[0]['CreationClassName'] == 'Xen_LogicalDisk': @@ -318,40 +283,41 @@ the specified domain: %s", test_dom) list_index = 2 else: list_index = 4 # NetworkPort - assoc_values(assoc_list=inst_list, field="DeviceID", \ - list=prop_list, \ - index=list_index) + assoc_values(assoc_list=inst_list, field="DeviceID", + list=prop_list, + index=list_index) if inst_list[0]['CreationClassName'] == 'Xen_LogicalDisk': # verifying the Name field for LogicalDisk - specific_fields = get_spec_fields_list(inst_list,field_name="Name") + specific_fields = get_spec_fields_list(inst_list, field_name="Name") list_index = 1 elif inst_list[0]['CreationClassName'] == 'Xen_Memory': # verifying the NumberOfBlocks allocated for Memory - specific_fields = get_spec_fields_list(inst_list,field_name="NumberOfBlocks") + specific_fields = get_spec_fields_list(inst_list, + field_name="NumberOfBlocks") list_index = 3 else: # verifying the NetworkAddresses for the NetworkPort - specific_fields = get_spec_fields_list(inst_list,field_name="NetworkAddresses") + specific_fields = get_spec_fields_list(inst_list, + field_name="NetworkAddresses") list_index = 5 # NetworkPort - assoc_values(assoc_list=inst_list, field="Other", \ - list=prop_list, \ - index=list_index, \ - specific_fields_list=specific_fields) + assoc_values(assoc_list=inst_list, field="Other", + list=prop_list, + index=list_index, + specific_fields_list=specific_fields) if status != PASS: break else: # The loop variable is used to index the cllist to verify the creationclassname loop = loop + 1 except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, \ + Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, 'Xen_ElementAllocatedFromPool') Globals.logger.error("Exception: %s", detail) - clean_up_restore(server) + cleanup_restore() status = FAIL - ret = test_domain_function(test_dom, server, \ - cmd = "destroy") - clean_up_restore(server) + ret = test_domain_function(test_dom, server, cmd = "destroy") + cleanup_restore() return status if __name__ == "__main__": sys.exit(main()) diff -r 0123ff5809dc -r 70e13e2a2abf suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Wed Apr 23 19:40:48 2008 +0530 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Wed Apr 23 19:48:18 2008 +0530 @@ -40,18 +40,17 @@ from CimTest.Globals import do_main, pla from CimTest.Globals import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file bug_no = "88651" test_dom = "hd_domain" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 -id1 = "DiskPool/foo" +id1 = "DiskPool/test_dpath" id2 = "MemoryPool/0" id3 = "NetworkPool/xenbr0" id4 = "ProcessorPool/0" -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "02_reverse" expr_values = { "invalid_keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \ @@ -62,34 +61,6 @@ expr_values = { 'desc' : 'No such instance' } } - -def conf_file(): - """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - sys.exit(status) - -def clean_up_restore(ip): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - vsxml.undefine(ip) - sys.exit(status) def err_invalid_ccname(): # This is used to verify the that the @@ -212,14 +183,12 @@ def main(): vsxml = get_class(virt)(test_dom, vcpus = test_vcpus, mac = test_mac, \ disk = test_disk) - if (os.path.exists(back_disk_file)): - os.unlink(back_disk_file) + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + ret = test_domain_function(test_dom, server, cmd = "destroy") + return status - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() ret = vsxml.define(options.ip) if not ret: Globals.logger.error("Failed to define the dom: %s", test_dom) @@ -240,7 +209,7 @@ def main(): if ret: Globals.logger.error("------FAILED: Invalid CCName.------") return ret - clean_up_restore(options.ip) + cleanup_restore() vsxml.undefine(options.ip) return PASS if __name__ == "__main__": diff -r 0123ff5809dc -r 70e13e2a2abf suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Wed Apr 23 19:40:48 2008 +0530 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Wed Apr 23 19:48:18 2008 +0530 @@ -41,6 +41,8 @@ from CimTest.Globals import do_main, pla from CimTest.Globals import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file sup_types = ['Xen', 'KVM', 'XenFV'] bug_no = "88651" @@ -49,49 +51,16 @@ test_mac = "00:11:22:33:44:aa" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 exp_list = [ - {'desc' : "No such instance (SystemName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, \ - {'desc' : "No DeviceID specified", 'rc' : pywbem.CIM_ERR_FAILED}, \ - {'desc' : "No such instance", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, \ - {'desc' : "One or more parameter values passed to the method were invalid", \ - 'rc' : pywbem.CIM_ERR_INVALID_PARAMETER}, \ - {'desc' : "No such instance (CreationClassName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND }, \ - {'desc' : "No such instance (SystemCreationClassName)", 'rc' : \ - pywbem.CIM_ERR_NOT_FOUND }, + {'desc' : "No such instance (SystemName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, + {'desc' : "No DeviceID specified", 'rc' : pywbem.CIM_ERR_FAILED}, + {'desc' : "No such instance", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, + {'desc' : "CIM_ERR_INVALID_PARAMETER", + 'rc' : pywbem.CIM_ERR_INVALID_PARAMETER}, + {'desc' : "No such instance (CreationClassName)", + 'rc' : pywbem.CIM_ERR_NOT_FOUND }, + {'desc' : "No such instance (SystemCreationClassName)", + 'rc' : pywbem.CIM_ERR_NOT_FOUND }, ] - - -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "02_reverse" - - -def conf_file(): - """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - sys.exit(status) - -def clean_up_restore(ip): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - vsxml.undefine(ip) - sys.exit(status) def try_assoc(conn, exp_ret, dev_dom_name, invalid_keyname_list, test_vals, log_msg): @@ -102,9 +71,9 @@ def try_assoc(conn, exp_ret, dev_dom_nam procid = "%s/%s" % (dev_dom_name, 0) lelist = { - get_typed_class(virt, "LogicalDisk") : diskid, \ - get_typed_class(virt, "NetworkPort") : netid, \ - get_typed_class(virt, "Memory" ) : memid, \ + get_typed_class(virt, "LogicalDisk") : diskid, + get_typed_class(virt, "NetworkPort") : netid, + get_typed_class(virt, "Memory" ) : memid, get_typed_class(virt, "Processor" ) : procid } @@ -125,9 +94,9 @@ def try_assoc(conn, exp_ret, dev_dom_nam else: snkeyname = "SystemName" - test_keys = { devkeyname : devkeyname, \ - ccnkeyname : ccnkeyname, \ - sccnkeyname : sccnkeyname, \ + test_keys = { devkeyname : devkeyname, + ccnkeyname : ccnkeyname, + sccnkeyname : sccnkeyname, snkeyname : snkeyname } for cn, devid in sorted(lelist.items()): @@ -142,10 +111,10 @@ def try_assoc(conn, exp_ret, dev_dom_nam else: ccn = cn - keys = { test_keys[devkeyname] : dev_id, \ - test_keys[ccnkeyname] : ccn, \ - test_keys[sccnkeyname] : test_vals['sccn'], \ - test_keys[snkeyname] : test_vals['sn'] + keys = { test_keys[devkeyname] : dev_id, + test_keys[ccnkeyname] : ccn, + test_keys[sccnkeyname] : test_vals['sccn'], + test_keys[snkeyname] : test_vals['sn'] } if test_vals['cn'] != "valid": @@ -154,8 +123,8 @@ def try_assoc(conn, exp_ret, dev_dom_nam inst_cn = cn instanceref = CIMInstanceName(inst_cn, keybindings=keys) try: - assoc_info = conn.AssociatorNames(instanceref, \ - AssocClass=assoc_classname) + assoc_info = conn.AssociatorNames(instanceref, + AssocClass=assoc_classname) except pywbem.CIMError, (err_no, desc): if err_no == exp_ret['rc'] and desc.find(exp_ret['desc']) >= 0: logger.info("Got expected exception where ") @@ -196,22 +165,21 @@ def err_invalid_sysname_keyname(conn, ex # # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "invalid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "invalid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid SystemName Key Name was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_sysname_keyvalue(conn, exp_ret): @@ -232,22 +200,21 @@ def err_invalid_sysname_keyvalue(conn, e # # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : "invalid", \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : "invalid", + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Non-existing SystemName was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_devid_keyname(conn, exp_ret): # This is used to verify the that the @@ -271,22 +238,21 @@ def err_invalid_devid_keyname(conn, exp_ # # - test_keys = { 'DeviceID' : "invalid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "invalid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid deviceid keyname was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_devid_keyvalue(conn, exp_ret): @@ -309,22 +275,22 @@ def err_invalid_devid_keyvalue(conn, exp # Similarly we check for Network. # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "invalid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "invalid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid deviceid keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom_invalid, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom_invalid, test_keys, test_vals, + log_msg) def err_invalid_classname(conn, exp_ret): @@ -348,22 +314,21 @@ def err_invalid_classname(conn, exp_ret) # Similarly we check for Memory,Network,Processor. # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "invalid" } log_msg = "Invalid classname value was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_creationclassname_keyname(conn, exp_ret): @@ -388,22 +353,21 @@ def err_invalid_creationclassname_keynam # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "invalid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "invalid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid creationclassname keyname was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_creationclassname_keyvalue(conn, exp_ret): @@ -426,22 +390,21 @@ def err_invalid_creationclassname_keyval # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "invalid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "invalid", 'cn' : "valid" } log_msg = "Invalid creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_syscreationclassname_keyname(conn, exp_ret): @@ -464,22 +427,21 @@ def err_invalid_syscreationclassname_key # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "invalid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "invalid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid system creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_syscreationclassname_keyvalue(conn, exp_ret): @@ -502,22 +464,21 @@ def err_invalid_syscreationclassname_key # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : "invalid", \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : "invalid", + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid system creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) @do_main(platform_sup) def main(): @@ -539,14 +500,11 @@ def main(): destroy_and_undefine_all(options.ip) vsxml = get_class(virt)(test_dom, vcpus = test_vcpus, mac = test_mac, \ disk = test_disk) - if (os.path.exists(back_disk_file)): - os.unlink(back_disk_file) + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + return status - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() bridge = vsxml.set_vbridge(options.ip) ret = vsxml.define(options.ip) if not ret: @@ -599,7 +557,7 @@ Keyname.------") Globals.logger.error("------FAILED: Invalid System creationclassname\ Keyvalue.------") return ret - clean_up_restore(options.ip) + cleanup_restore() vsxml.undefine(options.ip) return PASS if __name__ == "__main__":

3 4

[PATCH] [TEST] #2 updating 03_reverse_errs.py, 04_forward_errs.py
by Deepti B. Kalakeri 30 Apr '08

30 Apr '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1209557135 25200 # Node ID e6d5ae1eac5c3b25441f77ecb40c074efacee1a3 # Parent b3969776fb077e2575effe7cd3c914778d86b63c [TEST] #2 updating 03_reverse_errs.py, 04_forward_errs.py 1) To use lib fn conf_file(), cleanup_restore() and create_diskpool_file() 2) Addressed Indentation. 3) Tested on latest source for Xen, XenFV, KVM. 4) Tested with binary rpm on F9 and include the revision string for 03_reverse_errs.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r b3969776fb07 -r e6d5ae1eac5c suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Tue Apr 29 01:44:18 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Wed Apr 30 05:05:35 2008 -0700 @@ -29,67 +29,38 @@ # Date : 30-12-2007 import sys -import os -from distutils.file_util import move_file import pywbem from XenKvmLib import assoc from CimTest import Globals from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.common_util import try_assoc +from XenKvmLib.const import CIM_REV from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main, platform_sup, logger from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file bug_no = "88651" test_dom = "hd_domain" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 -id1 = "DiskPool/foo" +id1 = "DiskPool/%s" %test_dpath id2 = "MemoryPool/0" id3 = "NetworkPool/xenbr0" id4 = "ProcessorPool/0" -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "02_reverse" expr_values = { "invalid_keyname" : { - 'rc' : pywbem.CIM_ERR_FAILED, \ + 'rc' : pywbem.CIM_ERR_FAILED, 'desc' : 'Missing InstanceID' - }, \ + }, "invalid_keyvalue" : { - 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ + 'rc' : pywbem.CIM_ERR_NOT_FOUND, 'desc' : 'No such instance' } } - -def conf_file(): - """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - sys.exit(status) - -def clean_up_restore(ip): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - vsxml.undefine(ip) - sys.exit(status) +libvirt_rev = 393 def err_invalid_ccname(): # This is used to verify the that the @@ -118,9 +89,9 @@ def err_invalid_ccname(): for classname, instdid in sorted(lelist.items()): keys = { "InstanceID" : instdid} - field = "ClassName" - status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, \ - expr_values=expr_values['invalid_keyvalue'], bug_no="") + field = "InvalidClassName" + status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, + expr_values=expr_values['invalid_keyvalue'],bug_no=bug_no) if status != PASS: break return status @@ -153,8 +124,8 @@ def err_invalid_keyname(): for classname, instdid in sorted(lelist.items()): keys = { "InvalidID" : instdid } field = "InstanceID_KeyName" - status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, \ - expr_values=expr_values['invalid_keyname'], bug_no="") + status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, + expr_values=expr_values['invalid_keyname'], bug_no="") if status != PASS: break return status @@ -186,14 +157,23 @@ def err_invalid_keyvalue(): get_typed_class(virt, "ProcessorPool") ] + if CIM_REV < libvirt_rev: + expr_values['invalid_keyvalue']['desc'] = 'Invalid InstanceID or unsupported pool type' + expr_values['invalid_keyvalue']['rc'] = pywbem.CIM_ERR_FAILED + for classname in sorted(lelist): keys = { "InstanceID" : "InvalidKeyValue" } field = "InstanceID_KeyValue" - status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, \ - expr_values=expr_values['invalid_keyvalue'], bug_no="") + status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, + expr_values=expr_values['invalid_keyvalue'], bug_no="") if status != PASS: break return status + +def clean_and_exit(server, msg): + logger.error("------FAILED: Invalid %s.------", msg) + cleanup_restore() + vsxml.undefine(server) @do_main(platform_sup) def main(): @@ -209,38 +189,38 @@ def main(): test_disk = "xvda" else: test_disk = "hda" + virt_type = get_class(virt) + vsxml = virt_type (test_dom, vcpus = test_vcpus, mac = test_mac, + disk = test_disk) - vsxml = get_class(virt)(test_dom, vcpus = test_vcpus, mac = test_mac, \ - disk = test_disk) - if (os.path.exists(back_disk_file)): - os.unlink(back_disk_file) - - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + return status ret = vsxml.define(options.ip) if not ret: - Globals.logger.error("Failed to define the dom: %s", test_dom) + logger.error("Failed to define the dom: %s", test_dom) return FAIL conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (Globals.CIM_USER, Globals.CIM_PASS), + Globals.CIM_NS) assoc_classname = get_typed_class(virt, "ElementAllocatedFromPool") ret = err_invalid_keyname() - if ret: - Globals.logger.error("------FAILED: Invalid KeyName.------") + if ret != PASS: + clean_and_exit(options.ip, "KeyName") return ret + ret = err_invalid_keyvalue() - if ret: - Globals.logger.error("------FAILED: Invalid KeyValue.------") + if ret != PASS: + clean_and_exit(options.ip, "KeyValue") return ret + ret = err_invalid_ccname() - if ret: - Globals.logger.error("------FAILED: Invalid CCName.------") + if ret != PASS: + clean_and_exit(options.ip, "CCName") return ret - clean_up_restore(options.ip) + + cleanup_restore() vsxml.undefine(options.ip) return PASS if __name__ == "__main__": diff -r b3969776fb07 -r e6d5ae1eac5c suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Tue Apr 29 01:44:18 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Wed Apr 30 05:05:35 2008 -0700 @@ -29,8 +29,6 @@ # import sys -import os -from distutils.file_util import move_file import pywbem from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc @@ -41,6 +39,8 @@ from CimTest.Globals import do_main, pla from CimTest.Globals import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file sup_types = ['Xen', 'KVM', 'XenFV'] bug_no = "88651" @@ -49,49 +49,16 @@ test_mac = "00:11:22:33:44:aa" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 exp_list = [ - {'desc' : "No such instance (SystemName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, \ - {'desc' : "No DeviceID specified", 'rc' : pywbem.CIM_ERR_FAILED}, \ - {'desc' : "No such instance", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, \ - {'desc' : "One or more parameter values passed to the method were invalid", \ - 'rc' : pywbem.CIM_ERR_INVALID_PARAMETER}, \ - {'desc' : "No such instance (CreationClassName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND }, \ - {'desc' : "No such instance (SystemCreationClassName)", 'rc' : \ - pywbem.CIM_ERR_NOT_FOUND }, + {'desc' : "No such instance (SystemName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, + {'desc' : "No DeviceID specified", 'rc' : pywbem.CIM_ERR_FAILED}, + {'desc' : "No such instance", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, + {'desc' : "CIM_ERR_INVALID_PARAMETER", + 'rc' : pywbem.CIM_ERR_INVALID_PARAMETER}, + {'desc' : "No such instance (CreationClassName)", + 'rc' : pywbem.CIM_ERR_NOT_FOUND }, + {'desc' : "No such instance (SystemCreationClassName)", + 'rc' : pywbem.CIM_ERR_NOT_FOUND }, ] - - -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "02_reverse" - - -def conf_file(): - """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - sys.exit(status) - -def clean_up_restore(ip): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - vsxml.undefine(ip) - sys.exit(status) def try_assoc(conn, exp_ret, dev_dom_name, invalid_keyname_list, test_vals, log_msg): @@ -102,9 +69,9 @@ def try_assoc(conn, exp_ret, dev_dom_nam procid = "%s/%s" % (dev_dom_name, 0) lelist = { - get_typed_class(virt, "LogicalDisk") : diskid, \ - get_typed_class(virt, "NetworkPort") : netid, \ - get_typed_class(virt, "Memory" ) : memid, \ + get_typed_class(virt, "LogicalDisk") : diskid, + get_typed_class(virt, "NetworkPort") : netid, + get_typed_class(virt, "Memory" ) : memid, get_typed_class(virt, "Processor" ) : procid } @@ -125,9 +92,9 @@ def try_assoc(conn, exp_ret, dev_dom_nam else: snkeyname = "SystemName" - test_keys = { devkeyname : devkeyname, \ - ccnkeyname : ccnkeyname, \ - sccnkeyname : sccnkeyname, \ + test_keys = { devkeyname : devkeyname, + ccnkeyname : ccnkeyname, + sccnkeyname : sccnkeyname, snkeyname : snkeyname } for cn, devid in sorted(lelist.items()): @@ -142,20 +109,19 @@ def try_assoc(conn, exp_ret, dev_dom_nam else: ccn = cn - keys = { test_keys[devkeyname] : dev_id, \ - test_keys[ccnkeyname] : ccn, \ - test_keys[sccnkeyname] : test_vals['sccn'], \ - test_keys[snkeyname] : test_vals['sn'] + keys = { test_keys[devkeyname] : dev_id, + test_keys[ccnkeyname] : ccn, + test_keys[sccnkeyname] : test_vals['sccn'], + test_keys[snkeyname] : test_vals['sn'] } - if test_vals['cn'] != "valid": inst_cn = "InvalidClassName" else: inst_cn = cn instanceref = CIMInstanceName(inst_cn, keybindings=keys) try: - assoc_info = conn.AssociatorNames(instanceref, \ - AssocClass=assoc_classname) + assoc_info = conn.AssociatorNames(instanceref, + AssocClass=assoc_classname) except pywbem.CIMError, (err_no, desc): if err_no == exp_ret['rc'] and desc.find(exp_ret['desc']) >= 0: logger.info("Got expected exception where ") @@ -196,22 +162,21 @@ def err_invalid_sysname_keyname(conn, ex # # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "invalid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "invalid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid SystemName Key Name was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_sysname_keyvalue(conn, exp_ret): @@ -232,22 +197,21 @@ def err_invalid_sysname_keyvalue(conn, e # # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : "invalid", \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : "invalid", + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Non-existing SystemName was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_devid_keyname(conn, exp_ret): # This is used to verify the that the @@ -271,22 +235,21 @@ def err_invalid_devid_keyname(conn, exp_ # # - test_keys = { 'DeviceID' : "invalid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "invalid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid deviceid keyname was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_devid_keyvalue(conn, exp_ret): @@ -309,22 +272,22 @@ def err_invalid_devid_keyvalue(conn, exp # Similarly we check for Network. # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "invalid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "invalid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid deviceid keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom_invalid, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom_invalid, test_keys, test_vals, + log_msg) def err_invalid_classname(conn, exp_ret): @@ -348,22 +311,21 @@ def err_invalid_classname(conn, exp_ret) # Similarly we check for Memory,Network,Processor. # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "invalid" } log_msg = "Invalid classname value was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_creationclassname_keyname(conn, exp_ret): @@ -388,22 +350,21 @@ def err_invalid_creationclassname_keynam # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "invalid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "invalid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid creationclassname keyname was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_creationclassname_keyvalue(conn, exp_ret): @@ -426,22 +387,21 @@ def err_invalid_creationclassname_keyval # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "invalid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "invalid", 'cn' : "valid" } log_msg = "Invalid creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_syscreationclassname_keyname(conn, exp_ret): @@ -464,22 +424,21 @@ def err_invalid_syscreationclassname_key # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "invalid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "invalid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid system creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_syscreationclassname_keyvalue(conn, exp_ret): @@ -502,22 +461,26 @@ def err_invalid_syscreationclassname_key # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : "invalid", \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : "invalid", + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid system creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) + +def clean_and_exit(server, msg): + logger.error("------FAILED: Invalid %s.------", msg) + cleanup_restore() + vsxml.undefine(server) @do_main(platform_sup) def main(): @@ -539,67 +502,67 @@ def main(): destroy_and_undefine_all(options.ip) vsxml = get_class(virt)(test_dom, vcpus = test_vcpus, mac = test_mac, \ disk = test_disk) - if (os.path.exists(back_disk_file)): - os.unlink(back_disk_file) + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + return status - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() bridge = vsxml.set_vbridge(options.ip) ret = vsxml.define(options.ip) if not ret: - Globals.logger.error("Failed to define the dom: %s", test_dom) + logger.error("Failed to define the dom: %s", test_dom) return FAIL conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), Globals.CIM_NS) assoc_classname = get_typed_class(virt, "ElementAllocatedFromPool") + ret = err_invalid_sysname_keyname(conn, exp_list[0]) - if ret: - Globals.logger.error("------FAILED: Invalid SystemName Key Name.------") + if ret != PASS: + clean_and_exit(options.ip, "SystemName KeyName") return ret + ret = err_invalid_sysname_keyvalue(conn, exp_list[0]) - if ret: - Globals.logger.error("------FAILED: Invalid SystemName Key Value.------") + if ret != PASS: + clean_and_exit(options.ip, "SystemName Key Value") return ret + ret = err_invalid_devid_keyname(conn, exp_list[1]) - if ret: - Globals.logger.error("------FAILED: Invalid DeviceID \ -Keyname.------") + if ret != PASS: + clean_and_exit(options.ip, "DeviceID Keyname") return ret + ret = err_invalid_devid_keyvalue(conn, exp_list[2]) - if ret: - Globals.logger.error("------FAILED: Invalid DeviceID \ -Keyvalue.------") + if ret != PASS: + clean_and_exit(options.ip, "DeviceID Keyvalue") return ret + ret = err_invalid_classname(conn, exp_list[3]) - if ret: - Globals.logger.error("------FAILED: Invalid classname\ -Keyname.------") + if ret != PASS: + clean_and_exit(options.ip, "classname Keyname") return ret + ret = err_invalid_creationclassname_keyname(conn, exp_list[4]) - if ret: - Globals.logger.error("------FAILED: Invalid creationclassname\ -Keyname.------") + if ret != PASS: + clean_and_exit(options.ip, "creationclassname Keyname") return ret + ret = err_invalid_creationclassname_keyvalue(conn, exp_list[4]) - if ret: - Globals.logger.error("------FAILED: Invalid creationclassname\ -Keyvalue.------") + if ret != PASS: + clean_and_exit(options.ip, "creationclassname Keyvalue") return ret + ret = err_invalid_syscreationclassname_keyname(conn, exp_list[5]) - if ret: - Globals.logger.error("------FAILED: Invalid System creationclassname\ -Keyname.------") + if ret != PASS: + clean_and_exit(options.ip, "System creationclassname Keyname") return ret + ret = err_invalid_syscreationclassname_keyvalue(conn, exp_list[5]) - if ret: - Globals.logger.error("------FAILED: Invalid System creationclassname\ -Keyvalue.------") + if ret != PASS: + clean_and_exit(options.ip, "System creationclassname Keyvalue") return ret - clean_up_restore(options.ip) + + cleanup_restore() vsxml.undefine(options.ip) return PASS if __name__ == "__main__":

1 0

[PATCH] [TEST] resent the patch for indication_tester.py to reflect the recent changes of libcmpiutil vesion
by Guo Lian Yun 30 Apr '08

30 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1209517619 25200 # Node ID 16f8e0e2e062dba78ac06d5226f0d620a152e5e1 # Parent b3969776fb077e2575effe7cd3c914778d86b63c [TEST] resent the patch for indication_tester.py to reflect the recent changes of libcmpiutil vesion Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r b3969776fb07 -r 16f8e0e2e062 suites/libvirt-cim/lib/XenKvmLib/indication_tester.py --- a/suites/libvirt-cim/lib/XenKvmLib/indication_tester.py Tue Apr 29 01:44:18 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/indication_tester.py Tue Apr 29 18:06:59 2008 -0700 @@ -395,9 +395,9 @@ def main(): action="store_true", help="Print received indications to stdout.") parser.add_option("-U", "--user", dest="username", default=None, - help="HTTP Auth username", dest="username") + help="HTTP Auth username") parser.add_option("-P", "--pass", dest="password", default=None, - help="HTTP Auth password", dest="password") + help="HTTP Auth password") (options, args) = parser.parse_args()

1 0

[PATCH] [TEST] modified the revision number to 417 and resent the patch of VSSDC.03
by Guo Lian Yun 30 Apr '08

30 Apr '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1209517323 25200 # Node ID cced18eccc5a4fde264f973d14dce154b6a750da # Parent b3969776fb077e2575effe7cd3c914778d86b63c [TEST] modified the revision number to 417 and resent the patch of VSSDC.03 Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r b3969776fb07 -r cced18eccc5a suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Tue Apr 29 01:44:18 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/03_vssdc_fwd_errs.py Tue Apr 29 18:02:03 2008 -0700 @@ -62,12 +62,14 @@ from CimTest.ReturnCodes import PASS, FA from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import do_main, logger from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS +from XenKvmLib.const import CIM_REV sup_types = ['Xen', 'XenFV', 'KVM'] test_dom = "domu1" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 +rev = 417 expr_values = { "INVALID_InstID_Keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \ @@ -75,6 +77,10 @@ expr_values = { "INVALID_InstID_Keyval" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ 'desc' : 'No such instance (INVALID_InstID_Keyval)'} } + +if CIM_REV < rev: + expr_values['INVALID_InstID_Keyval'] = {'rc' : pywbem.CIM_ERR_FAILED, \ + 'desc' : 'Invalid InstanceID'} def try_invalid_assoc(classname, name_val, i, field, virt="Xen"): ac_classname = get_typed_class(virt, "VirtualSystemSettingDataComponent")

1 0

[PATCH] [TEST] updating 03_reverse_errs.py, 04_forward_errs.py
by Deepti B. Kalakeri 29 Apr '08

29 Apr '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1209473865 25200 # Node ID 5bcadaf4ab9957800fce7a564ef4f13851fcf5c8 # Parent 2b83c1992dfc44573ba0c00729e36311355807ad [TEST] updating 03_reverse_errs.py, 04_forward_errs.py 1) To use lib fn conf_file(), cleanup_restore() and create_diskpool_file() 2) Addressed Indentation. 3) Tested on latest source for Xen, XenFV, KVM. 4) Need to test with binary rpm on F9 and include the revision string for 04_forward_errs.py. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 2b83c1992dfc -r 5bcadaf4ab99 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Sun Apr 27 19:22:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/03_reverse_errs.py Tue Apr 29 05:57:45 2008 -0700 @@ -29,29 +29,26 @@ # Date : 30-12-2007 import sys -import os -from distutils.file_util import move_file import pywbem from XenKvmLib import assoc from CimTest import Globals from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib.common_util import try_assoc from CimTest.ReturnCodes import PASS, FAIL -from CimTest.Globals import do_main, platform_sup +from CimTest.Globals import do_main, platform_sup, logger from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file bug_no = "88651" test_dom = "hd_domain" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 -id1 = "DiskPool/foo" +id1 = "DiskPool/%s" %test_dpath id2 = "MemoryPool/0" id3 = "NetworkPool/xenbr0" id4 = "ProcessorPool/0" -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "02_reverse" expr_values = { "invalid_keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \ @@ -62,34 +59,6 @@ expr_values = { 'desc' : 'No such instance' } } - -def conf_file(): - """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - sys.exit(status) - -def clean_up_restore(ip): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - vsxml.undefine(ip) - sys.exit(status) def err_invalid_ccname(): # This is used to verify the that the @@ -119,8 +88,8 @@ def err_invalid_ccname(): for classname, instdid in sorted(lelist.items()): keys = { "InstanceID" : instdid} field = "ClassName" - status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, \ - expr_values=expr_values['invalid_keyvalue'], bug_no="") + status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, + expr_values=expr_values['invalid_keyvalue'], bug_no="") if status != PASS: break return status @@ -153,8 +122,8 @@ def err_invalid_keyname(): for classname, instdid in sorted(lelist.items()): keys = { "InvalidID" : instdid } field = "InstanceID_KeyName" - status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, \ - expr_values=expr_values['invalid_keyname'], bug_no="") + status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, + expr_values=expr_values['invalid_keyname'], bug_no="") if status != PASS: break return status @@ -189,8 +158,8 @@ def err_invalid_keyvalue(): for classname in sorted(lelist): keys = { "InstanceID" : "InvalidKeyValue" } field = "InstanceID_KeyValue" - status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, \ - expr_values=expr_values['invalid_keyvalue'], bug_no="") + status = try_assoc(conn, classname, assoc_classname, keys, field_name=field, + expr_values=expr_values['invalid_keyvalue'], bug_no="") if status != PASS: break return status @@ -209,38 +178,36 @@ def main(): test_disk = "xvda" else: test_disk = "hda" + virt_type = get_class(virt) + vsxml = virt_type (test_dom, vcpus = test_vcpus, mac = test_mac, + disk = test_disk) - vsxml = get_class(virt)(test_dom, vcpus = test_vcpus, mac = test_mac, \ - disk = test_disk) - if (os.path.exists(back_disk_file)): - os.unlink(back_disk_file) + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + return status - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() ret = vsxml.define(options.ip) if not ret: - Globals.logger.error("Failed to define the dom: %s", test_dom) + logger.error("Failed to define the dom: %s", test_dom) return FAIL conn = assoc.myWBEMConnection('http://%s' % options.ip, - (Globals.CIM_USER, Globals.CIM_PASS), - Globals.CIM_NS) + (Globals.CIM_USER, Globals.CIM_PASS), + Globals.CIM_NS) assoc_classname = get_typed_class(virt, "ElementAllocatedFromPool") ret = err_invalid_keyname() if ret: - Globals.logger.error("------FAILED: Invalid KeyName.------") + logger.error("------FAILED: Invalid KeyName.------") return ret ret = err_invalid_keyvalue() if ret: - Globals.logger.error("------FAILED: Invalid KeyValue.------") + logger.error("------FAILED: Invalid KeyValue.------") return ret ret = err_invalid_ccname() if ret: - Globals.logger.error("------FAILED: Invalid CCName.------") + logger.error("------FAILED: Invalid CCName.------") return ret - clean_up_restore(options.ip) + cleanup_restore() vsxml.undefine(options.ip) return PASS if __name__ == "__main__": diff -r 2b83c1992dfc -r 5bcadaf4ab99 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Sun Apr 27 19:22:03 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/04_forward_errs.py Tue Apr 29 05:57:45 2008 -0700 @@ -29,8 +29,6 @@ # import sys -import os -from distutils.file_util import move_file import pywbem from pywbem.cim_obj import CIMInstanceName from XenKvmLib import assoc @@ -41,6 +39,8 @@ from CimTest.Globals import do_main, pla from CimTest.Globals import do_main, platform_sup from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import cleanup_restore, test_dpath, \ +create_diskpool_file sup_types = ['Xen', 'KVM', 'XenFV'] bug_no = "88651" @@ -49,49 +49,16 @@ test_mac = "00:11:22:33:44:aa" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 exp_list = [ - {'desc' : "No such instance (SystemName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, \ - {'desc' : "No DeviceID specified", 'rc' : pywbem.CIM_ERR_FAILED}, \ - {'desc' : "No such instance", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, \ - {'desc' : "One or more parameter values passed to the method were invalid", \ - 'rc' : pywbem.CIM_ERR_INVALID_PARAMETER}, \ - {'desc' : "No such instance (CreationClassName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND }, \ - {'desc' : "No such instance (SystemCreationClassName)", 'rc' : \ - pywbem.CIM_ERR_NOT_FOUND }, + {'desc' : "No such instance (SystemName)", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, + {'desc' : "No DeviceID specified", 'rc' : pywbem.CIM_ERR_FAILED}, + {'desc' : "No such instance", 'rc' : pywbem.CIM_ERR_NOT_FOUND}, + {'desc' : "CIM_ERR_INVALID_PARAMETER", + 'rc' : pywbem.CIM_ERR_INVALID_PARAMETER}, + {'desc' : "No such instance (CreationClassName)", + 'rc' : pywbem.CIM_ERR_NOT_FOUND }, + {'desc' : "No such instance (SystemCreationClassName)", + 'rc' : pywbem.CIM_ERR_NOT_FOUND }, ] - - -test_dpath = "foo" -disk_file = '/tmp/diskpool.conf' -back_disk_file = disk_file + "." + "02_reverse" - - -def conf_file(): - """ - Creating diskpool.conf file. - """ - try: - f = open(disk_file, 'w') - f.write('%s %s' % (test_dpath, '/')) - f.close() - except Exception,detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - sys.exit(status) - -def clean_up_restore(ip): - """ - Restoring back the original diskpool.conf - file. - """ - try: - if os.path.exists(back_disk_file): - os.remove(disk_file) - move_file(back_disk_file, disk_file) - except Exception, detail: - Globals.logger.error("Exception: %s", detail) - status = FAIL - vsxml.undefine(ip) - sys.exit(status) def try_assoc(conn, exp_ret, dev_dom_name, invalid_keyname_list, test_vals, log_msg): @@ -102,9 +69,9 @@ def try_assoc(conn, exp_ret, dev_dom_nam procid = "%s/%s" % (dev_dom_name, 0) lelist = { - get_typed_class(virt, "LogicalDisk") : diskid, \ - get_typed_class(virt, "NetworkPort") : netid, \ - get_typed_class(virt, "Memory" ) : memid, \ + get_typed_class(virt, "LogicalDisk") : diskid, + get_typed_class(virt, "NetworkPort") : netid, + get_typed_class(virt, "Memory" ) : memid, get_typed_class(virt, "Processor" ) : procid } @@ -125,9 +92,9 @@ def try_assoc(conn, exp_ret, dev_dom_nam else: snkeyname = "SystemName" - test_keys = { devkeyname : devkeyname, \ - ccnkeyname : ccnkeyname, \ - sccnkeyname : sccnkeyname, \ + test_keys = { devkeyname : devkeyname, + ccnkeyname : ccnkeyname, + sccnkeyname : sccnkeyname, snkeyname : snkeyname } for cn, devid in sorted(lelist.items()): @@ -142,20 +109,20 @@ def try_assoc(conn, exp_ret, dev_dom_nam else: ccn = cn - keys = { test_keys[devkeyname] : dev_id, \ - test_keys[ccnkeyname] : ccn, \ - test_keys[sccnkeyname] : test_vals['sccn'], \ - test_keys[snkeyname] : test_vals['sn'] + keys = { test_keys[devkeyname] : dev_id, + test_keys[ccnkeyname] : ccn, + test_keys[sccnkeyname] : test_vals['sccn'], + test_keys[snkeyname] : test_vals['sn'] } - + print "test_keys", keys if test_vals['cn'] != "valid": inst_cn = "InvalidClassName" else: inst_cn = cn instanceref = CIMInstanceName(inst_cn, keybindings=keys) try: - assoc_info = conn.AssociatorNames(instanceref, \ - AssocClass=assoc_classname) + assoc_info = conn.AssociatorNames(instanceref, + AssocClass=assoc_classname) except pywbem.CIMError, (err_no, desc): if err_no == exp_ret['rc'] and desc.find(exp_ret['desc']) >= 0: logger.info("Got expected exception where ") @@ -165,6 +132,7 @@ def try_assoc(conn, exp_ret, dev_dom_nam logger.error("Unexpected rc code %s and description \ %s\n" %(err_no, desc)) status = FAIL + print "assos", assoc_info if len(assoc_info) != 0: logger.error("%s association \ should NOT have returned records. '%s'", assoc_classname, log_msg) @@ -196,22 +164,21 @@ def err_invalid_sysname_keyname(conn, ex # # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "invalid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "invalid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid SystemName Key Name was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_sysname_keyvalue(conn, exp_ret): @@ -232,22 +199,21 @@ def err_invalid_sysname_keyvalue(conn, e # # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : "invalid", \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : "invalid", + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Non-existing SystemName was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_devid_keyname(conn, exp_ret): # This is used to verify the that the @@ -271,22 +237,21 @@ def err_invalid_devid_keyname(conn, exp_ # # - test_keys = { 'DeviceID' : "invalid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "invalid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid deviceid keyname was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_devid_keyvalue(conn, exp_ret): @@ -309,22 +274,22 @@ def err_invalid_devid_keyvalue(conn, exp # Similarly we check for Network. # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "invalid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "invalid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid deviceid keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom_invalid, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom_invalid, test_keys, test_vals, + log_msg) def err_invalid_classname(conn, exp_ret): @@ -348,22 +313,21 @@ def err_invalid_classname(conn, exp_ret) # Similarly we check for Memory,Network,Processor. # # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "invalid" } log_msg = "Invalid classname value was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_creationclassname_keyname(conn, exp_ret): @@ -388,22 +352,21 @@ def err_invalid_creationclassname_keynam # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "invalid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "invalid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid creationclassname keyname was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_creationclassname_keyvalue(conn, exp_ret): @@ -426,22 +389,21 @@ def err_invalid_creationclassname_keyval # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "invalid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "invalid", 'cn' : "valid" } log_msg = "Invalid creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_syscreationclassname_keyname(conn, exp_ret): @@ -464,22 +426,21 @@ def err_invalid_syscreationclassname_key # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "invalid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "invalid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : get_typed_class(virt, "ComputerSystem"), \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : get_typed_class(virt, "ComputerSystem"), + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid system creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) def err_invalid_syscreationclassname_keyvalue(conn, exp_ret): @@ -502,22 +463,21 @@ def err_invalid_syscreationclassname_key # Similarly we check for Memory,Network,Processor. # - test_keys = { 'DeviceID' : "valid", \ - 'CreationClassName' : "valid", \ - 'SystemCreationClassName' : "valid", \ - 'SystemName' : "valid" \ + test_keys = { 'DeviceID' : "valid", + 'CreationClassName' : "valid", + 'SystemCreationClassName' : "valid", + 'SystemName' : "valid" } - test_vals = { 'devid' : "valid", \ - 'sccn' : "invalid", \ - 'sn' : test_dom, \ - 'ccn' : "valid", \ + test_vals = { 'devid' : "valid", + 'sccn' : "invalid", + 'sn' : test_dom, + 'ccn' : "valid", 'cn' : "valid" } log_msg = "Invalid system creatioclassname keyvalue was supplied." - return try_assoc(conn, exp_ret, test_dom, test_keys, \ - test_vals, log_msg) + return try_assoc(conn, exp_ret, test_dom, test_keys, test_vals, log_msg) @do_main(platform_sup) def main(): @@ -539,18 +499,15 @@ def main(): destroy_and_undefine_all(options.ip) vsxml = get_class(virt)(test_dom, vcpus = test_vcpus, mac = test_mac, \ disk = test_disk) - if (os.path.exists(back_disk_file)): - os.unlink(back_disk_file) + # Verify DiskPool on machine + status = create_diskpool_file() + if status != PASS: + return status - if not (os.path.exists(disk_file)): - conf_file() - else: - move_file(disk_file, back_disk_file) - conf_file() bridge = vsxml.set_vbridge(options.ip) ret = vsxml.define(options.ip) if not ret: - Globals.logger.error("Failed to define the dom: %s", test_dom) + logger.error("Failed to define the dom: %s", test_dom) return FAIL conn = assoc.myWBEMConnection('http://%s' % options.ip, (Globals.CIM_USER, Globals.CIM_PASS), @@ -558,48 +515,48 @@ def main(): assoc_classname = get_typed_class(virt, "ElementAllocatedFromPool") ret = err_invalid_sysname_keyname(conn, exp_list[0]) if ret: - Globals.logger.error("------FAILED: Invalid SystemName Key Name.------") + logger.error("------FAILED: Invalid SystemName Key Name.------") return ret ret = err_invalid_sysname_keyvalue(conn, exp_list[0]) if ret: - Globals.logger.error("------FAILED: Invalid SystemName Key Value.------") + logger.error("------FAILED: Invalid SystemName Key Value.------") return ret ret = err_invalid_devid_keyname(conn, exp_list[1]) if ret: - Globals.logger.error("------FAILED: Invalid DeviceID \ + logger.error("------FAILED: Invalid DeviceID \ Keyname.------") return ret ret = err_invalid_devid_keyvalue(conn, exp_list[2]) if ret: - Globals.logger.error("------FAILED: Invalid DeviceID \ + logger.error("------FAILED: Invalid DeviceID \ Keyvalue.------") return ret ret = err_invalid_classname(conn, exp_list[3]) if ret: - Globals.logger.error("------FAILED: Invalid classname\ + logger.error("------FAILED: Invalid classname\ Keyname.------") return ret ret = err_invalid_creationclassname_keyname(conn, exp_list[4]) if ret: - Globals.logger.error("------FAILED: Invalid creationclassname\ + logger.error("------FAILED: Invalid creationclassname\ Keyname.------") return ret ret = err_invalid_creationclassname_keyvalue(conn, exp_list[4]) if ret: - Globals.logger.error("------FAILED: Invalid creationclassname\ + logger.error("------FAILED: Invalid creationclassname\ Keyvalue.------") return ret ret = err_invalid_syscreationclassname_keyname(conn, exp_list[5]) if ret: - Globals.logger.error("------FAILED: Invalid System creationclassname\ + logger.error("------FAILED: Invalid System creationclassname\ Keyname.------") return ret ret = err_invalid_syscreationclassname_keyvalue(conn, exp_list[5]) if ret: - Globals.logger.error("------FAILED: Invalid System creationclassname\ + logger.error("------FAILED: Invalid System creationclassname\ Keyvalue.------") return ret - clean_up_restore(options.ip) + cleanup_restore() vsxml.undefine(options.ip) return PASS if __name__ == "__main__":

2 1