July 2008 - CIM - libvirt List Archives

[PATCH] [TEST] #3 Fix CS 22 to use providers instead of virsh
by Kaitlin Rupert 23 Jul '08

23 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216661611 25200 # Node ID abcd4c8a873656b6f12c4416832d185f8c9eb151 # Parent 18d3c235f0c893f934aaf61f9a1de22ed6f3dd60 [TEST] #3 Fix CS 22 to use providers instead of virsh. This test was defining a guest with virsh and then suspending it with virsh, which doesn't touch the providers in anyway. Now the test calls DefineSystem() and RequestStateChange(). Updates from 1 to 2: -Add check to verify guest is the expected state after the RequestStateChange() call. -Create a network pool because the VSMS provider requires a network pool to exist in order to create a guest. Updates from 2 to 3: -Remove destroy_netpool() if create_netpool_conf() fails. This is not needed. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 18d3c235f0c8 -r abcd4c8a8736 suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Mon Jul 21 09:51:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Mon Jul 21 10:33:31 2008 -0700 @@ -32,54 +32,71 @@ from XenKvmLib import computersystem from VirtLib import utils from XenKvmLib import vxml -from XenKvmLib.test_doms import destroy_and_undefine_all -from CimTest.Globals import do_main -from CimTest import Globals +from XenKvmLib.test_doms import destroy_and_undefine_domain +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import create_using_definesystem, \ + call_request_state_change, get_cs_instance, \ + create_netpool_conf, destroy_netpool sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domgst" +DEFINE_STATE = 3 +SUSPND_STATE = 9 +TIME = "00000000000000.000000:000" + +def chk_state(domain_name, ip, en_state, virt): + rc, cs = get_cs_instance(domain_name, ip, virt) + if rc != 0: + return rc + + if cs.EnabledState != en_state: + logger.error("EnabledState should be %d not %d", + en_state, cs.EnabledState) + return FAIL + + return PASS + @do_main(sup_types) def main(): options = main.options - status = FAIL - - cxml = vxml.get_class(options.virt)(test_dom) -#define VS + status, test_network = create_netpool_conf(options.ip, options.virt) + if status != PASS: + return FAIL + try: - ret = cxml.define(options.ip) - if not ret: - Globals.logger.error(Globals.VIRSH_ERROR_DEFINE % test_dom) - return status - - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) - if not (cs.Name == test_dom) : - Globals.logger.error("Error: VS %s not found" % test_dom) - cxml.undefine(options.ip) + # define the vs + status = create_using_definesystem(test_dom, options.ip, + virt=options.virt) + if status != PASS: + logger.error("Unable to define %s using DefineSystem()" % test_dom) + destroy_netpool(options.ip, options.virt, test_network) return status - except Exception, detail: - Globals.logger.error("Errors: %s" % detail) + # suspend the vs + status = call_request_state_change(test_dom, options.ip, SUSPND_STATE, + TIME, virt=options.virt) + if status != PASS: + logger.info("Suspending defined %s failed, as expected" % test_dom) + status = PASS -#Suspend the defined VS - - try: - ret = cxml.run_virsh_cmd(options.ip, "suspend") - if not ret : - Globals.logger.info("Suspending defined VS %s failed, as expected" \ -% test_dom) - status = PASS + status = chk_state(test_dom, options.ip, DEFINE_STATE, options.virt) + if status != PASS: + logger.error("%s not in defined state as expected." % test_dom) + status = FAIL + else : - Globals.logger.info("Error: Suspending defined VS %s should not \ -have been allowed" % test_dom) + logger.error("Suspending defined %s should have failed" % test_dom) status = FAIL except Exception, detail: - Globals.logger.error("Error: %s" % detail) + logger.error("Error: %s" % detail) + status = FAIL - ret = cxml.undefine(options.ip) + destroy_netpool(options.ip, options.virt, test_network) + destroy_and_undefine_domain(test_dom, options.ip, options.virt) return status if __name__ == "__main__":

3 3

[PATCH] [TEST] #2 Enabling 02_reverse.py with XenFV, KVM, LXC and modified logicaldevices.py to work for all virt types
by Deepti B. Kalakeri 22 Jul '08

22 Jul '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1216734147 25200 # Node ID 6d1ac5c3497b95a230217f8c5f8b226c07fb1b31 # Parent 3703b7be5a107c67e901546978e974546b3d5562 [TEST] #2 Enabling 02_reverse.py with XenFV, KVM, LXC and modified logicaldevices.py to work for all virt types. Changes: ------- Patch 2: ------- 1) Added the missing cleanup_restore() fn in the tc. In logicaldevices library: -------------------------- 1) Moved the common code from verify_proc_values(), verify_net_values(), verify_disk_values(), verify_mem_values() to verify_device_values(). 2) Eliminated verify_proc_values() since it did not require any processor specific checks apart from the ones included in verify_device_values(). Patch 1: -------- 1) Removed unnecessary import statements. 2) Updated verify_proc_values, verify_mem_values, verify_net_values, verify_disk_values function of logicaldevices to work with all virt types. 3) Used verify_proc_values, verify_mem_values, verify_net_values, verify_disk_values fn. 4) Removed conf_file(), clean_up_restore(), get_or_bail(), print_error(), init_list(), get_spec_fields_list(), assoc_values() fns. 5) Removed global status variable. 6) Added verify_eafp_values(), init_pllist(), create_diskpool_conf() fn. 7) Included create_diskpool_conf(), cleanup_restore() fn. Tested on KVM on rpm, KVM current sources, LXC, XenFV, Xen. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 3703b7be5a10 -r 6d1ac5c3497b suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Wed Jul 16 07:23:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Tue Jul 22 06:42:27 2008 -0700 @@ -20,9 +20,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - # This tc is used to verify the classname, InstanceID and certian prop are -# are appropriately set for the domains when verified using the +# appropriately set for the domains when verified using the # Xen_ElementAllocatedFromPool asscoiation. # # Example command for LogicalDisk w.r.t to Xen_ElementAllocatedFromPool \ @@ -47,111 +46,79 @@ import sys import os -from distutils.file_util import move_file import pywbem -from VirtLib import utils -from VirtLib import live -from XenKvmLib import assoc -from XenKvmLib import enumclass -from CimTest import Globals -from CimTest.Globals import do_main -from CimTest.ReturnCodes import PASS, FAIL, SKIP -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.assoc import Associators +from XenKvmLib.vxml import get_class +from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORS +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.test_doms import destroy_and_undefine_all +from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import create_diskpool_conf, cleanup_restore +from XenKvmLib.logicaldevices import verify_device_values -sup_types = ['Xen'] +sup_types = ['Xen' , 'KVM', 'XenFV', 'LXC'] -status = PASS -test_dom = "hd_domain" +test_dom = "eafp_domain" test_mac = "00:11:22:33:44:aa" 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 init_pllist(virt, vsxml, diskid): + keys = { + 'MemoryPool' : 'MemoryPool/0', + } + if virt != 'LXC': + virt_network = vsxml.xml_get_net_network() + keys['DiskPool'] = diskid + keys['ProcessorPool'] = 'ProcessorPool/0' + keys['NetworkPool'] = 'NetworkPool/%s' %virt_network -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) - + pllist = { } + for cn, k in keys.iteritems(): + cn = get_typed_class(virt, cn) + pllist[cn] = k -def get_or_bail(ip, id, pool_class): - """ - Getinstance for the CLass and return instance on success, otherwise - exit after cleanup_restore and destroying the guest. - """ - key_list = { 'InstanceID' : id } - try: - instance = enumclass.getInstance(ip, pool_class, key_list) - except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, '%s', pool_class) - Globals.logger.error("Exception: %s", detail) - clean_up_restore(ip) - status = FAIL - ret = test_domain_function(test_dom, ip, \ - cmd = "destroy") - sys.exit(status) - return instance + return pllist -def print_error(field, ret_val, req_val): - Globals.logger.error("%s Mismatch", field) - Globals.logger.error("Returned %s instead of %s", ret_val, req_val) +def eafp_list(virt, test_disk): + mcn = get_typed_class(virt, "Memory") + mem = { + 'SystemName' : test_dom, + 'CreationClassName' : mcn, + 'DeviceID' : "%s/%s" % (test_dom, "mem"), + 'NumberOfBlocks' : test_mem * 1024 + } -def init_list(ip, disk, mem, net, proc): - """ - Creating the lists that will be used for comparisons. - """ + eaf_values = { mcn : mem } - pllist = { - "Xen_DiskPool" : disk.InstanceID, \ - "Xen_MemoryPool" : mem.InstanceID, \ - "Xen_NetworkPool" : net.InstanceID, \ - "Xen_ProcessorPool": proc.InstanceID - } - cllist = [ - "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, \ - "%s/%s" % (test_dom, test_mac), test_mac - ] - proc_prop = [] - for i in range(test_vcpus): - proc_prop.append("%s/%s" % (test_dom, i)) - return pllist, cllist, prop_list, proc_prop + if virt != 'LXC': + dcn = get_typed_class(virt, "LogicalDisk") + pcn = get_typed_class(virt, "Processor") + ncn = get_typed_class(virt, "NetworkPort") + + disk = { + 'SystemName' : test_dom, + 'CreationClassName' : dcn, + 'DeviceID' : "%s/%s" % (test_dom, test_disk), + 'Name' : test_disk + } + proc = { + 'SystemName' : test_dom, + 'CreationClassName' : pcn, + 'DeviceID' : None + } + net = { + 'SystemName' : test_dom, + 'CreationClassName' : ncn, + 'DeviceID' : "%s/%s" % (test_dom, test_mac), + 'NetworkAddresses' : test_mac + } + + eaf_values[pcn] = proc + eaf_values[dcn] = disk + eaf_values[ncn] = net + + return eaf_values def get_inst_for_dom(assoc_val): list = [] @@ -162,196 +129,85 @@ def get_inst_for_dom(assoc_val): return list -def get_spec_fields_list(inst_list, field_name): - 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)) - status = FAIL - return -# verifying the Name field for LogicalDisk - try: - if inst_list[0]['CreationClassName'] != 'Xen_Memory': - field_value = inst_list[0][field_name] - if field_name == 'NetworkAddresses': -# For network we NetworkAddresses is a list of addresses, since we -# are assigning only one address we are taking field_value[0] - field_value = field_value[0] - else: - field_value = ((int(inst_list[0]['NumberOfBlocks'])*4096)/1024) - specific_fields = { - "field_name" : field_name,\ - "field_value" : field_value - } - except Exception, detail: - Globals.logger.error("Exception in get_spec_fields_list(): %s", detail) - status = FAIL - return specific_fields +def verify_eafp_values(server, virt, in_pllist, test_disk): + # Looping through the in_pllist to get association for various pools. + eafp_values = eafp_list(virt, test_disk) + an = get_typed_class(virt, "ElementAllocatedFromPool") + for cn, instid in sorted(in_pllist.iteritems()): + try: + assoc_info = Associators(server, an, cn, virt, InstanceID = instid) + assoc_inst_list = get_inst_for_dom(assoc_info) + if len(assoc_inst_list) < 1 : + logger.error("'%s' with '%s' did not return any records for" + " domain: '%s'", an, cn, test_dom) + return FAIL -def assoc_values(assoc_list, field , list, index, specific_fields_list=""): - """ - Verifying the records retruned by the associations. - """ - global status - if field == "CreationClassName": - for i in range(len(assoc_list)): - if assoc_list[i][field] != list[index]: - print_error(field, assoc_list[i][field], list[index]) - status = FAIL + assoc_eafp_info = assoc_inst_list[0] + CCName = assoc_eafp_info['CreationClassName'] + if CCName == get_typed_class(virt, 'Processor'): + if len(assoc_inst_list) != test_vcpus: + logger.error("'%s' should have returned '%i' Processor" + " details, got '%i'", an, test_vcpus, + len(assoc_inst_list)) + return FAIL + + for i in range(test_vcpus): + eafp_values[CCName]['DeviceID'] = "%s/%s" % (test_dom,i) + status = verify_device_values(assoc_inst_list[i], + eafp_values, virt) + else: + status = verify_device_values(assoc_eafp_info, + eafp_values, virt) + if status != PASS: - break - elif field == "DeviceID": - if assoc_list[0]['CreationClassName'] == 'Xen_Processor': -# Verifying the list of DeviceId returned by the association -# against the list created intially . - for i in range(len(list)): - if assoc_list[i]['DeviceID'] != list[i]: - print_error(field, assoc_list[i]['DeviceID'], list[i]) - status = FAIL - else: -# Except for Xen_Processor, we get only once record for a domain for -# other classes. - if assoc_list[0]['DeviceID'] != list[index]: - print_error(field, assoc_list[0]['DeviceID'] , list[index]) - status = FAIL - else: - # other specific fields verification - if assoc_list[0]['CreationClassName'] != 'Xen_Processor': - spec_field_name = specific_fields_list['field_name'] - spec_field_value = specific_fields_list['field_value'] - if spec_field_value != list[index]: - print_error(field, spec_field_value, list[index]) - status = FAIL - + return status + except Exception, detail: + logger.error(CIM_ERROR_ASSOCIATORS, an) + logger.error("Exception: %s", detail) + status = FAIL + return status @do_main(sup_types) def main(): options = main.options - global status loop = 0 server = options.ip - destroy_and_undefine_all(options.ip) - test_xml, bridge = testxml_bridge(test_dom, mem = test_mem, vcpus = test_vcpus, \ - mac = test_mac, disk = test_disk, server = options.ip) - if bridge == None: - Globals.logger.error("Unable to find virtual bridge") - return SKIP + virt = options.virt + if virt == 'Xen': + test_disk = 'xvdb' + else: + test_disk = 'hda' - if test_xml == None: - Globals.logger.error("Guest xml was not created properly") + # Getting the VS list and deleting the test_dom if it already exists. + destroy_and_undefine_all(server) + virt_type = get_class(virt) + if virt == 'LXC': + vsxml = virt_type(test_dom, vcpus = test_vcpus) + else: + vsxml = virt_type(test_dom, mem = test_mem, vcpus = test_vcpus, + mac = test_mac, disk = test_disk) + + # Verify DiskPool on machine + status, diskid = create_diskpool_conf(server, virt) + if status != PASS: + return status + + ret = vsxml.create(server) + if not ret: + logger.error("Failed to Create the dom: '%s'", test_dom) + cleanup_restore(server, virt) return FAIL - virt_network = network_by_bridge(bridge, server) - if virt_network == None: - Globals.logger.error("No virtual network found for bridge %s", bridge) - return SKIP + # Get pool list against which the EAFP should be queried + pllist = init_pllist(virt, vsxml, diskid) - ret = test_domain_function(test_xml, server, cmd = "create") - if not ret: - Globals.logger.error("Failed to Create the dom: %s", test_dom) - return FAIL + + status = verify_eafp_values(server, virt, pllist, test_disk) + vsxml.destroy(server) + cleanup_restore(server, virt) + return status - # 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() - try : - 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, \ - pool_class=enumclass.Xen_NetworkPool) - 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) - status = FAIL - ret = test_domain_function(test_dom, server, \ - cmd = "destroy") - return status - - 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) -# Verifying the Creation Class name for all the records returned for each -# pool class queried - inst_list = get_inst_for_dom(assoc_info) - if (len(inst_list)) == 0: - Globals.logger.error("Association did not return any records for \ -the specified domain: %s", test_dom) - status = FAIL - break - - 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) - else: -# For LogicalDisk, Memory and NetworkPort - if inst_list[0]['CreationClassName'] == 'Xen_LogicalDisk': - list_index = 0 - elif inst_list[0]['CreationClassName'] == 'Xen_Memory': - list_index = 2 - else: - list_index = 4 # NetworkPort - 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") - 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") - list_index = 3 - else: -# verifying the NetworkAddresses for the NetworkPort - 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) - 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, \ - 'Xen_ElementAllocatedFromPool') - Globals.logger.error("Exception: %s", detail) - clean_up_restore(server) - status = FAIL - - ret = test_domain_function(test_dom, server, \ - cmd = "destroy") - clean_up_restore(server) - return status if __name__ == "__main__": sys.exit(main()) diff -r 3703b7be5a10 -r 6d1ac5c3497b suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py --- a/suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py Wed Jul 16 07:23:32 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py Tue Jul 22 06:42:27 2008 -0700 @@ -23,6 +23,7 @@ import os import os from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.vxml import get_typed_class # The list_values that is passed should be of the type .. # disk = { @@ -53,70 +54,58 @@ def spec_err(fieldvalue, field_list, fie logger.error("%s Mismatch", fieldname) logger.error("Returned %s instead of %s", fieldvalue, field_list[fieldname]) -def verify_proc_values(assoc_info, list_values): - proc_values = list_values['Xen_Processor'] - if assoc_info['CreationClassName'] != proc_values['CreationClassName']: - field_err(assoc_info, proc_values, fieldname = 'CreationClassName') + +def verify_device_values(assoc_info, list_values, virt='Xen'): + dev_cnames = ['LogicalDisk', 'Memory', 'NetworkPort', 'Processor'] + for i in range(len(dev_cnames)): + dev_cnames[i] = get_typed_class(virt, dev_cnames[i]) + + CCName = assoc_info['CreationClassName'] + if not CCName in dev_cnames: + logger.error("'%s' seem to be an invalid classname", CCName) + return FAIL + + dev_values = list_values[CCName] + if assoc_info['CreationClassName'] != dev_values['CreationClassName']: + field_err(assoc_info, dev_values, fieldname = 'CreationClassName') + return FAIL + + if assoc_info['DeviceID'] != dev_values['DeviceID']: + field_err(assoc_info, dev_values, fieldname = 'DeviceID') + return FAIL + + sysname = assoc_info['SystemName'] + if sysname != dev_values['SystemName']: + spec_err(sysname, list_values, fieldname = 'SystemName') return FAIL - if assoc_info['DeviceID'] != proc_values['DeviceID']: - field_err(assoc_info, proc_values, fieldname = 'DeviceID') - return FAIL - sysname = assoc_info['SystemName'] - if sysname != proc_values['SystemName']: - spec_err(sysname, proc_values, fieldname = 'SystemName') - return FAIL - return PASS -def verify_mem_values(assoc_info, list_values): - mem_values = list_values['Xen_Memory'] - if assoc_info['CreationClassName'] != mem_values['CreationClassName']: - field_err(assoc_info, mem_values, fieldname = 'CreationClassName') - return FAIL - if assoc_info['DeviceID'] != mem_values['DeviceID']: - field_err(assoc_info, mem_values, fieldname = 'DeviceID') - return FAIL - sysname = assoc_info['SystemName'] - if sysname != mem_values['SystemName']: - spec_err(sysname, mem_values, fieldname = 'SystemName') - return FAIL + # Checking Device specific values. + if CCName == dev_cnames[0]: # Verifying disk values + return verify_disk_values(assoc_info, dev_values, virt) + elif CCName == dev_cnames[1]: # Verifying mem values + return verify_mem_values(assoc_info, dev_values, virt) + elif CCName == dev_cnames[2]: # Verifying net values + return verify_net_values(assoc_info, dev_values, virt) + elif CCName == dev_cnames[3]: # Verifying processor values + return PASS + +def verify_mem_values(assoc_info, mem_values, virt='Xen'): blocks = ((int(assoc_info['NumberOfBlocks'])*4096)/1024) if blocks != mem_values['NumberOfBlocks']: spec_err(blocks, mem_values, fieldname = 'NumberOfBlocks') return FAIL return PASS -def verify_net_values(assoc_info, list_values): - net_values = list_values['Xen_NetworkPort'] - if assoc_info['CreationClassName'] != net_values['CreationClassName']: - field_err(assoc_info, net_values, fieldname = 'CreationClassName') - return FAIL - if assoc_info['DeviceID'] != net_values['DeviceID']: - field_err(assoc_info, net_values, fieldname = 'DeviceID') - return FAIL - sysname = assoc_info['SystemName'] - if sysname != net_values['SystemName']: - spec_err(sysname, net_values, fieldname = 'SystemName') - return FAIL -# We are assinging only one mac address and hence we expect only one -# address in the list +def verify_net_values(assoc_info, net_values, virt='Xen'): + # We are assinging only one mac address and hence we expect only one + # address in the list netadd = assoc_info['NetworkAddresses'][0] if netadd != net_values['NetworkAddresses']: spec_err(netadd, net_values, fieldname = 'NetworkAddresses') return FAIL return PASS -def verify_disk_values(assoc_info, list_values): - disk_values = list_values['Xen_LogicalDisk'] - if assoc_info['CreationClassName'] != disk_values['CreationClassName']: - field_err(assoc_info, disk_values, fieldname = 'CreationClassName') - return FAIL - if assoc_info['DeviceID'] != disk_values['DeviceID']: - field_err(assoc_info, disk_values, fieldname = 'DeviceID') - return FAIL - sysname = assoc_info['SystemName'] - if sysname != disk_values['SystemName']: - spec_err(sysname, disk_values, fieldname = 'SystemName') - return FAIL +def verify_disk_values(assoc_info, disk_values, virt='Xen'): devname = assoc_info['Name'] if devname != disk_values['Name']: spec_err(devname, disk_values, fieldname = 'Name')

1 0

Cimtest Report for Xen on RHEL5.2 (2008/07/21)
by Guo Lian Yun 22 Jul '08

22 Jul '08

Distro : RHEL 5.2 Beta Kernel : kernel-2.6.18-92.el5 Xen version : xen-3.0.3-64.el5 Libvirt : libvirt-0.3.3-7.el5 CIMOM : pegasus PyWBEM : pywbem-3.14 CIM Schema : cimv216Experimental LibCMPIutil : 83 LibVirtCIM : 637 CIMTEST : 249 ========================================================= PASS : 113 FAILED : 9 XFAIL : 7 SKIP : 1 Total : 130 =======================FAILED============================== ElementAllocatedFromPool - 02_reverse.py: FAIL ERROR - AttributeError : 'NoneType' object has no attribute 'InstanceID' CIM_ERR_NOT_FOUND: No such instance (foo) LogicalDisk - 02_nodevs.py: FAIL ERROR - LogicalDisk returned 1 instead of empty list LogicalDisk - 03_ld_gi_errs.py: FAIL ERROR - Failed to get instance by the class of Xen_LogicalDisk ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (hd_domain/xvda)') Memory - 01_memory.py: FAIL ERROR - Capacity should be 262144 MB instead of 131072 MB NetworkPort - 01_netport.py: FAIL ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') RASD - 02_enum.py: FAIL ERROR - Xen_DiskResourceAllocationSettingData with VSSDC_dom was not returned VSSD - 02_bootldr.py: FAIL ERROR - NameError : global name 'BaseException' is not defined CIM_ERR_NOT_FOUND: No such instance (dom) VSSD - 04_vssd_to_rasd.py: FAIL ERROR - Xen_VirtualSystemSettingData with VSSDC_dom was not returned ERROR - Xen_VirtualSystemSettingData returned 0 VSSD objects, expected only 1 VirtualSystemManagementService - 09_procrasd_persist.py: FAIL ERROR - limit is 0, expected 256 ERROR - rstest_domain CPU scheduling not set properly =======================CIMTEST REPORT======================= AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<00002> ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from suspend State to Activate state was not Successful Bug:<00002> ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 27_define_suspend_errs.py: PASS ComputerSystem - 32_start_reboot.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 33_suspend_reboot.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 35_start_reset.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 40_RSC_start.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Exception: Attributes were not set as expected for domain: 'test_domain' Bug:<00002> ComputerSystem - 41_cs_to_settingdefinestate.py: PASS ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: PASS ElementAllocatedFromPool - 02_reverse.py: FAIL ERROR - AttributeError : 'NoneType' object has no attribute 'InstanceID' CIM_ERR_NOT_FOUND: No such instance (foo) ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: PASS ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS EnabledLogicalElementCapabilities - 01_enum.py: PASS EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: PASS HostSystem - 03_hs_to_settdefcap.py: PASS HostSystem - 04_hs_to_EAPF.py: PASS HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: PASS HostedDependency - 02_reverse.py: PASS HostedDependency - 03_enabledstate.py: PASS HostedDependency - 04_reverse_errs.py: PASS HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: FAIL ERROR - LogicalDisk returned 1 instead of empty list LogicalDisk - 03_ld_gi_errs.py: FAIL ERROR - Failed to get instance by the class of Xen_LogicalDisk ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (hd_domain/xvda)') Memory - 01_memory.py: FAIL ERROR - Capacity should be 262144 MB instead of 131072 MB Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: FAIL ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: SKIP Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: PASS Profile - 02_profile_to_elec.py: PASS Profile - 03_rprofile_gi_errs.py: PASS RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: FAIL ERROR - Xen_DiskResourceAllocationSettingData with VSSDC_dom was not returned RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: PASS ResourcePool - 02_rp_gi_errors.py: PASS ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: PASS SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: PASS SettingsDefineCapabilities - 03_forward_errs.py: PASS SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: FAIL ERROR - NameError : global name 'BaseException' is not defined CIM_ERR_NOT_FOUND: No such instance (dom) VSSD - 03_vssd_gi_errs.py: PASS VSSD - 04_vssd_to_rasd.py: FAIL ERROR - Xen_VirtualSystemSettingData with VSSDC_dom was not returned ERROR - Xen_VirtualSystemSettingData returned 0 VSSD objects, expected only 1 VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: PASS VirtualSystemManagementService - 02_destroysystem.py: PASS VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: PASS VirtualSystemManagementService - 06_addresource.py: PASS VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: PASS VirtualSystemManagementService - 09_procrasd_persist.py: FAIL ERROR - limit is 0, expected 256 ERROR - rstest_domain CPU scheduling not set properly VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: PASS VirtualSystemMigrationService - 02_host_migrate_type.py: PASS VirtualSystemMigrationService - 05_migratable_host_errs.py: PASS VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: PASS VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS Best, Regards Daisy (运国莲) VSM Team, China Systems & Technology Labs (CSTL) E-mail: yunguol(a)cn.ibm.com TEL: (86)-21-60922403 Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

2 2

[PATCH] [TEST] #2 Fix CS 22 to use providers instead of virsh
by Kaitlin Rupert 22 Jul '08

22 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216507114 25200 # Node ID 26723e615b002509d1a91b5669d463b8132fadfc # Parent 0ebcf05bf74b7a798e99afc8c4361b183fbfc6ee [TEST] #2 Fix CS 22 to use providers instead of virsh. This test was defining a guest with virsh and then suspending it with virsh, which doesn't touch the providers in anyway. Now the test calls DefineSystem() and RequestStateChange(). Updates from 1 to 2: -Add check to verify guest is the expected state after the RequestStateChange() call. -Create a network pool because the VSMS provider requires a network pool to exist in order to create a guest. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 0ebcf05bf74b -r 26723e615b00 suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Sat Jul 19 15:14:33 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Sat Jul 19 15:38:34 2008 -0700 @@ -32,54 +32,72 @@ from XenKvmLib import computersystem from VirtLib import utils from XenKvmLib import vxml -from XenKvmLib.test_doms import destroy_and_undefine_all -from CimTest.Globals import do_main -from CimTest import Globals +from XenKvmLib.test_doms import destroy_and_undefine_domain +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import create_using_definesystem, \ + call_request_state_change, get_cs_instance, \ + create_netpool_conf, destroy_netpool sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domgst" +DEFINE_STATE = 3 +SUSPND_STATE = 9 +TIME = "00000000000000.000000:000" + +def chk_state(domain_name, ip, en_state, virt): + rc, cs = get_cs_instance(domain_name, ip, virt) + if rc != 0: + return rc + + if cs.EnabledState != en_state: + logger.error("EnabledState should be %d not %d", + en_state, cs.EnabledState) + return FAIL + + return PASS + @do_main(sup_types) def main(): options = main.options - status = FAIL - - cxml = vxml.get_class(options.virt)(test_dom) -#define VS + status, test_network = create_netpool_conf(options.ip, options.virt) + if status != PASS: + destroy_netpool(options.ip, options.virt, test_network) + return FAIL + try: - ret = cxml.define(options.ip) - if not ret: - Globals.logger.error(Globals.VIRSH_ERROR_DEFINE % test_dom) - return status - - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) - if not (cs.Name == test_dom) : - Globals.logger.error("Error: VS %s not found" % test_dom) - cxml.undefine(options.ip) + # define the vs + status = create_using_definesystem(test_dom, options.ip, + virt=options.virt) + if status != PASS: + logger.error("Unable to define %s using DefineSystem()" % test_dom) + destroy_netpool(options.ip, options.virt, test_network) return status - except Exception, detail: - Globals.logger.error("Errors: %s" % detail) + # suspend the vs + status = call_request_state_change(test_dom, options.ip, SUSPND_STATE, + TIME, virt=options.virt) + if status != PASS: + logger.info("Suspending defined %s failed, as expected" % test_dom) + status = PASS -#Suspend the defined VS - - try: - ret = cxml.run_virsh_cmd(options.ip, "suspend") - if not ret : - Globals.logger.info("Suspending defined VS %s failed, as expected" \ -% test_dom) - status = PASS + status = chk_state(test_dom, options.ip, DEFINE_STATE, options.virt) + if status != PASS: + logger.error("%s not in defined state as expected." % test_dom) + status = FAIL + else : - Globals.logger.info("Error: Suspending defined VS %s should not \ -have been allowed" % test_dom) + logger.error("Suspending defined %s should have failed" % test_dom) status = FAIL except Exception, detail: - Globals.logger.error("Error: %s" % detail) + logger.error("Error: %s" % detail) + status = FAIL - ret = cxml.undefine(options.ip) + destroy_netpool(options.ip, options.virt, test_network) + destroy_and_undefine_domain(test_dom, options.ip, options.virt) return status if __name__ == "__main__":

2 3

[PATCH] [TEST] #2 Fix potiential false positive in CS 02
by Kaitlin Rupert 22 Jul '08

22 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216654535 25200 # Node ID 29ede6f3ff473886fa928a83fd62a0a192493b7e # Parent de486893703609719ea79d53ee64828537826211 [TEST] #2 Fix potiential false positive in CS 02. Also make it so that the test skips if domain_list() returns anything > 0. This test used to be a Xen only test, so the test was only being run if there were no other guests besides Dom0. However, CS EnumInstances treats Dom0 as any other guest, so it only makes sense to run this test on KVM and LXC. If computersystem.enumerate() encounters an exception, raise an exception so that the calling test case fail appropriately. We could return FAIL in this case, but raising an exception is more descriptive. Also, other tests that call computersystem.enumerate() don't need to be modified because the number of arguments returned doesn't change. Updates from 1 to 2: -Remove Xen and XenFV from the supported platforms list. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r de4868937036 -r 29ede6f3ff47 suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Sat Jul 19 14:17:09 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Mon Jul 21 08:35:35 2008 -0700 @@ -27,15 +27,15 @@ from XenKvmLib import computersystem from VirtLib import live from VirtLib import utils -from CimTest.Globals import logger +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP -sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] +sup_types = ['KVM', 'LXC'] def clean_system(host, virt): l = live.domain_list(host, virt) - if len(l) > 1: + if len(l) > 0: return False else: return True @@ -43,19 +43,28 @@ @do_main(sup_types) def main(): options = main.options + if not clean_system(options.ip, options.virt): logger.error("System has defined domains; unable to run") return SKIP - status = PASS + cn = "%s_ComputerSystem" % options.virt - cs = computersystem.enumerate(options.ip, options.virt) + try: + cs = computersystem.enumerate(options.ip, options.virt) - if cs.__class__ == str: - logger.error("Got error instead of empty list: %s" % cs) + except Exception, details: + logger.error(CIM_ERROR_ENUMERATE, cn) + logger.error(details) + return FAIL + + if len(cs) != 0: + logger.error("%s returned %d instead of empty list" % (cn, len(cs))) status = FAIL + else: + status = PASS - return status + return status if __name__ == "__main__": sys.exit(main()) diff -r de4868937036 -r 29ede6f3ff47 suites/libvirt-cim/lib/XenKvmLib/computersystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Sat Jul 19 14:17:09 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Mon Jul 21 08:35:35 2008 -0700 @@ -85,7 +85,7 @@ try: instances = conn.EnumerateInstances(classname) except pywbem.CIMError, arg: - print arg[1] + raise Exception(arg[1]) return [] list = []

2 1

[PATCH] [TEST] Fix console tty define in LXCXML class
by yunguol＠cn.ibm.com 22 Jul '08

22 Jul '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1216707638 25200 # Node ID 83b3723d0ca969293e28326198a52ada74a8b753 # Parent 3703b7be5a107c67e901546978e974546b3d5562 [TEST] Fix console tty define in LXCXML class Modified console define as: <console tty='/dev/ptmx'/> instead of <console>/dev/ptmx</console> Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3703b7be5a10 -r 83b3723d0ca9 suites/libvirt-cim/lib/XenKvmLib/vxml.py --- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Wed Jul 16 07:23:32 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Mon Jul 21 23:20:38 2008 -0700 @@ -710,10 +710,10 @@ os = self.get_node('/domain/os') self.add_sub_node(os, 'init', os_init) - def _devices(self, tty): + def _devices(self, tty_set): devices = self.get_node('/domain/devices') - interface = self.add_sub_node(devices, 'console', tty) + interface = self.add_sub_node(devices, 'console', tty = tty_set) def create_lxc_file(self, ip, lxc_file): try:

1 0

[PATCH] Add ReferenceConfiguration support to VSMS
by Dan Smith 22 Jul '08

22 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1216672093 25200 # Node ID 427e74d2c45881820ee33b8b6cdeb9cff57a68c0 # Parent 542f77ab01389702ff1358f04b0d55c8f052067a Add ReferenceConfiguration support to VSMS This accomplishes that goal by doing a full get_dominfo() instead of a blank dominfo alloc in the event that the client passed in a ReferenceConfiguration object path. Also fix a few unchecked calloc() calls while touching them. Also make sure we're only ever editing the first memory or processor device in the list, during the domain building process. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 542f77ab0138 -r 427e74d2c458 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Jul 21 09:02:26 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Jul 21 13:28:13 2008 -0700 @@ -68,24 +68,34 @@ static CMPIStatus define_system_parse_args(const CMPIArgs *argsin, CMPIInstance **sys, const char *ns, - CMPIArray **res) + CMPIArray **res, + CMPIObjectPath **refconf) { - CMPIStatus s = {CMPI_RC_ERR_FAILED, NULL}; + CMPIStatus s = {CMPI_RC_OK, NULL}; if (cu_get_inst_arg(argsin, "SystemSettings", sys) != CMPI_RC_OK) { CU_DEBUG("No SystemSettings string argument"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing argument `SystemSettings'"); goto out; } if (cu_get_array_arg(argsin, "ResourceSettings", res) != CMPI_RC_OK) { CU_DEBUG("Failed to get array arg"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing argument `ResourceSettings'"); goto out; } - cu_statusf(_BROKER, &s, - CMPI_RC_OK, - ""); + if (cu_get_ref_arg(argsin, "ReferenceConfiguration", refconf) != + CMPI_RC_OK) { + CU_DEBUG("Did not get ReferenceConfiguration arg"); + *refconf = NULL; + goto out; + } out: return s; } @@ -565,6 +575,20 @@ return msg; } +static bool make_space(struct virt_device **list, int cur, int new) +{ + struct virt_device *tmp; + + tmp = calloc(cur + new, sizeof(*tmp)); + if (tmp == NULL) + return false; + + memcpy(tmp, *list, sizeof(*tmp) * cur); + *list = tmp; + + return true; +} + static const char *classify_resources(CMPIArray *resources, const char *ns, struct domain *domain) @@ -573,17 +597,21 @@ uint16_t type; int count; - domain->dev_disk_ct = domain->dev_net_ct = 0; - domain->dev_vcpu_ct = domain->dev_mem_ct = 0; - count = CMGetArrayCount(resources, NULL); if (count < 1) return "No resources specified"; - domain->dev_disk = calloc(count, sizeof(struct virt_device)); - domain->dev_vcpu = calloc(count, sizeof(struct virt_device)); - domain->dev_mem = calloc(count, sizeof(struct virt_device)); - domain->dev_net = calloc(count, sizeof(struct virt_device)); + if (!make_space(&domain->dev_disk, domain->dev_disk_ct, count)) + return "Failed to alloc disk list"; + + if (!make_space(&domain->dev_vcpu, domain->dev_vcpu_ct, count)) + return "Failed to alloc vcpu list"; + + if (!make_space(&domain->dev_mem, domain->dev_mem_ct, count)) + return "Failed to alloc mem list"; + + if (!make_space(&domain->dev_net, domain->dev_net_ct, count)) + return "Failed to alloc net list"; for (i = 0; i < count; i++) { CMPIObjectPath *op; @@ -605,27 +633,29 @@ CMPI_RC_OK) return "Unable to determine resource type"; - if (type == CIM_RES_TYPE_PROC) + if (type == CIM_RES_TYPE_PROC) { + domain->dev_vcpu_ct = 1; msg = rasd_to_vdev(inst, domain, - &domain->dev_vcpu[domain->dev_vcpu_ct++], + &domain->dev_vcpu[0], ns); - else if (type == CIM_RES_TYPE_MEM) + } else if (type == CIM_RES_TYPE_MEM) { + domain->dev_mem_ct = 1; msg = rasd_to_vdev(inst, domain, - &domain->dev_mem[domain->dev_mem_ct++], + &domain->dev_mem[0], ns); - else if (type == CIM_RES_TYPE_DISK) + } else if (type == CIM_RES_TYPE_DISK) { msg = rasd_to_vdev(inst, domain, &domain->dev_disk[domain->dev_disk_ct++], ns); - else if (type == CIM_RES_TYPE_NET) + } else if (type == CIM_RES_TYPE_NET) { msg = rasd_to_vdev(inst, domain, &domain->dev_net[domain->dev_net_ct++], ns); - + } if (msg != NULL) return msg; @@ -722,23 +752,125 @@ return s; } +static CMPIStatus match_prefixes(const CMPIObjectPath *a, + const CMPIObjectPath *b) +{ + char *pfx1; + char *pfx2; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + pfx1 = class_prefix_name(CLASSNAME(a)); + pfx2 = class_prefix_name(CLASSNAME(b)); + + if ((pfx1 == NULL) || (pfx2 == NULL)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable compare ReferenceConfiguration prefix"); + goto out; + } + + if (!STREQ(pfx1, pfx2)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_CLASS, + "ReferenceConfiguration domain is not compatible"); + goto out; + } + out: + free(pfx1); + free(pfx2); + + return s; +} + +static CMPIStatus get_reference_domain(struct domain **domain, + const CMPIObjectPath *ref, + const CMPIObjectPath *refconf) +{ + virConnectPtr conn = NULL; + virDomainPtr dom = NULL; + const char *name; + CMPIStatus s; + int ret; + + s = match_prefixes(ref, refconf); + if (s.rc != CMPI_RC_OK) + return s; + + conn = connect_by_classname(_BROKER, CLASSNAME(refconf), &s); + if (conn == NULL) { + if (s.rc != CMPI_RC_OK) + return s; + else { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to connect to libvirt"); + return s; + } + } + + if (cu_get_str_path(refconf, "Name", &name) != CMPI_RC_OK) { + CU_DEBUG("Missing Name parameter"); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_INVALID_PARAMETER, + "Missing `Name' from ReferenceConfiguration"); + goto out; + } + + CU_DEBUG("Referenced domain: %s", name); + + dom = virDomainLookupByName(conn, name); + if (dom == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "Referenced domain `%s' does not exist", name); + goto out; + } + + ret = get_dominfo(dom, domain); + if (ret == 0) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Error getting referenced configuration"); + goto out; + } + + /* Scrub the unique bits out of the reference domain config */ + free((*domain)->name); + (*domain)->name = NULL; + free((*domain)->uuid); + (*domain)->uuid = NULL; + + out: + virDomainFree(dom); + virConnectClose(conn); + + return s; +} + static CMPIInstance *create_system(CMPIInstance *vssd, CMPIArray *resources, const CMPIObjectPath *ref, + const CMPIObjectPath *refconf, CMPIStatus *s) { CMPIInstance *inst = NULL; char *xml = NULL; const char *msg = NULL; - struct domain *domain; + struct domain *domain = NULL; - domain = calloc(1, sizeof(*domain)); - if (domain == NULL) { - cu_statusf(_BROKER, s, - CMPI_RC_ERR_FAILED, - "Failed to allocate memory"); - goto out; + if (refconf != NULL) { + *s = get_reference_domain(&domain, ref, refconf); + if (s->rc != CMPI_RC_OK) + goto out; + } else { + domain = calloc(1, sizeof(*domain)); + if (domain == NULL) { + cu_statusf(_BROKER, s, + CMPI_RC_ERR_FAILED, + "Failed to allocate memory"); + goto out; + } } if (!vssd_to_domain(vssd, domain)) { @@ -795,6 +927,7 @@ const CMPIArgs *argsin, CMPIArgs *argsout) { + CMPIObjectPath *refconf; CMPIInstance *vssd; CMPIInstance *sys; CMPIArray *res; @@ -802,11 +935,15 @@ CU_DEBUG("DefineSystem"); - s = define_system_parse_args(argsin, &vssd, NAMESPACE(reference), &res); + s = define_system_parse_args(argsin, + &vssd, + NAMESPACE(reference), + &res, + &refconf); if (s.rc != CMPI_RC_OK) goto out; - sys = create_system(vssd, res, reference, &s); + sys = create_system(vssd, res, reference, refconf, &s); if (sys == NULL) goto out;

2 1

[PATCH] (#2) Add CMSetObjectPath macro
by Kaitlin Rupert 22 Jul '08

22 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216656146 25200 # Node ID 6e310fe7bde3d3a43740b1d2a155c8503b25bcc7 # Parent ec88dc805bcdc63d30b866e3e527208fa684e274 (#2) Add CMSetObjectPath macro. This is a work around. SFCB currently doesn't implement CMSetObjectPath, so the VSMS provider seg faults. Updates: -Place CMSetObjectPath define in misc_util.h Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ec88dc805bcd -r 6e310fe7bde3 libxkutil/misc_util.h --- a/libxkutil/misc_util.h Wed Jul 09 13:48:14 2008 -0700 +++ b/libxkutil/misc_util.h Mon Jul 21 09:02:26 2008 -0700 @@ -33,6 +33,12 @@ #include <libcmpiutil/libcmpiutil.h> #include <libcmpiutil/std_association.h> + +#undef CMSetObjectPath +#define CMSetObjectPath(i,p) do { \ + if (i->ft->setObjectPath != NULL) \ + i->ft->setObjectPath(i, p); \ + } while (0); /* Check if the provider is reponsible for the given class: * e.g. Xen is running on the system and KVM_... is asked for,

1 0

[PATCH] [TEST] Fix potiential false positive in CS 02
by Kaitlin Rupert 22 Jul '08

22 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1215718772 25200 # Node ID 0a4bc49a1fbde309070f8cc4c8631cf4a5ad9c68 # Parent c09b0a978a6621139eb355079994ba3eb2847779 [TEST] Fix potiential false positive in CS 02. Also make it so that the test skips if domain_list() returns anything > 0. This test used to be a Xen only test, so the test was only being run if there were no other guests besides Dom0. However, CS EnumInstances treats Dom0 as any other guest, so it only makes sense to run this test on KVM and LXC. If computersystem.enumerate() encounters an exception, raise an exception so that the calling test case fail appropriately. We could return FAIL in this case, but raising an exception is more descriptive. Also, other tests that call computersystem.enumerate() don't need to be modified because the number of arguments returned doesn't change. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r c09b0a978a66 -r 0a4bc49a1fbd suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Thu Jul 10 11:48:13 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/02_nosystems.py Thu Jul 10 12:39:32 2008 -0700 @@ -27,7 +27,7 @@ from XenKvmLib import computersystem from VirtLib import live from VirtLib import utils -from CimTest.Globals import logger +from CimTest.Globals import logger, CIM_ERROR_ENUMERATE from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP @@ -35,7 +35,7 @@ def clean_system(host, virt): l = live.domain_list(host, virt) - if len(l) > 1: + if len(l) > 0: return False else: return True @@ -43,19 +43,31 @@ @do_main(sup_types) def main(): options = main.options - if not clean_system(options.ip, options.virt): + + rc = clean_system(options.ip, options.virt) + + if options.virt == "Xen" or options.virt == "XenFV" and rc is True: + logger.error("System has no Dom0 defined; check system health") + return FAIL + elif rc is False: logger.error("System has defined domains; unable to run") return SKIP - status = PASS + cn = "%s_ComputerSystem" % options.virt - cs = computersystem.enumerate(options.ip, options.virt) + try: + cs = computersystem.enumerate(options.ip, options.virt) - if cs.__class__ == str: - logger.error("Got error instead of empty list: %s" % cs) + except Exception, details: + logger.error(CIM_ERROR_ENUMERATE, cn) + logger.error(details) + return FAIL + + if len(cs) != 0: + logger.error("%s returned %d instead of empty list" % (cn, len(cs))) status = FAIL - return status + return PASS if __name__ == "__main__": sys.exit(main()) diff -r c09b0a978a66 -r 0a4bc49a1fbd suites/libvirt-cim/lib/XenKvmLib/computersystem.py --- a/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Thu Jul 10 11:48:13 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/computersystem.py Thu Jul 10 12:39:32 2008 -0700 @@ -85,7 +85,7 @@ try: instances = conn.EnumerateInstances(classname) except pywbem.CIMError, arg: - print arg[1] + raise Exception(arg[1]) return [] list = []

3 5

[PATCH] [TEST] Enabling 02_reverse.py with XenFV, KVM, LXC and modified logicaldevices.py to work for all virt types
by Deepti B. Kalakeri 22 Jul '08

22 Jul '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1216384179 25200 # Node ID f8f6995ce08915d738d82600b15559c81fc40095 # Parent 3703b7be5a107c67e901546978e974546b3d5562 [TEST] Enabling 02_reverse.py with XenFV, KVM, LXC and modified logicaldevices.py to work for all virt types. Changes: ------- 1) Removed unnecessary import statements. 2) Updated verify_proc_values, verify_mem_values, verify_net_values, verify_disk_values function of logicaldevices to work with all virt types. 3) Used verify_proc_values, verify_mem_values, verify_net_values, verify_disk_values fn. 4) Removed conf_file(), clean_up_restore(), get_or_bail(), print_error(), init_list(), get_spec_fields_list(), assoc_values() fns. 5) Removed global status variable. 6) Added verify_eafp_values(), init_pllist(), create_diskpool_conf() fn. 7) Included create_diskpool_conf(), cleanup_restore() fn. Tested on KVM on rpm, KVM current sources, LXC, XenFV, Xen. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 3703b7be5a10 -r f8f6995ce089 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Wed Jul 16 07:23:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/02_reverse.py Fri Jul 18 05:29:39 2008 -0700 @@ -20,9 +20,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - # This tc is used to verify the classname, InstanceID and certian prop are -# are appropriately set for the domains when verified using the +# appropriately set for the domains when verified using the # Xen_ElementAllocatedFromPool asscoiation. # # Example command for LogicalDisk w.r.t to Xen_ElementAllocatedFromPool \ @@ -47,111 +46,80 @@ import sys import os -from distutils.file_util import move_file import pywbem -from VirtLib import utils -from VirtLib import live -from XenKvmLib import assoc -from XenKvmLib import enumclass -from CimTest import Globals -from CimTest.Globals import do_main -from CimTest.ReturnCodes import PASS, FAIL, SKIP -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.assoc import Associators +from XenKvmLib.vxml import get_class +from CimTest.Globals import do_main, logger, CIM_ERROR_ASSOCIATORS +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.test_doms import destroy_and_undefine_all +from XenKvmLib.classes import get_typed_class +from XenKvmLib.common_util import create_diskpool_conf, cleanup_restore +from XenKvmLib.logicaldevices import verify_proc_values, verify_mem_values, \ +verify_net_values, verify_disk_values -sup_types = ['Xen'] +sup_types = ['Xen' , 'KVM', 'XenFV', 'LXC'] -status = PASS -test_dom = "hd_domain" +test_dom = "eafp_domain" test_mac = "00:11:22:33:44:aa" 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 init_pllist(virt, vsxml, diskid): + keys = { + 'MemoryPool' : 'MemoryPool/0', + } + if virt != 'LXC': + virt_network = vsxml.xml_get_net_network() + keys['DiskPool'] = diskid + keys['ProcessorPool'] = 'ProcessorPool/0' + keys['NetworkPool'] = 'NetworkPool/%s' %virt_network -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) - + pllist = { } + for cn, k in keys.iteritems(): + cn = get_typed_class(virt, cn) + pllist[cn] = k -def get_or_bail(ip, id, pool_class): - """ - Getinstance for the CLass and return instance on success, otherwise - exit after cleanup_restore and destroying the guest. - """ - key_list = { 'InstanceID' : id } - try: - instance = enumclass.getInstance(ip, pool_class, key_list) - except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, '%s', pool_class) - Globals.logger.error("Exception: %s", detail) - clean_up_restore(ip) - status = FAIL - ret = test_domain_function(test_dom, ip, \ - cmd = "destroy") - sys.exit(status) - return instance + return pllist -def print_error(field, ret_val, req_val): - Globals.logger.error("%s Mismatch", field) - Globals.logger.error("Returned %s instead of %s", ret_val, req_val) +def eafp_list(virt, test_disk): + mcn = get_typed_class(virt, "Memory") + mem = { + 'SystemName' : test_dom, + 'CreationClassName' : mcn, + 'DeviceID' : "%s/%s" % (test_dom, "mem"), + 'NumberOfBlocks' : test_mem * 1024 + } -def init_list(ip, disk, mem, net, proc): - """ - Creating the lists that will be used for comparisons. - """ + eaf_values = { mcn : mem } - pllist = { - "Xen_DiskPool" : disk.InstanceID, \ - "Xen_MemoryPool" : mem.InstanceID, \ - "Xen_NetworkPool" : net.InstanceID, \ - "Xen_ProcessorPool": proc.InstanceID - } - cllist = [ - "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, \ - "%s/%s" % (test_dom, test_mac), test_mac - ] - proc_prop = [] - for i in range(test_vcpus): - proc_prop.append("%s/%s" % (test_dom, i)) - return pllist, cllist, prop_list, proc_prop + if virt != 'LXC': + dcn = get_typed_class(virt, "LogicalDisk") + pcn = get_typed_class(virt, "Processor") + ncn = get_typed_class(virt, "NetworkPort") + + disk = { + 'SystemName' : test_dom, + 'CreationClassName' : dcn, + 'DeviceID' : "%s/%s" % (test_dom, test_disk), + 'Name' : test_disk + } + proc = { + 'SystemName' : test_dom, + 'CreationClassName' : pcn, + 'DeviceID' : None + } + net = { + 'SystemName' : test_dom, + 'CreationClassName' : ncn, + 'DeviceID' : "%s/%s" % (test_dom, test_mac), + 'NetworkAddresses' : test_mac + } + + eaf_values[pcn] = proc + eaf_values[dcn] = disk + eaf_values[ncn] = net + + return eaf_values def get_inst_for_dom(assoc_val): list = [] @@ -162,196 +130,87 @@ def get_inst_for_dom(assoc_val): return list -def get_spec_fields_list(inst_list, field_name): - 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)) - status = FAIL - return -# verifying the Name field for LogicalDisk - try: - if inst_list[0]['CreationClassName'] != 'Xen_Memory': - field_value = inst_list[0][field_name] - if field_name == 'NetworkAddresses': -# For network we NetworkAddresses is a list of addresses, since we -# are assigning only one address we are taking field_value[0] - field_value = field_value[0] - else: - field_value = ((int(inst_list[0]['NumberOfBlocks'])*4096)/1024) - specific_fields = { - "field_name" : field_name,\ - "field_value" : field_value - } - except Exception, detail: - Globals.logger.error("Exception in get_spec_fields_list(): %s", detail) - status = FAIL - return specific_fields +def verify_eafp_values(server, virt, in_pllist, test_disk): + # Looping through the in_pllist to get association for various pools. + eafp_values = eafp_list(virt, test_disk) + an = get_typed_class(virt, "ElementAllocatedFromPool") + for cn, instid in sorted(in_pllist.iteritems()): + try: + assoc_info = Associators(server, an, cn, virt, InstanceID = instid) + assoc_inst_list = get_inst_for_dom(assoc_info) + if len(assoc_inst_list) < 1 : + logger.error("'%s' with '%s' did not return any records for" + " domain: '%s'", an, cn, test_dom) + return FAIL -def assoc_values(assoc_list, field , list, index, specific_fields_list=""): - """ - Verifying the records retruned by the associations. - """ - global status - if field == "CreationClassName": - for i in range(len(assoc_list)): - if assoc_list[i][field] != list[index]: - print_error(field, assoc_list[i][field], list[index]) + assoc_eafp_info = assoc_inst_list[0] + CCName = assoc_eafp_info['CreationClassName'] + if CCName == get_typed_class(virt, 'Processor'): + if len(assoc_inst_list) != test_vcpus: + logger.error("'%s' should have returned '%i' Processor" + " details, got '%i'", an, test_vcpus, + len(assoc_inst_list)) + return FAIL + for i in range(test_vcpus): + eafp_values[CCName]['DeviceID'] = "%s/%s" % (test_dom,i) + status = verify_proc_values(assoc_inst_list[i], + eafp_values, virt) + elif CCName == get_typed_class(virt, 'NetworkPort'): + status = verify_net_values(assoc_eafp_info, eafp_values, virt) + elif CCName == get_typed_class(virt, 'LogicalDisk'): + status = verify_disk_values(assoc_eafp_info, eafp_values, virt) + elif CCName == get_typed_class(virt, 'Memory'): + status = verify_mem_values(assoc_eafp_info, eafp_values, virt) + else: status = FAIL if status != PASS: break - elif field == "DeviceID": - if assoc_list[0]['CreationClassName'] == 'Xen_Processor': -# Verifying the list of DeviceId returned by the association -# against the list created intially . - for i in range(len(list)): - if assoc_list[i]['DeviceID'] != list[i]: - print_error(field, assoc_list[i]['DeviceID'], list[i]) - status = FAIL - else: -# Except for Xen_Processor, we get only once record for a domain for -# other classes. - if assoc_list[0]['DeviceID'] != list[index]: - print_error(field, assoc_list[0]['DeviceID'] , list[index]) - status = FAIL - else: - # other specific fields verification - if assoc_list[0]['CreationClassName'] != 'Xen_Processor': - spec_field_name = specific_fields_list['field_name'] - spec_field_value = specific_fields_list['field_value'] - if spec_field_value != list[index]: - print_error(field, spec_field_value, list[index]) - status = FAIL - + except Exception, detail: + logger.error(CIM_ERROR_ASSOCIATORS, an) + logger.error("Exception: %s", detail) + status = FAIL + return status @do_main(sup_types) def main(): options = main.options - global status loop = 0 server = options.ip - destroy_and_undefine_all(options.ip) - test_xml, bridge = testxml_bridge(test_dom, mem = test_mem, vcpus = test_vcpus, \ - mac = test_mac, disk = test_disk, server = options.ip) - if bridge == None: - Globals.logger.error("Unable to find virtual bridge") - return SKIP + virt = options.virt + if virt == 'Xen': + test_disk = 'xvdb' + else: + test_disk = 'hda' - if test_xml == None: - Globals.logger.error("Guest xml was not created properly") + # Getting the VS list and deleting the test_dom if it already exists. + destroy_and_undefine_all(server) + virt_type = get_class(virt) + if virt == 'LXC': + vsxml = virt_type(test_dom, vcpus = test_vcpus) + else: + vsxml = virt_type(test_dom, mem = test_mem, vcpus = test_vcpus, + mac = test_mac, disk = test_disk) + + # Verify DiskPool on machine + status, diskid = create_diskpool_conf(server, virt) + if status != PASS: + return status + + ret = vsxml.create(server) + if not ret: + logger.error("Failed to Create the dom: '%s'", test_dom) return FAIL - virt_network = network_by_bridge(bridge, server) - if virt_network == None: - Globals.logger.error("No virtual network found for bridge %s", bridge) - return SKIP + # Get pool list against which the EAFP should be queried + pllist = init_pllist(virt, vsxml, diskid) - ret = test_domain_function(test_xml, server, cmd = "create") - if not ret: - Globals.logger.error("Failed to Create the dom: %s", test_dom) - return FAIL + + status = verify_eafp_values(server, virt, pllist, test_disk) + vsxml.destroy(server) + cleanup_restore(server, virt) + return status - # 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() - try : - 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, \ - pool_class=enumclass.Xen_NetworkPool) - 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) - status = FAIL - ret = test_domain_function(test_dom, server, \ - cmd = "destroy") - return status - - 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) -# Verifying the Creation Class name for all the records returned for each -# pool class queried - inst_list = get_inst_for_dom(assoc_info) - if (len(inst_list)) == 0: - Globals.logger.error("Association did not return any records for \ -the specified domain: %s", test_dom) - status = FAIL - break - - 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) - else: -# For LogicalDisk, Memory and NetworkPort - if inst_list[0]['CreationClassName'] == 'Xen_LogicalDisk': - list_index = 0 - elif inst_list[0]['CreationClassName'] == 'Xen_Memory': - list_index = 2 - else: - list_index = 4 # NetworkPort - 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") - 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") - list_index = 3 - else: -# verifying the NetworkAddresses for the NetworkPort - 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) - 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, \ - 'Xen_ElementAllocatedFromPool') - Globals.logger.error("Exception: %s", detail) - clean_up_restore(server) - status = FAIL - - ret = test_domain_function(test_dom, server, \ - cmd = "destroy") - clean_up_restore(server) - return status if __name__ == "__main__": sys.exit(main()) diff -r 3703b7be5a10 -r f8f6995ce089 suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py --- a/suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py Wed Jul 16 07:23:32 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/logicaldevices.py Fri Jul 18 05:29:39 2008 -0700 @@ -23,6 +23,7 @@ import os import os from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.vxml import get_typed_class # The list_values that is passed should be of the type .. # disk = { @@ -53,8 +54,9 @@ def spec_err(fieldvalue, field_list, fie logger.error("%s Mismatch", fieldname) logger.error("Returned %s instead of %s", fieldvalue, field_list[fieldname]) -def verify_proc_values(assoc_info, list_values): - proc_values = list_values['Xen_Processor'] +def verify_proc_values(assoc_info, list_values, virt='Xen'): + cn = get_typed_class(virt, 'Processor') + proc_values = list_values[cn] if assoc_info['CreationClassName'] != proc_values['CreationClassName']: field_err(assoc_info, proc_values, fieldname = 'CreationClassName') return FAIL @@ -67,8 +69,9 @@ def verify_proc_values(assoc_info, list_ return FAIL return PASS -def verify_mem_values(assoc_info, list_values): - mem_values = list_values['Xen_Memory'] +def verify_mem_values(assoc_info, list_values, virt='Xen'): + cn = get_typed_class(virt, 'Memory') + mem_values = list_values[cn] if assoc_info['CreationClassName'] != mem_values['CreationClassName']: field_err(assoc_info, mem_values, fieldname = 'CreationClassName') return FAIL @@ -85,8 +88,9 @@ def verify_mem_values(assoc_info, list_v return FAIL return PASS -def verify_net_values(assoc_info, list_values): - net_values = list_values['Xen_NetworkPort'] +def verify_net_values(assoc_info, list_values, virt='Xen'): + cn = get_typed_class(virt, 'NetworkPort') + net_values = list_values[cn] if assoc_info['CreationClassName'] != net_values['CreationClassName']: field_err(assoc_info, net_values, fieldname = 'CreationClassName') return FAIL @@ -97,16 +101,17 @@ def verify_net_values(assoc_info, list_v if sysname != net_values['SystemName']: spec_err(sysname, net_values, fieldname = 'SystemName') return FAIL -# We are assinging only one mac address and hence we expect only one -# address in the list + # We are assinging only one mac address and hence we expect only one + # address in the list netadd = assoc_info['NetworkAddresses'][0] if netadd != net_values['NetworkAddresses']: spec_err(netadd, net_values, fieldname = 'NetworkAddresses') return FAIL return PASS -def verify_disk_values(assoc_info, list_values): - disk_values = list_values['Xen_LogicalDisk'] +def verify_disk_values(assoc_info, list_values, virt='Xen'): + cn = get_typed_class(virt, 'LogicalDisk') + disk_values = list_values[cn] if assoc_info['CreationClassName'] != disk_values['CreationClassName']: field_err(assoc_info, disk_values, fieldname = 'CreationClassName') return FAIL

3 3

[PATCH] Add CMSetObjectPath macro
by Kaitlin Rupert 22 Jul '08

22 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216418936 25200 # Node ID abbc6e3b451614f7bd2965f95d70b6695ad25968 # Parent ec88dc805bcdc63d30b866e3e527208fa684e274 Add CMSetObjectPath macro. This is a work around. SFCB currently doesn't implement CMSetObjectPath, so the VSMS provider seg faults. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r ec88dc805bcd -r abbc6e3b4516 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Wed Jul 09 13:48:14 2008 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Fri Jul 18 15:08:56 2008 -0700 @@ -58,6 +58,12 @@ #define DEFAULT_XEN_WEIGHT 1024 const static CMPIBroker *_BROKER; + +#undef CMSetObjectPath +#define CMSetObjectPath(i,p) do { \ + if (i->ft->setObjectPath != NULL) \ + i->ft->setObjectPath(i, p); \ + } while (0); enum ResourceAction { RESOURCE_ADD,

2 1

Look for offical realease of libvirt-cim
by 072021096 21 Jul '08

21 Jul '08

Hi, everyone Because I am at school,so I can not log on to the FTP of libvirt.org, so I can not get the offical realease of libvirt-cim, and I can only get the versions with bugs, is there another way to get a offical realease tarball libvirt-cim? Thank you all respectful engineers for your previous kind reply and you really help me solve a lot problems! Best Wishes! Sean_Ggz from China

2 1

problem for
by 072021096 21 Jul '08

21 Jul '08

Hi,everyone I got another problem, When i compile the libvirt-cim, it said that i have not installed libcmpiutil package, but i have installed infact. maybe i have to install the libcmpiutil-devel but i can not find it in the libvirt.org website, and other resources are all rpm for fc9, i uses centOS. so, what should i do! Thank you all! Best wishes! Sean_Ggz

2 1

[PATCH] [TEST] Fix potiential false positive in AC 01
by Kaitlin Rupert 20 Jul '08

20 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1215715693 25200 # Node ID c09b0a978a6621139eb355079994ba3eb2847779 # Parent 502dddef8c34eeb85b571df0ee97f0ee0676861b [TEST] Fix potiential false positive in AC 01. This test needs to verify enum of AC returns the same number of instances as the number of instances returned by enum of MemoryPool + ProcessorPool + DiskPool + NetworkPool. Also, cleaned up the logic to verify that the ResourceType and the InstanceIDs of the AC instances match the Pool instances they're describing. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 502dddef8c34 -r c09b0a978a66 suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py --- a/suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py Tue Jul 01 14:12:48 2008 -0700 +++ b/suites/libvirt-cim/cimtest/AllocationCapabilities/01_enum.py Thu Jul 10 11:48:13 2008 -0700 @@ -22,6 +22,7 @@ # import sys +from VirtLib.live import virsh_version from XenKvmLib import enumclass from CimTest.Globals import do_main from CimTest.Globals import logger, CIM_ERROR_ENUMERATE, platform_sup @@ -32,48 +33,52 @@ def main(): options = main.options + cn = 'AllocationCapabilities' + pools = {} pt = ['MemoryPool', 'ProcessorPool', 'DiskPool', 'NetworkPool'] try: - key_list = ["InstanceID"] - ac = enumclass.enumerate(options.ip, - "AllocationCapabilities", - key_list, - options.virt) - pools['MemoryPool'] = enumclass.enumerate(options.ip, - "MemoryPool", - key_list, - options.virt) - pools['ProcessorPool'] = enumclass.enumerate(options.ip, - "ProcessorPool", - key_list, - options.virt) - pools['DiskPool'] = enumclass.enumerate(options.ip, - "DiskPool", - key_list, - options.virt) - pools['NetworkPool'] = enumclass.enumerate(options.ip, - "NetworkPool", - key_list, - options.virt) - except Exception: - logger.error(CIM_ERROR_ENUMERATE, '%s_AllocationCapabilities' % options.virt) + key = ["InstanceID"] + ac = enumclass.enumerate(options.ip, cn, key, options.virt) + + for p in pt: + enum_list = enumclass.enumerate(options.ip, p, key, options.virt) + + if len(enum_list) < 1: + # If libvirt version >= 0.4.1, libvirt-cim uses libvirt's + # disk pool support instead of creating its own diskpool. + # In this case, it's possible for a disk pool to not exist. + libvirt_version = virsh_version(options.ip, options.virt) + if p == "DiskPool" and libvirt_version >= '0.4.1': + continue + + logger.error("%s did not return any instances" % p) + return FAIL + + for pool in enum_list: + pools[pool.InstanceID] = pool + + except Exception, details: + logger.error(CIM_ERROR_ENUMERATE, cn) + logger.error(details) return FAIL - acset = set([(x.InstanceID, x.ResourceType) for x in ac]) - poolset = set() - for pl in pools.values(): - for x in pl: - poolset.add((x.InstanceID, x.ResourceType)) + if len(ac) != len(pools): + logger.error("%s returned %s instances, expected %s" % (cn, len(ac), + len(pools))) + return FAIL - if len(acset) != len(poolset): - logger.error( - 'AllocationCapabilities return %i instances, excepted %i' - % (ac_size, pool_size)) - return FAIL - zeroset = acset - poolset - if len(zeroset) != 0: - logger.error('AC is inconsistent with pools') + try: + for inst in ac: + id = inst.InstanceID + if pools[id].ResourceType != inst.ResourceType: + logger.error("%s ResourceType %s, Pool ResourceType %s" % (cn, + inst.ResourceType, pools[id].ResourceType)) + return FAIL + + except Exception, details: + logger.error("%s returned instance with unexpected InstanceID %s" % (cn, + details)) return FAIL return PASS

2 2

[PATCH] Persist RequestedState in infostore
by Dan Smith 19 Jul '08

19 Jul '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1216390592 25200 # Node ID 18eab14c82590e3a31ec1fa2f789173061ddca97 # Parent ec88dc805bcdc63d30b866e3e527208fa684e274 Persist RequestedState in infostore This allows the ComputerSystem object to correctly expose the state last requested in addition to the actual current state. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r ec88dc805bcd -r 18eab14c8259 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Wed Jul 09 13:48:14 2008 -0700 +++ b/src/Virt_ComputerSystem.c Fri Jul 18 07:16:32 2008 -0700 @@ -237,9 +237,11 @@ int ret; uint16_t cim_state; uint16_t health_state; + uint16_t req_state; uint16_t op_status; CMPIArray *array; CMPIStatus s; + struct infostore_ctx *infostore = NULL; ret = virDomainGetInfo(dom, &info); if (ret != 0) @@ -262,6 +264,17 @@ CMSetProperty(instance, "OperationalStatus", (CMPIValue *)&array, CMPI_uint16A); + + infostore = infostore_open(dom); + if (infostore != NULL) + req_state = (uint16_t)infostore_get_u64(infostore, "reqstate"); + else + req_state = CIM_STATE_UNKNOWN; + + CMSetProperty(instance, "RequestedState", + (CMPIValue *)&req_state, CMPI_uint16); + + infostore_close(infostore); return 1; } @@ -809,6 +822,7 @@ virConnectPtr conn = NULL; virDomainPtr dom = NULL; virDomainInfo info; + struct infostore_ctx *infostore = NULL; conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); if (conn == NULL) @@ -843,6 +857,12 @@ cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_SUPPORTED, "State not supported"); + + infostore = infostore_open(dom); + if (infostore != NULL) { + infostore_set_u64(infostore, "reqstate", (uint64_t)state); + infostore_close(infostore); + } out: virDomainFree(dom);

2 1

simple question!
by 072021096 18 Jul '08

18 Jul '08

Hello every i am new here, so I want to ask a simple. It must be simple for you, but it bothered me so much. When I ./configure the libvirt-cim, it said cannot find the CMPI header, how should I do. PS: I use sfcb. but when i insall sfcb i cannot find the CMPI headers installed! what is wrong? Thank you!!!

4 3

[PATCH] [TEST] Fix CS 22 to use providers instead of virsh
by Kaitlin Rupert 17 Jul '08

17 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1215725330 25200 # Node ID 86285f56abcaf54595bc2cc54c8f044ae37ccbd7 # Parent 0a4bc49a1fbde309070f8cc4c8631cf4a5ad9c68 [TEST] Fix CS 22 to use providers instead of virsh. This test was defining a guest with virsh and then suspending it with virsh, which doesn't touch the providers in anyway. Now the test calls DefineSystem() and RequestStateChange(). Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 0a4bc49a1fbd -r 86285f56abca suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Thu Jul 10 12:39:32 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/22_define_suspend.py Thu Jul 10 14:28:50 2008 -0700 @@ -32,54 +32,47 @@ from XenKvmLib import computersystem from VirtLib import utils from XenKvmLib import vxml -from XenKvmLib.test_doms import destroy_and_undefine_all -from CimTest.Globals import do_main -from CimTest import Globals +from XenKvmLib.test_doms import destroy_and_undefine_domain +from CimTest.Globals import do_main, logger from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib.common_util import create_using_definesystem, \ + call_request_state_change sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domgst" +SUSPND_STATE = 9 +TIME = "00000000000000.000000:000" + @do_main(sup_types) def main(): options = main.options - status = FAIL - cxml = vxml.get_class(options.virt)(test_dom) - -#define VS try: - ret = cxml.define(options.ip) - if not ret: - Globals.logger.error(Globals.VIRSH_ERROR_DEFINE % test_dom) - return status - - cs = computersystem.get_cs_class(options.virt)(options.ip, test_dom) - if not (cs.Name == test_dom) : - Globals.logger.error("Error: VS %s not found" % test_dom) - cxml.undefine(options.ip) + # define the vs + status = create_using_definesystem(test_dom, options.ip, + virt=options.virt) + if status != PASS: + logger.error("Unable to define %s using DefineSystem()" % test_dom) return status - except Exception, detail: - Globals.logger.error("Errors: %s" % detail) - -#Suspend the defined VS - - try: - ret = cxml.run_virsh_cmd(options.ip, "suspend") - if not ret : - Globals.logger.info("Suspending defined VS %s failed, as expected" \ -% test_dom) + # suspend the vs + status = call_request_state_change(test_dom, options.ip, SUSPND_STATE, + TIME, virt=options.virt) + if status != PASS: + logger.info("Suspending define VS %s failed, as expected" \ + % test_dom) status = PASS else : - Globals.logger.info("Error: Suspending defined VS %s should not \ -have been allowed" % test_dom) + logger.error("Suspending defined VS %s should not have passed" % \ + test_dom) status = FAIL except Exception, detail: - Globals.logger.error("Error: %s" % detail) + logger.error("Error: %s" % detail) + status = FAIL - ret = cxml.undefine(options.ip) + destroy_and_undefine_domain(test_dom, options.ip, options.virt) return status if __name__ == "__main__":

2 1

CimTest Report on XenFV 17-07-2008
by Deepti B Kalakeri 17 Jul '08

17 Jul '08

====================================== CIM Test Report for XenFV ====================================== Distro : RHEL 5.2 Beta Kernel : 2.6.18-88.el5xen Xen version : 3.1.2-88.el5 Libvirt : libvirt-0.3.3-7.el5 CIMOM : pegasus PyWBEM : pywbem-3.14 CIM Schema : cimv216Experimental LibCMPIutil : 79 LibVirtCIM : 637 CIMTEST : 249 ====================================== PASS : 92 TOTAL FAILED : 14 [13 test cases passed when ran manually] ACTUAL FAILED : 1 XFAIL : 6 SKIP : 18 ------------------- Total : 130 ====================================== List of tc that are failing: ComputerSystem - 06_paused_active_suspend.py: FAIL The following tc passed when run manually: ComputerSystem - 03_defineVS.py ComputerSystem - 42_cs_gi_errs.py ElementConforms - 01_forward.py ElementConforms - 02_reverse.py ElementSettingData - 01_forward.py EnabledLogicalElementCapabilities - 01_enum.py LogicalDisk - 02_nodevs.py LogicalDisk - 03_ld_gi_errs.py Memory - 01_memory.py NetworkPort - 01_netport.py VSSD - 04_vssd_to_rasd.py VirtualSystemManagementService - 08_modifyresource.py VirtualSystemManagementService - 09_procrasd_persist.py Please find the complete report attached with the mail. Thanks and Regards, Deepti. ComputerSystem - 03_defineVS.py: FAIL ComputerSystem - 06_paused_active_suspend.py: FAIL ComputerSystem - 42_cs_gi_errs.py: FAIL ElementConforms - 01_forward.py: FAIL ElementConforms - 02_reverse.py: FAIL ElementSettingData - 01_forward.py: FAIL EnabledLogicalElementCapabilities - 01_enum.py: FAIL LogicalDisk - 02_nodevs.py: FAIL LogicalDisk - 03_ld_gi_errs.py: FAIL Memory - 01_memory.py: FAIL NetworkPort - 01_netport.py: FAIL VSSD - 04_vssd_to_rasd.py: FAIL VirtualSystemManagementService - 08_modifyresource.py: FAIL VirtualSystemManagementService - 09_procrasd_persist.py: FAIL Starting test suite: libvirt-cim Cleaned log files. Testing XenFV hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: FAIL ERROR - Failed to enumerate the class of Xen_ComputerSystem ERROR - Exception: No defined domain (domU1) is found ERROR - Error: property values are not set for VS domU1 ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<00002> ComputerSystem - 06_paused_active_suspend.py: FAIL ERROR - Exception: (1, u'CIM_ERR_FAILED: Domain not running') ERROR - Unable to suspend dom DomST1 using RequestedStateChange() InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Domain not running ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 27_define_suspend_errs.py: PASS ComputerSystem - 32_start_reboot.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 33_suspend_reboot.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 35_start_reset.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Attributes for dom test_domain not set as expected. Bug:<00002> ComputerSystem - 40_RSC_start.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Exception: Attributes were not set as expected for domain: 'test_domain' Bug:<00002> ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP ComputerSystem - 42_cs_gi_errs.py: FAIL ERROR - Unexpected rc code 6 and description CIM_ERR_NOT_FOUND: No such instance (ETdomain). ERROR - ------ FAILED: Invalid CCName Key Value.------ ERROR - Unexpected rc code 6 and description CIM_ERR_NOT_FOUND: No such instance (ETdomain). ERROR - ------ FAILED: Invalid CCName Key Name.------ ComputerSystemIndication - 01_created_indication.py: PASS ElementAllocatedFromPool - 01_forward.py: PASS ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS ElementCapabilities - 03_forward_errs.py: PASS ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: FAIL ERROR - Failed to get associators information for ElementConformsToProfile ERROR - Exception: not enough arguments for format string ElementConforms - 02_reverse.py: FAIL ERROR - ERROR: Instance for domgst not created ElementConforms - 03_ectp_fwd_errs.py: PASS ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: FAIL ERROR - Expected at least one VirtualSystemSettingData instance CIM_ERR_NOT_FOUND: No such instance (esd_dom) ElementSettingData - 03_esd_assoc_with_rasd_errs.py: SKIP EnabledLogicalElementCapabilities - 01_enum.py: FAIL ERROR - Get domain list error, the number of domains is not equal EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: PASS HostSystem - 03_hs_to_settdefcap.py: PASS HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: SKIP HostedDependency - 02_reverse.py: SKIP HostedDependency - 03_enabledstate.py: SKIP HostedDependency - 04_reverse_errs.py: SKIP HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS LogicalDisk - 02_nodevs.py: FAIL ERROR - LogicalDisk returned 1 instead of empty list LogicalDisk - 03_ld_gi_errs.py: FAIL ERROR - Failed to get instance by the class of Xen_LogicalDisk ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (hd_domain/hda)') Memory - 01_memory.py: FAIL ERROR - Capacity should be 262144 MB instead of 131072 MB Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: FAIL ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: SKIP Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: PASS Profile - 02_profile_to_elec.py: SKIP Profile - 03_rprofile_gi_errs.py: PASS RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: SKIP ResourcePool - 02_rp_gi_errors.py: SKIP ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: PASS SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: PASS SettingsDefineCapabilities - 03_forward_errs.py: PASS SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: SKIP VSSD - 03_vssd_gi_errs.py: PASS VSSD - 04_vssd_to_rasd.py: FAIL ERROR - Xen_VirtualSystemSettingData with VSSDC_dom was not returned ERROR - Xen_VirtualSystemSettingData returned 0 VSSD objects, expected only 1 VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: PASS VirtualSystemManagementService - 02_destroysystem.py: PASS VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS VirtualSystemManagementService - 05_destroysystem_neg.py: PASS VirtualSystemManagementService - 06_addresource.py: SKIP VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: FAIL ERROR - Got None, exp /tmp/default-kvm-dimage.2ND. ERROR - Error invoking ModifyRS: mod_disk_res ERROR - Error changing rs for disk path VirtualSystemManagementService - 09_procrasd_persist.py: FAIL ERROR - limit is 0, expected 256 ERROR - rstest_domain CPU scheduling not set properly VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS

1 0

test list in SKIPPING status for KVM
by Guo Lian Yun 17 Jul '08

17 Jul '08

Floks, Here are the tests that are currently in SKIPPING status for KVM. Y - Needs to be implemented N - Does not to be implemented If there is any misktake please let me know. Test KVM ComputerSystem - 23_suspend_suspend.py: SKIP Y ComputerSystem - 27_define_suspend_errs.py Y ComputerSystem - 32_start_reboot.py Y ComputerSystem - 33_suspend_reboot.py Y ComputerSystem - 35_start_reset.py Y ComputerSystem - 41_cs_to_settingdefinestate.py Y ElementAllocatedFromPool - 01_forward.py Y ElementAllocatedFromPool - 02_reverse.py Y HostSystem - 04_hs_to_EAPF.py Y VSSD - 02_bootldr.py N VirtualSystemMigrationService - 01_migratable_host.py Y VirtualSystemMigrationService - 02_host_migrate_type.py Y VirtualSystemMigrationService - 05_migratable_host_errs.py Y VirtualSystemSettingDataComponent - 01_forward.py N Best, Regards Daisy (运国莲) VSM Team, China Systems & Technology Labs (CSTL) E-mail: yunguol(a)cn.ibm.com TEL: (86)-21-60922144 Building 10, 399 Ke Yuan Rd, Pudong Shanghai, 201203

2 5

[PATCH] [TEST] 2# Update VirtualSystemSettingDataComponent.01 for LXC support
by Guo Lian Yun 17 Jul '08

17 Jul '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1216192956 25200 # Node ID 4fab30cea82ff4b689b16594e0db865a5366ec65 # Parent 64abdd1495dc05e69061151baf2ea25a682e8d8d [TEST] 2# Update VirtualSystemSettingDataComponent.01 for LXC support The test defines non-bootloader guests for all platform types, also remove the part of thet test that verifies the bootloader Updates from 1 to 2: Pass test_disk and test_mac as parameters into init_list() function. On the assoc_values(), I will update it to call compare_all_prop() when Kaitlin's patch applied in the tree. diff -r 64abdd1495dc -r 4fab30cea82f suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py --- a/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Fri Jul 11 00:42:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/VirtualSystemSettingDataComponent/01_forward.py Wed Jul 16 00:22:36 2008 -0700 @@ -53,31 +53,29 @@ from XenKvmLib import enumclass from XenKvmLib import enumclass from VirtLib import utils from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all -from XenKvmLib.test_xml import testxml_bl -from XenKvmLib.test_xml import xml_get_dom_bootloader from CimTest import Globals from XenKvmLib import assoc +from XenKvmLib import vxml +from XenKvmLib.classes import get_typed_class from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import FAIL, PASS -sup_types = ['Xen'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "VSSDC_dom" test_vcpus = 2 test_mac = "00:11:22:33:44:aa" test_disk = 'xvda' -status = 0 -VSType = "Xen" - -def init_list(): + +def init_list(test_disk, test_mac, virt='Xen'): """ Creating the lists that will be used for comparisons. """ - rlist = ['Xen_DiskResourceAllocationSettingData', - 'Xen_MemResourceAllocationSettingData', - 'Xen_NetResourceAllocationSettingData', - 'Xen_ProcResourceAllocationSettingData' + rlist = [get_typed_class(virt, 'DiskResourceAllocationSettingData'), + get_typed_class(virt, 'MemResourceAllocationSettingData'), + get_typed_class(virt, 'NetResourceAllocationSettingData'), + get_typed_class(virt, 'ProcResourceAllocationSettingData') ] prop_list = {rlist[0] : "%s/%s" % (test_dom, test_disk), @@ -85,7 +83,10 @@ def init_list(): rlist[2] : "%s/%s" % (test_dom, test_mac), rlist[3] : "%s/%s" % (test_dom, "proc") } - + if virt == 'LXC': + rlist = [get_typed_class(virt, 'MemResourceAllocationSettingData')] + prop_list = {rlist[0] : "%s/%s" % (test_dom, "mem")} + return prop_list def build_vssd_info(ip, vssd): @@ -93,14 +94,14 @@ def build_vssd_info(ip, vssd): Creating the vssd fileds lists that will be used for comparisons. """ - if vssd.Bootloader == "" or vssd.Caption == "" or \ + if vssd.Caption == "" or \ vssd.InstanceID == "" or vssd.ElementName == "" or \ vssd.VirtualSystemIdentifier == "" or vssd.VirtualSystemType == "": logger.error("One of the required VSSD details seems to be empty") test_domain_function(test_dom, ip, "undefine") return FAIL - vssd_vals = {'Bootloader' : vssd.Bootloader, + vssd_vals = { 'Caption' : vssd.Caption, 'InstanceID' : vssd.InstanceID, 'ElementName' : vssd.ElementName, @@ -143,23 +144,33 @@ def main(): status = FAIL destroy_and_undefine_all(options.ip) - test_xml = testxml_bl(test_dom, vcpus = test_vcpus, \ - mac = test_mac, disk = test_disk, \ - server = options.ip,\ - gtype = 0) - ret = test_domain_function(test_xml, options.ip, cmd = "define") + prop_list = init_list(test_disk, test_mac, options.virt) + virt_xml = vxml.get_class(options.virt) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + else: + cxml = virt_xml(test_dom, vcpus = test_vcpus, \ + mac = test_mac, disk = test_disk) + ret = cxml.define(options.ip) if not ret: logger.error("Failed to define the dom: %s", test_dom) return FAIL - instIdval = "%s:%s" % (VSType, test_dom) + if options.virt == 'XenFV': + instIdval = "Xen:%s" % test_dom + else: + instIdval = "%s:%s" % (options.virt, test_dom) + keyname = "InstanceID" key_list = { 'InstanceID' : instIdval } + vssd_cn = get_typed_class(options.virt, 'VirtualSystemSettingData') + try: vssd = enumclass.getInstance(options.ip, \ - enumclass.Xen_VirtualSystemSettingData, \ - key_list) + 'VirtualSystemSettingData', \ + key_list, + options.virt) if vssd is None: logger.error("VSSD instance for %s not found" % test_dom) test_domain_function(test_dom, options.ip, "undefine") @@ -168,21 +179,19 @@ def main(): vssd_vals = build_vssd_info(options.ip, vssd) except Exception, detail : - logger.error(Globals.CIM_ERROR_GETINSTANCE, \ - 'Xen_VirtualSystemSettingData') + logger.error(Globals.CIM_ERROR_GETINSTANCE, vssd_cn) logger.error("Exception : %s" % detail) - test_domain_function(test_dom, options.ip, "undefine") - return FAIL - - prop_list = init_list() + cxml.undefine(options.ip) + return FAIL + try: # Looping through the RASD_cllist, call association # Xen_VirtualSystemSettingDataComponent with each class in RASD_cllist - an = 'Xen_VirtualSystemSettingDataComponent' + an = get_typed_class(options.virt, 'VirtualSystemSettingDataComponent') for rasd_cname, prop in prop_list.iteritems(): assoc_info = assoc.Associators(options.ip, an, rasd_cname, - InstanceID = prop) + options.virt, InstanceID = prop) # Verify the association fields returned for particular rasd_cname. status = assoc_values(options.ip, assoc_info, rasd_cname, an, vssd_vals) @@ -194,7 +203,7 @@ def main(): logger.error("Exception : %s" % detail) status = FAIL - test_domain_function(test_dom, options.ip, "undefine") + cxml.undefine(options.ip) return status if __name__ == "__main__":

2 1

[PATCH] [TEST] #3 Updating 01_forward.py of EAFP
by Deepti B. Kalakeri 17 Jul '08

17 Jul '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1216218212 25200 # Node ID c2a1ddb060ced4b86c1624681500efcf87bb667b # Parent 64abdd1495dc05e69061151baf2ea25a682e8d8d [TEST] #3 Updating 01_forward.py of EAFP Changes: -------- >From 2 to 3: ------------ 1) Removed the key param for get_inst() 2) Removed the init_list() , instead hardcoded the list. 3) Removed get_keys()which is no longer needed. 4) Removed the break stmt and returned FAIL directly. 5) Removed unnecessary status variables. >From 1 to 2: ------------ 1) Added support for LXC. 2) Made only EAFP pool specific checks. 3) Removed eafp_list() used previously, instead added get_id to create the pool list . 4) Removed print_error(). 5) Removed get_id instead used get_inst. 6) Added support for Memory, Processor, NetworkPort to enumclass.py. Patch 1: ------- 1) Modifying the tc to support XenFV and KVM. 2) Modified get_keys() to use proper SystemCreationClassName. 3) Added functions get_id to get the instances for different logical devices so that the DeviceID of the instances can be used in the init_list(). 4) Added init_list() function to create a list of inputs for the EAFP association. 5) Added eafp_list() to create a list of pool values that will be used to verify the return values from the EAFP association. 6) Added the function verify_eafp_values() to call assocation on EAFP and verify the return values. 7) Included cleanup_restore(). Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 64abdd1495dc -r c2a1ddb060ce suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Fri Jul 11 00:42:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Wed Jul 16 07:23:32 2008 -0700 @@ -42,165 +42,150 @@ import sys import pywbem -from XenKvmLib.test_xml import testxml, testxml_bridge -from VirtLib import utils -from XenKvmLib import assoc -from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all +from XenKvmLib.assoc import Associators +from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib import devices -from CimTest import Globals -from CimTest.Globals import do_main -from VirtLib.live import network_by_bridge -from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.enumclass import getInstance +from CimTest.Globals import CIM_ERROR_ASSOCIATORS, CIM_ERROR_GETINSTANCE +from XenKvmLib.vxml import get_class +from XenKvmLib.common_util import create_diskpool_conf, cleanup_restore +from XenKvmLib.classes import get_typed_class +from XenKvmLib.logicaldevices import field_err +from CimTest.Globals import do_main, logger +from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "hd_domain" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 -test_disk = 'xvda' +def get_inst(server, virt, cn, key_list): + inst = None + try: + inst = getInstance(server, cn, key_list, virt) -def print_error(cn, detail): - Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, cn) - Globals.logger.error("Exception: %s", detail) + except Exception, details: + logger.error("Exception %s" % details) + return None -def get_keys(cn, device_id): - id = "%s/%s" % (test_dom, device_id) + if inst is None: + logger.error("Expected at least one %s instance" % cn) + return None - key_list = { 'DeviceID' : id, - 'CreationClassName' : cn, - 'SystemName' : test_dom, - 'SystemCreationClassName' : "Xen_ComputerSystem" - } + return inst - return key_list +def get_pool_details(server, virt, vsxml, diskid): + gi_inst_list = {} + inst = None + if virt != 'LXC': + virt_network = vsxml.xml_get_net_network() + keys = { + 'DiskPool' : diskid, + 'ProcessorPool' : 'ProcessorPool/0' , + 'MemoryPool' : 'MemoryPool/0', + 'NetworkPool' : 'NetworkPool/%s' %virt_network + } + else: + keys = { + 'MemoryPool' : 'MemoryPool/0', + } + + for cn, k in keys.iteritems(): + key_list = {"InstanceID" : k} + inst = get_inst(server, virt, cn, key_list) + if inst is None: + cleanup_restore(server, virt) + vsxml.destroy(server) + return FAIL, gi_inst_list + cn = get_typed_class(virt, cn) + gi_inst_list[cn] = { 'InstanceID' : inst.InstanceID, + 'PoolID' : inst.PoolID + } + return PASS, gi_inst_list + +def verify_eafp_values(server, virt, in_pllist, gi_inst_list): + # Looping through the in_pllist to get association for devices. + an = get_typed_class(virt, "ElementAllocatedFromPool") + sccn = get_typed_class(virt, "ComputerSystem") + for cn, devid in sorted(in_pllist.iteritems()): + try: + assoc_info = Associators(server, an, cn, + DeviceID = devid, + CreationClassName = cn, + SystemName = test_dom, + SystemCreationClassName = sccn, + virt=virt) + if len(assoc_info) != 1: + logger.error("%s returned %i ResourcePool objects for " + "domain '%s'", an, len(assoc_info), + test_dom) + return FAIL + assoc_eafp_info = assoc_info[0] + CCName = assoc_eafp_info.classname + gi_inst = gi_inst_list[CCName] + if assoc_eafp_info['InstanceID'] != gi_inst['InstanceID']: + field_err(assoc_eafp_info, gi_inst, 'InstanceID') + return FAIL + if assoc_eafp_info['PoolID'] != gi_inst['PoolID']: + field_err(assoc_eafp_info, gi_inst, 'PoolID') + return FAIL + except Exception, detail: + logger.error(CIM_ERROR_ASSOCIATORS, an) + logger.error("Exception: %s", detail) + cleanup_restore(server, virt) + return FAIL + return PASS + @do_main(sup_types) def main(): options = main.options - status = PASS - idx = 0 + server = options.ip + virt = options.virt + if virt == 'Xen': + test_disk = 'xvda' + else: + test_disk = 'hda' -# Getting the VS list and deleting the test_dom if it already exists. - destroy_and_undefine_all(options.ip) + # Getting the VS list and deleting the test_dom if it already exists. + destroy_and_undefine_all(server) + virt_type = get_class(virt) + if virt == 'LXC': + vsxml = virt_type(test_dom) + else: + vsxml = virt_type(test_dom, vcpus = test_vcpus, mac = test_mac, + disk = test_disk) - test_xml, bridge = testxml_bridge(test_dom, vcpus = test_vcpus, \ - mac = test_mac, disk = test_disk, \ - server = options.ip) - if bridge == None: - Globals.logger.error("Unable to find virtual bridge") - return SKIP + # Verify DiskPool on machine + status, diskid = create_diskpool_conf(server, virt) + if status != PASS: + return status + ret = vsxml.create(server) + if not ret: + logger.error("Failed to Create the dom: '%s'", test_dom) + return FAIL + + mem_cn = get_typed_class(virt, "Memory") + ldlist = { + mem_cn : "%s/%s" % (test_dom, "mem"), + } - if test_xml == None: - Globals.logger.error("Guest xml not created properly") - return FAIL + if virt != 'LXC': + disk_cn = get_typed_class(virt, "LogicalDisk") + net_cn = get_typed_class(virt, "NetworkPort") + proc_cn = get_typed_class(virt, "Processor") + ldlist[disk_cn] = "%s/%s" % (test_dom, test_disk) + ldlist[net_cn] = "%s/%s" % (test_dom, test_mac) + ldlist[proc_cn] = "%s/%s" % (test_dom, "0") - virt_network = network_by_bridge(bridge, options.ip) - if virt_network == None: - Globals.logger.error("No virtual network found for bridge %s", bridge) - return SKIP - - ret = test_domain_function(test_xml, options.ip, cmd = "create") - if not ret: - Globals.logger.error("Failed to Create the dom: %s", test_dom) - return FAIL - - try: - cn = "Xen_LogicalDisk" - key_list = get_keys(cn, test_disk) - disk = devices.Xen_LogicalDisk(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL - - try: - cn = "Xen_Memory" - key_list = get_keys(cn, "mem") - mem = devices.Xen_Memory(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL - - try: - cn = "Xen_NetworkPort" - key_list = get_keys(cn, test_mac) - net = devices.Xen_NetworkPort(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL - - try: - cn = "Xen_Processor" - key_list = get_keys(cn, "0") - proc = devices.Xen_Processor(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL - - netpool_id = "NetworkPool/%s" % virt_network - - lelist = { - "Xen_LogicalDisk" : disk.DeviceID, \ - "Xen_Memory" : mem.DeviceID, \ - "Xen_NetworkPort" : net.DeviceID, \ - "Xen_Processor" : proc.DeviceID - } - poollist = [ - "Xen_DiskPool", \ - "Xen_MemoryPool", \ - "Xen_NetworkPool", \ - "Xen_ProcessorPool" - ] - poolval = [ - "DiskPool/foo", \ - "MemoryPool/0", \ - netpool_id, \ - "ProcessorPool/0" - ] - - sccn = "Xen_ComputerSystem" - for cn, devid in sorted(lelist.items()): - try: - assoc_info = assoc.Associators(options.ip, \ - "Xen_ElementAllocatedFromPool", - cn, - DeviceID = devid, - CreationClassName = cn, - SystemName = test_dom, - SystemCreationClassName = sccn) - if len(assoc_info) != 1: - Globals.logger.error("Xen_ElementAllocatedFromPool returned %i\ - ResourcePool objects for domain '%s'", len(assoc_info), test_dom) - status = FAIL - break - - if assoc_info[0].classname != poollist[idx]: - Globals.logger.error("Classname Mismatch") - Globals.logger.error("Returned %s instead of %s", \ - assoc_info[0].classname, \ - poollist[idx]) - status = FAIL - - if assoc_info[0]['InstanceID'] != poolval[idx]: - Globals.logger.error("InstanceID Mismatch") - Globals.logger.error("Returned %s instead of %s", \ - assoc_info[0]['InstanceID'], \ - poolval[idx]) - status = FAIL - - if status != PASS: - break - else: - idx = idx + 1 - - except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, \ - 'Xen_ElementAllocatedFromPool') - Globals.logger.error("Exception: %s", detail) - status = FAIL - - ret = test_domain_function(test_dom, options.ip, \ - cmd = "destroy") + status, gi_inst_list = get_pool_details(server, virt, vsxml, diskid) + if status != PASS: + return status + + status = verify_eafp_values(server, virt, ldlist, gi_inst_list) + cleanup_restore(server, virt) + vsxml.destroy(server) return status if __name__ == "__main__": diff -r 64abdd1495dc -r c2a1ddb060ce suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri Jul 11 00:42:35 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Wed Jul 16 07:23:32 2008 -0700 @@ -117,6 +117,30 @@ class Xen_LogicalDisk(CIM_LogicalDevice) pass class KVM_LogicalDisk(CIM_LogicalDevice): + pass + +class Xen_Memory(CIM_LogicalDevice): + pass + +class KVM_Memory(CIM_LogicalDevice): + pass + +class LXC_Memory(CIM_LogicalDevice): + pass + +class LXC_Memory(CIM_LogicalDevice): + pass + +class Xen_Processor(CIM_LogicalDevice): + pass + +class KVM_Processor(CIM_LogicalDevice): + pass + +class Xen_NetworkPort(CIM_LogicalDevice): + pass + +class KVM_NetworkPort(CIM_LogicalDevice): pass class Xen_MemoryPool(CIM_ResourcePool):

1 0

CimTest Report for KVM on F9 16-07-2008
by Deepti B Kalakeri 17 Jul '08

17 Jul '08

======================================================================== CIM Test Report for KVM on F9 with latest libvirt-cim and libcmpiutil ======================================================================== Distro : Fedora 9 Beta Kernel : 2.6.25-0.121.rc5.git4.fc9 Libvirt : libvirt-0.4.2-1.fc9.x86_64 CIMOM : pegasus PyWBEM : pywbem-0.6 CIM Schema : cimv216Experimental LibCMPIutil : 79 LibVirtCIM : 637 CIMTEST : 243 ======================================================= PASS : 110 FAIL : 1 XFAIL : 4 SKIP : 15 ----------------- Total : 130 ======================================================= Here is one of the tc that failed ComputerSystemIndication - 01_created_indication.py: FAIL ERROR - Waited too long for indication Please find the complete report attached with the mail. Thanks and Regards, Deepti. Starting test suite: libvirt-cim Cleaned log files. Testing KVM hypervisor AllocationCapabilities - 01_enum.py: PASS AllocationCapabilities - 02_alloccap_gi_errs.py: PASS ComputerSystem - 01_enum.py: PASS ComputerSystem - 02_nosystems.py: PASS ComputerSystem - 03_defineVS.py: PASS ComputerSystem - 04_defineStartVS.py: PASS ComputerSystem - 05_activate_defined_start.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from Defined State to Activate state was not Successful Bug:<00002> ComputerSystem - 06_paused_active_suspend.py: XFAIL Bug: 00002 ERROR - ERROR: VS DomST1 transition from suspend State to Activate state was not Successful Bug:<00002> ComputerSystem - 22_define_suspend.py: PASS ComputerSystem - 23_suspend_suspend.py: SKIP ComputerSystem - 27_define_suspend_errs.py: SKIP ComputerSystem - 32_start_reboot.py: SKIP ComputerSystem - 33_suspend_reboot.py: SKIP ComputerSystem - 35_start_reset.py: SKIP ComputerSystem - 40_RSC_start.py: XFAIL Bug: 00002 ERROR - RequestedState should be 2 not 12 ERROR - Exception: Attributes were not set as expected for domain: 'test_domain' Bug:<00002> ComputerSystem - 41_cs_to_settingdefinestate.py: SKIP libvir: QEMU error : Domain not found libvir: Domain error : invalid domain pointer in virDomainFree ComputerSystem - 42_cs_gi_errs.py: PASS ComputerSystemIndication - 01_created_indication.py: FAIL ERROR - Waited too long for indication ElementAllocatedFromPool - 01_forward.py: SKIP ElementAllocatedFromPool - 02_reverse.py: SKIP ElementAllocatedFromPool - 03_reverse_errs.py: PASS ElementAllocatedFromPool - 04_forward_errs.py: PASS ElementCapabilities - 01_forward.py: PASS ElementCapabilities - 02_reverse.py: PASS libvir: QEMU error : Domain not found libvir: Domain error : invalid domain pointer in virDomainFree ElementCapabilities - 03_forward_errs.py: PASS libvir: QEMU error : Domain not found ElementCapabilities - 04_reverse_errs.py: PASS ElementCapabilities - 05_hostsystem_cap.py: PASS ElementConforms - 01_forward.py: PASS ElementConforms - 02_reverse.py: PASS ElementConforms - 03_ectp_fwd_errs.py: PASS libvir: QEMU error : Domain not found libvir: Domain error : invalid domain pointer in virDomainFree ElementConforms - 04_ectp_rev_errs.py: PASS ElementSettingData - 01_forward.py: PASS ElementSettingData - 03_esd_assoc_with_rasd_errs.py: PASS EnabledLogicalElementCapabilities - 01_enum.py: PASS libvir: QEMU error : Domain not found EnabledLogicalElementCapabilities - 02_elecap_gi_errs.py: PASS HostSystem - 01_enum.py: PASS HostSystem - 02_hostsystem_to_rasd.py: PASS HostSystem - 03_hs_to_settdefcap.py: PASS HostSystem - 04_hs_to_EAPF.py: SKIP HostSystem - 05_hs_gi_errs.py: PASS HostSystem - 06_hs_to_vsms.py: PASS HostedDependency - 01_forward.py: PASS HostedDependency - 02_reverse.py: PASS HostedDependency - 03_enabledstate.py: PASS HostedDependency - 04_reverse_errs.py: PASS HostedResourcePool - 01_forward.py: PASS HostedResourcePool - 02_reverse.py: PASS HostedResourcePool - 03_forward_errs.py: PASS HostedResourcePool - 04_reverse_errs.py: PASS HostedService - 01_forward.py: PASS HostedService - 02_reverse.py: PASS HostedService - 03_forward_errs.py: PASS HostedService - 04_reverse_errs.py: PASS LogicalDisk - 01_disk.py: PASS libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend LogicalDisk - 02_nodevs.py: PASS LogicalDisk - 03_ld_gi_errs.py: PASS Memory - 01_memory.py: PASS Memory - 02_defgetmem.py: PASS Memory - 03_mem_gi_errs.py: PASS NetworkPort - 01_netport.py: PASS NetworkPort - 02_np_gi_errors.py: PASS NetworkPort - 03_user_netport.py: XFAIL Bug: 00004 ERROR - Exception: (6, u'CIM_ERR_NOT_FOUND: No such instance (test_domain/00:11:22:33:44:55)') Bug:<00004> Processor - 01_processor.py: PASS Processor - 02_definesys_get_procs.py: PASS Processor - 03_proc_gi_errs.py: PASS Profile - 01_enum.py: PASS Profile - 02_profile_to_elec.py: SKIP libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend Profile - 03_rprofile_gi_errs.py: PASS RASD - 01_verify_rasd_fields.py: PASS RASD - 02_enum.py: PASS libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend RASD - 03_rasd_errs.py: PASS ReferencedProfile - 01_verify_refprof.py: PASS ReferencedProfile - 02_refprofile_errs.py: PASS ResourceAllocationFromPool - 01_forward.py: PASS ResourceAllocationFromPool - 02_reverse.py: PASS ResourceAllocationFromPool - 03_forward_errs.py: PASS ResourceAllocationFromPool - 04_reverse_errs.py: PASS libvir: Network error : invalid network pointer in virNetworkFree libvir: QEMU error : Network not found: no network with matching name libvir: Network error : invalid network pointer in virNetworkFree ResourceAllocationFromPool - 05_RAPF_err.py: PASS ResourcePool - 01_enum.py: PASS ResourcePool - 02_rp_gi_errors.py: PASS ResourcePoolConfigurationCapabilities - 01_enum.py: PASS ResourcePoolConfigurationCapabilities - 02_rpcc_gi_errs.py: PASS ResourcePoolConfigurationService - 01_enum.py: PASS ResourcePoolConfigurationService - 02_rcps_gi_errors.py: PASS ResourcePoolConfigurationService - 03_CreateResourcePool.py: PASS ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: PASS ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS SettingsDefine - 01_forward.py: PASS SettingsDefine - 02_reverse.py: PASS SettingsDefine - 03_sds_fwd_errs.py: PASS SettingsDefine - 04_sds_rev_errs.py: PASS SettingsDefineCapabilities - 01_forward.py: PASS SettingsDefineCapabilities - 03_forward_errs.py: PASS SettingsDefineCapabilities - 04_forward_vsmsdata.py: PASS SettingsDefineCapabilities - 05_reverse_vsmcap.py: PASS SystemDevice - 01_forward.py: PASS SystemDevice - 02_reverse.py: PASS SystemDevice - 03_fwderrs.py: PASS VSSD - 01_enum.py: PASS VSSD - 02_bootldr.py: SKIP VSSD - 03_vssd_gi_errs.py: PASS VSSD - 04_vssd_to_rasd.py: PASS VirtualSystemManagementCapabilities - 01_enum.py: PASS VirtualSystemManagementCapabilities - 02_vsmcap_gi_errs.py: PASS VirtualSystemManagementService - 01_definesystem_name.py: PASS VirtualSystemManagementService - 02_destroysystem.py: PASS VirtualSystemManagementService - 03_definesystem_ess.py: PASS VirtualSystemManagementService - 04_definesystem_ers.py: PASS libvir: Domain error : invalid domain pointer in virDomainFree libvir: QEMU error : Domain not found libvir: Domain error : invalid domain pointer in virDomainFree VirtualSystemManagementService - 05_destroysystem_neg.py: PASS VirtualSystemManagementService - 06_addresource.py: PASS VirtualSystemManagementService - 07_addresource_neg.py: PASS VirtualSystemManagementService - 08_modifyresource.py: PASS VirtualSystemManagementService - 09_procrasd_persist.py: PASS VirtualSystemMigrationCapabilities - 01_enum.py: PASS VirtualSystemMigrationCapabilities - 02_vsmc_gi_errs.py: PASS VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationSettingData - 01_enum.py: PASS VirtualSystemMigrationSettingData - 02_vsmsd_gi_errs.py: PASS VirtualSystemSettingDataComponent - 01_forward.py: SKIP VirtualSystemSettingDataComponent - 02_reverse.py: PASS VirtualSystemSettingDataComponent - 03_vssdc_fwd_errs.py: PASS VirtualSystemSettingDataComponent - 04_vssdc_rev_errs.py: PASS VirtualSystemSnapshotService - 01_enum.py: PASS VirtualSystemSnapshotService - 02_vs_sservice_gi_errs.py: PASS VirtualSystemSnapshotServiceCapabilities - 01_enum.py: PASS VirtualSystemSnapshotServiceCapabilities - 02_vs_sservicecap_gi_errs.py: PASS

1 0

[PATCH] [TEST] #2 Updating 01_forward.py of EAFP
by Deepti B. Kalakeri 17 Jul '08

17 Jul '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1216118958 25200 # Node ID a379943366703def9ecfe0a03779f91d3556a244 # Parent 64abdd1495dc05e69061151baf2ea25a682e8d8d [TEST] #2 Updating 01_forward.py of EAFP Changes: -------- >From 1 to 2: ------------ 1) Added support for LXC. 2) Made only EAFP pool specific checks. 3) Removed eafp_list() used previously, instead added get_id to create the pool list . 4) Removed print_error(). 5) Removed get_id instead used get_inst. 6) Added support for Memory, Processor, NetworkPort to enumclass.py. Patch 1: ------- 1) Modifying the tc to support XenFV and KVM. 2) Modified get_keys() to use proper SystemCreationClassName. 3) Added functions get_id to get the instances for different logical devices so that the DeviceID of the instances can be used in the init_list(). 4) Added init_list() function to create a list of inputs for the EAFP association. 5) Added eafp_list() to create a list of pool values that will be used to verify the return values from the EAFP association. 6) Added the function verify_eafp_values() to call assocation on EAFP and verify the return values. 7) Included cleanup_restore(). Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 64abdd1495dc -r a37994336670 suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Fri Jul 11 00:42:35 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementAllocatedFromPool/01_forward.py Tue Jul 15 03:49:18 2008 -0700 @@ -42,165 +42,178 @@ import sys import pywbem -from XenKvmLib.test_xml import testxml, testxml_bridge -from VirtLib import utils -from XenKvmLib import assoc -from XenKvmLib.test_doms import test_domain_function, destroy_and_undefine_all +from XenKvmLib.assoc import Associators +from XenKvmLib.test_doms import destroy_and_undefine_all from XenKvmLib import devices -from CimTest import Globals -from CimTest.Globals import do_main -from VirtLib.live import network_by_bridge -from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.enumclass import getInstance +from CimTest.Globals import CIM_ERROR_ASSOCIATORS, CIM_ERROR_GETINSTANCE +from XenKvmLib.vxml import get_class +from XenKvmLib.common_util import create_diskpool_conf, cleanup_restore +from XenKvmLib.classes import get_typed_class +from XenKvmLib.logicaldevices import field_err +from CimTest.Globals import do_main, logger +from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "hd_domain" test_mac = "00:11:22:33:44:aa" test_vcpus = 1 -test_disk = 'xvda' +def get_keys(virt, cn, id): + sccn = get_typed_class(virt, "ComputerSystem") + cn = get_typed_class(virt, cn) + key_list = { 'DeviceID' : id, + 'CreationClassName' : cn, + 'SystemName' : test_dom, + 'SystemCreationClassName' : sccn + } + return key_list -def print_error(cn, detail): - Globals.logger.error(Globals.CIM_ERROR_GETINSTANCE, cn) - Globals.logger.error("Exception: %s", detail) +def get_inst(server, virt, cn, key, key_list): + inst = None + try: + inst = getInstance(server, cn, key_list, virt) -def get_keys(cn, device_id): - id = "%s/%s" % (test_dom, device_id) + except Exception, details: + logger.error("Exception %s" % details) + return None - key_list = { 'DeviceID' : id, - 'CreationClassName' : cn, - 'SystemName' : test_dom, - 'SystemCreationClassName' : "Xen_ComputerSystem" - } + if inst is None: + logger.error("Expected at least one %s instance" % cn) + return None - return key_list + return inst + +def init_list(server, virt, vsxml, test_disk): + lelist = {} + if virt != 'LXC': + cn_keys_list = { + "LogicalDisk" : "%s/%s" % (test_dom, test_disk), + "Memory" : "%s/%s" % (test_dom, "mem"), + "NetworkPort" : "%s/%s" % (test_dom, test_mac), + "Processor" : "%s/%s" % (test_dom, "0") + } + else: + cn_keys_list = { + "Memory" : "%s/%s" % (test_dom, "mem"), + } + + for cname, id in cn_keys_list.items(): + key_list = get_keys(virt, cname, id) + inst = get_inst(server, virt, cname, id, key_list) + if inst is None : + cleanup_restore(server, virt) + vsxml.destroy(server) + return FAIL, lelist + lelist [inst.CreationClassName] = inst.DeviceID + return PASS, lelist + +def get_pool_details(server, virt, vsxml, diskid): + gi_inst_list = {} + inst = None + if virt != 'LXC': + virt_network = vsxml.xml_get_net_network() + keys = { + 'DiskPool' : diskid, + 'ProcessorPool' : 'ProcessorPool/0' , + 'MemoryPool' : 'MemoryPool/0', + 'NetworkPool' : 'NetworkPool/%s' %virt_network + } + else: + keys = { + 'MemoryPool' : 'MemoryPool/0', + } + + for cn, k in keys.iteritems(): + key_list = {"InstanceID" : k} + inst = get_inst(server, virt, cn, k, key_list) + if inst is None: + cleanup_restore(server, virt) + vsxml.destroy(server) + return FAIL, gi_inst_list + cn = get_typed_class(virt, cn) + gi_inst_list[cn] = { 'InstanceID' : inst.InstanceID, + 'PoolID' : inst.PoolID + } + return PASS, gi_inst_list + +def verify_eafp_values(server, virt, in_pllist, gi_inst_list): + # Looping through the in_pllist to get association for devices. + status = PASS + an = get_typed_class(virt, "ElementAllocatedFromPool") + sccn = get_typed_class(virt, "ComputerSystem") + for cn, devid in sorted(in_pllist.iteritems()): + try: + assoc_info = Associators(server, an, cn, + DeviceID = devid, + CreationClassName = cn, + SystemName = test_dom, + SystemCreationClassName = sccn, + virt=virt) + if len(assoc_info) != 1: + logger.error("%s returned %i ResourcePool objects for " + "domain '%s'", an, len(assoc_info), + test_dom) + status = FAIL + break + assoc_eafp_info = assoc_info[0] + CCName = assoc_eafp_info.classname + gi_inst = gi_inst_list[CCName] + if assoc_eafp_info['InstanceID'] != gi_inst['InstanceID']: + field_err(assoc_eafp_info, gi_inst, 'InstanceID') + return FAIL + if assoc_eafp_info['PoolID'] != gi_inst['PoolID']: + field_err(assoc_eafp_info, gi_inst, 'PoolID') + return FAIL + except Exception, detail: + logger.error(CIM_ERROR_ASSOCIATORS, an) + logger.error("Exception: %s", detail) + cleanup_restore(server, virt) + status = FAIL + return status + @do_main(sup_types) def main(): options = main.options + server = options.ip + virt = options.virt status = PASS - idx = 0 + if virt == 'Xen': + test_disk = 'xvda' + else: + test_disk = 'hda' -# Getting the VS list and deleting the test_dom if it already exists. - destroy_and_undefine_all(options.ip) + # Getting the VS list and deleting the test_dom if it already exists. + destroy_and_undefine_all(server) + virt_type = get_class(virt) + if virt == 'LXC': + vsxml = virt_type(test_dom) + else: + vsxml = virt_type(test_dom, vcpus = test_vcpus, mac = test_mac, + disk = test_disk) - test_xml, bridge = testxml_bridge(test_dom, vcpus = test_vcpus, \ - mac = test_mac, disk = test_disk, \ - server = options.ip) - if bridge == None: - Globals.logger.error("Unable to find virtual bridge") - return SKIP - - if test_xml == None: - Globals.logger.error("Guest xml not created properly") - return FAIL - - virt_network = network_by_bridge(bridge, options.ip) - if virt_network == None: - Globals.logger.error("No virtual network found for bridge %s", bridge) - return SKIP - - ret = test_domain_function(test_xml, options.ip, cmd = "create") + # Verify DiskPool on machine + status, diskid = create_diskpool_conf(server, virt) + if status != PASS: + return status + ret = vsxml.create(server) if not ret: - Globals.logger.error("Failed to Create the dom: %s", test_dom) + logger.error("Failed to Create the dom: '%s'", test_dom) return FAIL - try: - cn = "Xen_LogicalDisk" - key_list = get_keys(cn, test_disk) - disk = devices.Xen_LogicalDisk(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL + status, lelist = init_list(server, virt, vsxml, test_disk) + if status != PASS: + return status - try: - cn = "Xen_Memory" - key_list = get_keys(cn, "mem") - mem = devices.Xen_Memory(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL - - try: - cn = "Xen_NetworkPort" - key_list = get_keys(cn, test_mac) - net = devices.Xen_NetworkPort(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL - - try: - cn = "Xen_Processor" - key_list = get_keys(cn, "0") - proc = devices.Xen_Processor(options.ip, key_list) - except Exception,detail: - print_error(cn, detail) - return FAIL - - netpool_id = "NetworkPool/%s" % virt_network - - lelist = { - "Xen_LogicalDisk" : disk.DeviceID, \ - "Xen_Memory" : mem.DeviceID, \ - "Xen_NetworkPort" : net.DeviceID, \ - "Xen_Processor" : proc.DeviceID - } - poollist = [ - "Xen_DiskPool", \ - "Xen_MemoryPool", \ - "Xen_NetworkPool", \ - "Xen_ProcessorPool" - ] - poolval = [ - "DiskPool/foo", \ - "MemoryPool/0", \ - netpool_id, \ - "ProcessorPool/0" - ] - - sccn = "Xen_ComputerSystem" - for cn, devid in sorted(lelist.items()): - try: - assoc_info = assoc.Associators(options.ip, \ - "Xen_ElementAllocatedFromPool", - cn, - DeviceID = devid, - CreationClassName = cn, - SystemName = test_dom, - SystemCreationClassName = sccn) - if len(assoc_info) != 1: - Globals.logger.error("Xen_ElementAllocatedFromPool returned %i\ - ResourcePool objects for domain '%s'", len(assoc_info), test_dom) - status = FAIL - break - - if assoc_info[0].classname != poollist[idx]: - Globals.logger.error("Classname Mismatch") - Globals.logger.error("Returned %s instead of %s", \ - assoc_info[0].classname, \ - poollist[idx]) - status = FAIL - - if assoc_info[0]['InstanceID'] != poolval[idx]: - Globals.logger.error("InstanceID Mismatch") - Globals.logger.error("Returned %s instead of %s", \ - assoc_info[0]['InstanceID'], \ - poolval[idx]) - status = FAIL - - if status != PASS: - break - else: - idx = idx + 1 - - except Exception, detail: - Globals.logger.error(Globals.CIM_ERROR_ASSOCIATORS, \ - 'Xen_ElementAllocatedFromPool') - Globals.logger.error("Exception: %s", detail) - status = FAIL - - ret = test_domain_function(test_dom, options.ip, \ - cmd = "destroy") + status, gi_inst_list = get_pool_details(server, virt, vsxml, diskid) + if status != PASS: + return status + + status = verify_eafp_values(server, virt, lelist, gi_inst_list) + cleanup_restore(server, virt) + vsxml.destroy(server) return status if __name__ == "__main__": diff -r 64abdd1495dc -r a37994336670 suites/libvirt-cim/lib/XenKvmLib/enumclass.py --- a/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Fri Jul 11 00:42:35 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/enumclass.py Tue Jul 15 03:49:18 2008 -0700 @@ -117,6 +117,30 @@ class Xen_LogicalDisk(CIM_LogicalDevice) pass class KVM_LogicalDisk(CIM_LogicalDevice): + pass + +class Xen_Memory(CIM_LogicalDevice): + pass + +class KVM_Memory(CIM_LogicalDevice): + pass + +class LXC_Memory(CIM_LogicalDevice): + pass + +class LXC_Memory(CIM_LogicalDevice): + pass + +class Xen_Processor(CIM_LogicalDevice): + pass + +class KVM_Processor(CIM_LogicalDevice): + pass + +class Xen_NetworkPort(CIM_LogicalDevice): + pass + +class KVM_NetworkPort(CIM_LogicalDevice): pass class Xen_MemoryPool(CIM_ResourcePool):

3 2

[PATCH 0 of 3] [TEST] #2 Fix test issues with ESD 01
by Kaitlin Rupert 16 Jul '08

16 Jul '08

2 5

[PATCH] [TEST] #2 Remove guest creation from LogicalDisk - 02_nodevs.py
by Kaitlin Rupert 16 Jul '08

16 Jul '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1216138782 25200 # Node ID 329b99c8516d4f0ae9ae49ed63ac0f4469917931 # Parent aee2bda69644fbf01ec3fbe038ecf6c52d63555a [TEST] #2 Remove guest creation from LogicalDisk - 02_nodevs.py. The point of this test is to ensure no devices are returned from EnumerateInstances() in the case where no guest is defined (or in the case where only Domain-0 is defined). Also add support for LXC. In the case where devices.enumerate() encountered a CIM error, raise an exception instead of printing an error. Updates from 1 to 2: -Fix spacing in clean_system() Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r aee2bda69644 -r 329b99c8516d suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py --- a/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Tue Jul 15 09:14:20 2008 -0700 +++ b/suites/libvirt-cim/cimtest/LogicalDisk/02_nodevs.py Tue Jul 15 09:19:42 2008 -0700 @@ -25,21 +25,23 @@ import sys import pywbem -from VirtLib import utils from VirtLib import live from XenKvmLib import devices -from XenKvmLib.classes import get_typed_class -from XenKvmLib.vxml import XenXML, KVMXML, get_class -from XenKvmLib.test_doms import define_test_domain, undefine_test_domain -from XenKvmLib.test_xml import testxml -from CimTest.Globals import logger, do_main +from CimTest.Globals import logger, do_main, CIM_ERROR_ENUMERATE +from CimTest.ReturnCodes import PASS, FAIL, SKIP -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "test_domain" def clean_system(host, virt='Xen'): l = live.domain_list(host, virt) - if len(l) > 1: + + if virt == "XenFV" or virt == "Xen": + if len(l) > 1: + return False + else: + return True + elif len(l) > 0: return False else: return True @@ -49,31 +51,27 @@ options = main.options if not clean_system(options.ip, options.virt): logger.error("System has defined domains; unable to run") - return 2 + return SKIP - if options.virt == 'Xen': - test_dev = 'xvda' - else: - test_dev = 'hda' + key_list = ["DeviceID", "CreationClassName", "SystemName", + "SystemCreationClassName"] - vsxml = get_class(options.virt)(test_dom, disk=test_dev) - ret = vsxml.define(options.ip) - if not ret: - logger.error("Failed to Define the dom: %s", test_dom) + cn = "LogicalDisk" + + try: + devs = devices.enumerate(options.ip, cn, key_list, options.virt) + + except Exception, details: + logger.error(CIM_ERROR_ENUMERATE, cn) + logger.error(details) return FAIL - devid = "%s/%s" % (test_dom, test_dev) + if len(devs) != 0: + logger.error("%s returned %d instead of empty list" % (cn, len(devs))) + status = FAIL + else: + status = PASS - status = 0 - key_list = ["DeviceID", "CreationClassName", "SystemName", "SystemCreationClassName"] - - devs = devices.enumerate(options.ip, 'LogicalDisk', key_list) - if devs.__class__ == str: - logger.error("Got error instead of empty list: %s" % devs) - status = 1 - - vsxml.undefine(options.ip) - return status if __name__ == "__main__": diff -r aee2bda69644 -r 329b99c8516d suites/libvirt-cim/lib/XenKvmLib/devices.py --- a/suites/libvirt-cim/lib/XenKvmLib/devices.py Tue Jul 15 09:14:20 2008 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/devices.py Tue Jul 15 09:19:42 2008 -0700 @@ -85,6 +85,9 @@ class KVM_LogicalDisk(CIM_LogicalDisk): pass +class LXC_LogicalDisk(CIM_LogicalDisk): + pass + class Xen_NetworkPort(CIM_NetworkPort): pass @@ -123,7 +126,7 @@ try: names = conn.EnumerateInstanceNames(devtype.__name__) except pywbem.CIMError, arg: - print arg[1] + raise Exception("%s" % arg[1]) return list for name in names:

2 1