- CIM - libvirt List Archives

[PATCH] [TEST] Update ResourcePoolConfigurationService.01&02 for LXC support
by yunguol＠cn.ibm.com 04 Jun '08

04 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212568826 -28800 # Node ID bafe19dae50b5b43f234d808a787a5ba0db463e9 # Parent 9b2e8889d7937c66e73968e53ec31bf93f535224 [TEST] Update ResourcePoolConfigurationService.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 9b2e8889d793 -r bafe19dae50b suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/01_enum.py Wed Jun 04 16:40:26 2008 +0800 @@ -30,6 +30,8 @@ from CimTest.Globals import logger from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class + +platform_sup = ['Xen', 'XenFV', 'LXC', 'KVM'] @do_main(platform_sup) def main(): diff -r 9b2e8889d793 -r bafe19dae50b suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/02_rcps_gi_errors.py Wed Jun 04 16:40:26 2008 +0800 @@ -34,7 +34,7 @@ from CimTest.Globals import do_main, platform_sup from XenKvmLib.classes import get_typed_class - +platform_sup = ['Xen', 'KVM', 'XenFV', 'LXC'] expr_values = { "invalid_sysname" : { 'rc' : pywbem.CIM_ERR_NOT_FOUND, \ 'desc' : 'No such instance (SystemName)' }, \

1 0

[PATCH] [TEST] Update RASD.01&03 for LXC support
by yunguol＠cn.ibm.com 04 Jun '08

04 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212567414 -28800 # Node ID 7ca197434dfef26fd9cca7b3551c85a2178a2071 # Parent 9b2e8889d7937c66e73968e53ec31bf93f535224 [TEST] Update RASD.01&03 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 9b2e8889d793 -r 7ca197434dfe suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py --- a/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/01_verify_rasd_fields.py Wed Jun 04 16:16:54 2008 +0800 @@ -58,7 +58,7 @@ from CimTest.Globals import logger from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "VSSDC_dom" test_vcpus = 1 @@ -102,9 +102,14 @@ def assoc_values(assoc_info, xml, disk, virt="Xen"): procrasd, netrasd, diskrasd, memrasd = init_list(xml, disk, virt) - proc_status = 1 + if virt == 'LXC': + proc_status = 0 + disk_status = 0 + else: + proc_status = 1 + disk_status = 1 + net_status = 0 - disk_status = 1 mem_status = 1 status = 0 try: @@ -140,8 +145,11 @@ test_disk = 'hda' virt_xml = vxml.get_class(options.virt) - cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, - mac = test_mac, disk = test_disk) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + else: + cxml = virt_xml(test_dom, mem=test_mem, vcpus = test_vcpus, + mac = test_mac, disk = test_disk) ret = cxml.create(options.ip) if not ret: logger.error('Unable to create domain %s' % test_dom) diff -r 9b2e8889d793 -r 7ca197434dfe suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py --- a/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/RASD/03_rasd_errs.py Wed Jun 04 16:16:54 2008 +0800 @@ -63,7 +63,7 @@ from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, CIM_ERROR_GETINSTANCE from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "VSSDC_dom" test_vcpus = 1 @@ -81,7 +81,7 @@ } } -def init_list(): +def init_list(virt="Xen"): disk = { 'cn' : get_typed_class(virt, "DiskResourceAllocationSettingData"), \ 'instid' : '%s/%s' %(test_dom, test_disk) @@ -99,8 +99,11 @@ 'cn' : get_typed_class(virt, "NetResourceAllocationSettingData"), \ 'instid' : '%s/%s' %(test_dom,test_mac) } - - rasd_values_list =[ disk, mem, proc, net ] + + if virt == 'LXC': + rasd_values_list =[ mem ] + else: + rasd_values_list =[ disk, mem, proc, net ] return rasd_values_list def verify_rasd_err(field, keys, rasd_type): @@ -130,14 +133,16 @@ test_disk = "xvda" else: test_disk = "hda" - - vsxml = get_class(virt)(test_dom, \ - mem=test_mem, \ - vcpus = test_vcpus, \ - mac = test_mac, \ - disk = test_disk) + if options.virt == 'LXC': + vsxml = get_class(virt)(test_dom) + else: + vsxml = get_class(virt)(test_dom, \ + mem=test_mem, \ + vcpus = test_vcpus, \ + mac = test_mac, \ + disk = test_disk) + bridge = vsxml.set_vbridge(server) try: - bridge = vsxml.set_vbridge(server) ret = vsxml.define(options.ip) if not ret: logger.error("Failed to Define the domain: %s", test_dom)

1 0

[PATCH] [TEST] Update ElementCapabilities.01~04 for LXC support
by yunguol＠cn.ibm.com 04 Jun '08

04 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212559730 -28800 # Node ID 88f9482289b7035eeb03fcdeb8b9531709cc4fa7 # Parent 9b2e8889d7937c66e73968e53ec31bf93f535224 [TEST] Update ElementCapabilities.01~04 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/01_forward.py Wed Jun 04 14:08:50 2008 +0800 @@ -33,7 +33,7 @@ from XenKvmLib.const import CIM_REV from XenKvmLib.enumclass import enumerate -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] ac_to_pool_version = 561 def append_to_list(server, virt, poolname, valid_elc_id): diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/02_reverse.py Wed Jun 04 14:08:50 2008 +0800 @@ -32,7 +32,7 @@ from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] def call_assoc(ip, cn, id, virt="Xen"): status = PASS diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/03_forward_errs.py Wed Jun 04 14:08:50 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance" diff -r 9b2e8889d793 -r 88f9482289b7 suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py --- a/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/ElementCapabilities/04_reverse_errs.py Wed Jun 04 14:08:50 2008 +0800 @@ -29,7 +29,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL, SKIP -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] exp_rc = 6 #CIM_ERR_NOT_FOUND exp_desc = "No such instance"

1 0

[PATCH] [TEST] Update SettingsDefine.01~04 for LXC support
by yunguol＠cn.ibm.com 04 Jun '08

04 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212556756 -28800 # Node ID 9d471559a53aee2058545de88471c0288c14af46 # Parent 9b2e8889d7937c66e73968e53ec31bf93f535224 [TEST] Update SettingsDefine.01~04 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/01_forward.py Wed Jun 04 13:19:16 2008 +0800 @@ -37,7 +37,7 @@ from CimTest.Globals import do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domu1" test_mac = "00:11:22:33:44:aa" @@ -71,19 +71,23 @@ else: test_disk = 'hda' virt_xml = vxml.get_class(options.virt) - cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, - disk = test_disk) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + cn_id = {'Memory' : 'mem'} + else: + cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, + disk = test_disk) + cn_id = { + 'LogicalDisk' : test_disk, + 'Memory' : 'mem', + 'NetworkPort' : test_mac, + 'Processor' : test_vcpus -1 } + ret = cxml.create(options.ip) if not ret: Globals.logger.error("Failed to Create the dom: %s", test_dom) return FAIL - - cn_id = { - 'LogicalDisk' : test_disk, - 'Memory' : 'mem', - 'NetworkPort' : test_mac, - 'Processor' : test_vcpus -1 } devlist = {} diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/02_reverse.py Wed Jun 04 13:19:16 2008 +0800 @@ -62,7 +62,7 @@ from XenKvmLib.const import CIM_REV -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "virtgst" test_vcpus = 1 @@ -166,8 +166,11 @@ status = PASS virt_xml = vxml.get_class(options.virt) - cxml = virt_xml(test_dom, mem = test_mem, vcpus = test_vcpus, - mac = test_mac, disk = test_disk) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + else: + cxml = virt_xml(test_dom, mem = test_mem, vcpus = test_vcpus, + mac = test_mac, disk = test_disk) ret = cxml.create(options.ip) if not ret: logger.error("Failed to create the dom: %s", test_dom) diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/03_sds_fwd_errs.py Wed Jun 04 13:19:16 2008 +0800 @@ -154,7 +154,7 @@ from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS from CimTest.Globals import do_main -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domu1" test_mac = "00:11:22:33:44:aa" @@ -215,8 +215,11 @@ test_disk = 'hda' virt_xml = vxml.get_class(options.virt) - cxml= virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, - disk = test_disk) + 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.create(options.ip) if not ret: @@ -226,13 +229,15 @@ global conn conn = assoc.myWBEMConnection('http://%s' % options.ip, (CIM_USER, \ CIM_PASS), CIM_NS) - - class_id = { - get_typed_class(options.virt, 'LogicalDisk') : test_disk, - get_typed_class(options.virt, 'Memory') : 'mem', - get_typed_class(options.virt, 'NetworkPort') : test_mac, - get_typed_class(options.virt, 'Processor') : test_vcpus - 1 - } + if options.virt == 'LXC': + class_id = {get_typed_class(options.virt, 'Memory') : 'mem'} + else: + class_id = { + get_typed_class(options.virt, 'LogicalDisk') : test_disk, + get_typed_class(options.virt, 'Memory') : 'mem', + get_typed_class(options.virt, 'NetworkPort') : test_mac, + get_typed_class(options.virt, 'Processor') : test_vcpus - 1 + } tc_scen = [ 'INVALID_DevID_Keyname', 'INVALID_DevID_Keyval', \ diff -r 9b2e8889d793 -r 9d471559a53a suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py --- a/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SettingsDefine/04_sds_rev_errs.py Wed Jun 04 13:19:16 2008 +0800 @@ -63,7 +63,7 @@ from CimTest.Globals import do_main, logger from CimTest.Globals import CIM_USER, CIM_PASS, CIM_NS -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "domu1" test_mac = "00:11:22:33:44:aa" @@ -104,8 +104,11 @@ test_disk = 'hda' virt_xml = vxml.get_class(options.virt) - cxml = virt_xml(test_dom, vcpus = test_vcpus, mac = test_mac, - disk = test_disk) + 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.create(options.ip) if not ret: @@ -117,12 +120,19 @@ CIM_PASS), CIM_NS) rasd_base= 'ResourceAllocationSettingData' - class_id = { - get_typed_class(options.virt, 'Disk' + rasd_base) : test_disk, - get_typed_class(options.virt, 'Mem' + rasd_base) : 'mem', - get_typed_class(options.virt, 'Net' + rasd_base) : test_mac, - get_typed_class(options.virt, 'Proc' + rasd_base) : test_vcpus - 1 - } + if options.virt == 'LXC': + class_id = { + get_typed_class(options.virt, 'Disk' + rasd_base) : test_disk, + get_typed_class(options.virt, 'Mem' + rasd_base) : 'mem', + get_typed_class(options.virt, 'Proc' + rasd_base) : test_vcpus - 1 + } + else: + class_id = { + get_typed_class(options.virt, 'Disk' + rasd_base) : test_disk, + get_typed_class(options.virt, 'Mem' + rasd_base) : 'mem', + get_typed_class(options.virt, 'Net' + rasd_base) : test_mac, + get_typed_class(options.virt, 'Proc' + rasd_base) : test_vcpus - 1 + } tc_scen = ['INVALID_InstID_Keyname', 'INVALID_InstID_Keyval']

1 0

[PATCH] [TEST] 2# Update SystemDevice.01~03 for LXC support, ignore the vcpu tag in define a container guest
by yunguol＠cn.ibm.com 03 Jun '08

03 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212547749 -28800 # Node ID 62a1d45d71d9329f29bd17961f7fdd44256b9bc3 # Parent 9b2e8889d7937c66e73968e53ec31bf93f535224 [TEST] 2# Update SystemDevice.01~03 for LXC support, ignore the vcpu tag in define a container guest Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 9b2e8889d793 -r 62a1d45d71d9 suites/libvirt-cim/cimtest/SystemDevice/01_forward.py --- a/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/01_forward.py Wed Jun 04 10:49:09 2008 +0800 @@ -33,7 +33,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "test_domain" test_mac = "00:11:22:33:44:55" @@ -50,7 +50,10 @@ status = PASS virt_xml = vxml.get_class(options.virt) - cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + else: + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, disk = test_disk) ret = cxml.create(options.ip) if not ret: logger.error('Unable to create domain %s' % test_dom) diff -r 9b2e8889d793 -r 62a1d45d71d9 suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py --- a/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/02_reverse.py Wed Jun 04 10:49:09 2008 +0800 @@ -33,7 +33,7 @@ from CimTest.Globals import logger, do_main from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "test_domain" test_mac = "00:11:22:33:44:55" @@ -44,10 +44,14 @@ status = FAIL virt_xml = vxml.get_class(options.virt) - cxml = virt_xml(test_dom, mac=test_mac) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + devlist = ["Memory"] + else: + cxml = virt_xml(test_dom, mac=test_mac) + devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ] cxml.create(options.ip) - devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ] key_list = ["DeviceID", "CreationClassName", "SystemName", "SystemCreationClassName"] diff -r 9b2e8889d793 -r 62a1d45d71d9 suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py --- a/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py Tue Jun 03 13:13:39 2008 -0700 +++ b/suites/libvirt-cim/cimtest/SystemDevice/03_fwderrs.py Wed Jun 04 10:49:09 2008 +0800 @@ -40,7 +40,7 @@ from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL, XFAIL_RC -sup_types = ['Xen', 'KVM', 'XenFV'] +sup_types = ['Xen', 'KVM', 'XenFV', 'LXC'] test_dom = "virt1" test_mac = "00:11:22:33:44:55" @@ -64,15 +64,19 @@ status = PASS virt_xml = vxml.get_class(options.virt) - cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, - disk = test_disk) + if options.virt == 'LXC': + cxml = virt_xml(test_dom) + devlist = ["Memory"] + else: + cxml = virt_xml(test_dom, vcpus = test_cpu, mac = test_mac, + disk = test_disk) + devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ] ret = cxml.create(options.ip) if not ret : logger.info("error while 'create' of VS") return FAIL - devlist = [ "NetworkPort", "Memory", "LogicalDisk", "Processor" ] # Building the dict for avoiding the correct key:val pairs # while verifying with the Invalid values for the association

1 0

[TEST] Null of LXC_SettingsDefineState forward query
by Guo Lian Yun 03 Jun '08

03 Jun '08

Kaitlin, Could you get expect result by below query? wbemcli ain -ac LXC_SettingsDefineState http://root:password@localhost/root/virt:LXC_Memory.DeviceID="test_domain/mem",CreationClassName="LXC_Memory",SystemName="test_domain",SystemCreationClassName="LXC_ComputerSystem" But ein and reverse query work for me. wbemcli ein http://root:password@localhost/root/virt:LXC_Memory localhost:5988/root/virt:LXC_Memory.DeviceID="test_domain/mem",CreationClassName="LXC_Memory",SystemName="test_domain",SystemCreationClassName="LXC_ComputerSystem" wbemcli ain -ac LXC_VirtualSystemSettingDataComponent http://root:password@localhost:5988/root/virt:LXC_VirtualSystemSettingData.…"LXC:test_domain" localhost:5988/root/virt:LXC_MemResourceAllocationSettingData.InstanceID="test_domain/mem" 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 1

[PATCH] Fix association class name typo in SDS
by Kaitlin Rupert 03 Jun '08

03 Jun '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1212540052 25200 # Node ID 0d18506e1ede6669ecbd2f6cf54f496fc032e69f # Parent 8fdff95eb25e04745c992a76a85f45039e5022a5 Fix association class name typo in SDS. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 8fdff95eb25e -r 0d18506e1ede src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Tue Jun 03 17:40:49 2008 -0700 +++ b/src/Virt_SettingsDefineState.c Tue Jun 03 17:40:52 2008 -0700 @@ -370,7 +370,7 @@ static char* assoc_classname[] = { "Xen_SettingsDefineState", "KVM_SettingsDefineState", - "LXC_VirtualSystemSettingData", + "LXC_SettingsDefineState", NULL };

1 0

libvir Error .
by Deepti B Kalakeri 03 Jun '08

03 Jun '08

Hi , I have noticed error messages like the following in the test case logs: libvir: Xen error : Domain not found: xenUnifiedDomainLookupByName libvir: Domain error : invalid domain pointer in virDomainFree Can you let me know if its a known problem ? Thanks and Regards, Deepti.

1 0

[PATCH] [TEST] Resubmitting #2 Fixing 02_reverse.py of RAPF with desc in commit log
by Deepti B. Kalakeri 03 Jun '08

03 Jun '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1212524019 25200 # Node ID 577b765748f176681e6c5cff2f6734436714bc76 # Parent 79f0d0723ae6425b141bec84f83b2ef3c7dd4fc3 [TEST] Resubmitting #2 Fixing 02_reverse.py of RAPF with desc in commit log. Changes: >From 1 to 2 patch: 1) Used getInstance instead of enumerate for RASD info. 2) Used the changeset no to reflect the ProcRASD InstanceID changes. Added the following extra steps: 1) Defining a domain. 2) creating diskpool, netpool. Without the steps 1 and 2 the tc used to simply pass. The tc will fail on KVM with old libvirt-cim rpm . It will also fail for Xen on latest sources. The tc will pass with XenFV/KVM with the latest source. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 79f0d0723ae6 -r 577b765748f1 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Tue Jun 03 13:20:46 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Tue Jun 03 13:13:39 2008 -0700 @@ -6,6 +6,7 @@ # Guolian Yun <yunguol(a)cn.ibm.com> # Kaitlin Rupert <karupert(a)us.ibm.com> # Zhengang Li <lizg(a)cn.ibm.com> +# Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public @@ -25,69 +26,164 @@ import sys import sys from VirtLib import utils from XenKvmLib import assoc -from XenKvmLib import devices +from XenKvmLib.test_doms import destroy_and_undefine_all +from XenKvmLib.vxml import get_class from XenKvmLib.classes import get_typed_class +from XenKvmLib.const import CIM_REV from CimTest import Globals from CimTest.Globals import logger, do_main -from CimTest.ReturnCodes import PASS, FAIL, XFAIL +from CimTest.ReturnCodes import PASS, FAIL +from XenKvmLib import enumclass +from XenKvmLib.common_util import cleanup_restore, create_diskpool_conf, \ +create_netpool_conf + sup_types = ['Xen', 'XenFV', 'KVM'] +test_dom = "RAFP_dom" +test_vcpus = 1 +test_mem = 128 +test_mac = "00:11:22:33:44:aa" +proc_instid_rev = 590 + +def setup_env(server, virt): + destroy_and_undefine_all(server) + vsxml = None + if virt == "Xen": + test_disk = "xvda" + else: + test_disk = "hda" + + virtxml = get_class(virt) + vsxml = virtxml(test_dom, mem=test_mem, vcpus = test_vcpus, + mac = test_mac, disk = test_disk) + try: + ret = vsxml.define(server) + if not ret: + logger.error("Failed to Define the domain: %s", test_dom) + return FAIL, vsxml, test_disk + + except Exception, details: + logger.error("Exception : %s", details) + return FAIL, vsxml, test_disk + + return PASS, vsxml, test_disk + +def init_list(test_disk, diskid, test_network): + + if CIM_REV < proc_instid_rev: + procid = '%s/%s' % (test_dom, 0) + else: + procid = '%s/%s' % (test_dom, 'proc') + + proc = { 'rasd_id' : procid, + 'pool_id' : 'ProcessorPool/0' + } + + mem = { 'rasd_id' : '%s/%s' % (test_dom,'mem'), + 'pool_id' : 'MemoryPool/0' + } + + net = { + 'rasd_id' : '%s/%s' % (test_dom, test_mac), + 'pool_id' : 'NetworkPool/%s' %test_network + } + + disk = { 'rasd_id' : '%s/%s' % (test_dom, test_disk), + 'pool_id' : diskid + } + + cn_id_list = { + 'MemResourceAllocationSettingData' : mem, + 'ProcResourceAllocationSettingData' : proc, + 'NetResourceAllocationSettingData' : net, + 'DiskResourceAllocationSettingData' : disk + } + + return cn_id_list + +def get_rasd_instance(server, virt, key_list, cn): + inst = None + try: + inst = enumclass.getInstance(server, cn, key_list, virt) + except Exception, details: + logger.error(Globals.CIM_ERROR_GETINSTANCE, cn) + logger.error("Exception details: %s", details) + return inst, FAIL + + return inst, PASS + +def verify_pool_from_RAFP(server, virt, inst, pool_id, cn): + pool = [] + try: + pool = assoc.AssociatorNames(server, "ResourceAllocationFromPool", + cn, virt, InstanceID = inst.InstanceID) + except Exception: + logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID) + return FAIL + + if len(pool) != 1: + logger.error("No associated pool for %s", inst.InstanceID) + return FAIL + + if pool[0]['InstanceID'] != pool_id: + logger.error("InstanceID Mismatch") + logger.error("Returned %s instead of %s", pool[0]['InstanceID'] , + pool_id) + return FAIL + + return PASS + +def get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, cn, id_info): + try: + key_list = { 'InstanceID' : id_info['rasd_id'] } + rasd_cn = get_typed_class(virt, cn) + rasdinst, status = get_rasd_instance(server, virt, key_list, rasd_cn) + if status != PASS or rasdinst.InstanceID == None: + vsxml.undefine(server) + return status + + status = verify_pool_from_RAFP(server, virt, rasdinst, + id_info['pool_id'], cn) + except Exception, details: + logger.error("Exception in get_rasdinst_verify_pool_from_RAFP() fn") + logger.error("Exception Details %s", details) + status = FAIL + + if status != PASS: + vsxml.undefine(server) + + return status + @do_main(sup_types) def main(): options = main.options status = PASS + server = options.ip + virt = options.virt + + status, vsxml, test_disk = setup_env(server, virt) + if status != PASS: + return status - key_list = ["DeviceID", "CreationClassName", "SystemName", - "SystemCreationClassName"] - try: - mem = devices.enumerate(options.ip, 'Memory', key_list, options.virt) - except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % 'Memory') - return FAIL + status, diskid = create_diskpool_conf(server, virt) + if status != PASS: + return status - try: - proc = devices.enumerate(options.ip, 'Processor', key_list, options.virt) - except Exception: - logger.error(Globals.CIM_ERROR_ENUMERATE % 'Processor') - return FAIL - - for i in range(len(mem)): - try: - mempool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool", - "MemResourceAllocationSettingData", - options.virt, - InstanceID = mem[i].DeviceID) - except Exception: - logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % mem[i].DeviceID) - status = FAIL + status, test_network = create_netpool_conf(server, virt) + if status != PASS: + return status - if len(mempool) < 1: - logger.error("No associated pool for %s" % mem[i].DeviceID) - return FAIL + cn_id_list = init_list(test_disk, diskid, test_network) - if mempool[0].keybindings['InstanceID'] != "MemoryPool/0": - logger.error("MemResourceAllocationSettingData association error") - return FAIL - - for j in range(len(proc)): - try: - procpool = assoc.AssociatorNames(options.ip, "ResourceAllocationFromPool", - "ProcResourceAllocationSettingData", - options.virt, - InstanceID = proc[j].DeviceID) - except Exception: - logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES % proc[j].DeviceID) - return FAIL - - if len(procpool) < 1: - logger.error("No associated pool for %s" % proc[j].DeviceID) - return FAIL + for rasd_cn, id_info in cn_id_list.iteritems(): + status = get_rasdinst_verify_pool_from_RAFP(server, virt, vsxml, + rasd_cn, id_info) + if status != PASS: + return status - if procpool[0].keybindings['InstanceID'] != "ProcessorPool/0": - logger.error("ProcResourceAllocationSettingData association failed") - status = FAIL - + cleanup_restore(server, virt) + vsxml.undefine(server) return status if __name__ == "__main__":

1 0

[PATCH 0 of 2] [TEST] Update VSMS 06_addresource.py to support running guests.
by Kaitlin Rupert 03 Jun '08

03 Jun '08

Also support memory for defined guests.

2 4