May 2008 - CIM - libvirt List Archives

[PATCH 0 of 3] [TEST] Profile test cases KVM support
by zli＠linux.vnet.ibm.com 10 Jun '08

10 Jun '08

Necessary library update also included. Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com>

3 8

[PATCH] [TEST] Fix CIM_REV to handle non integer strings
by Kaitlin Rupert 04 Jun '08

04 Jun '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1212165521 25200 # Node ID 7e4310cd6913605148b038b46d244ed670730727 # Parent 4a5a44d7b857df543af24d59380cb8fdbbb753a4 [TEST] Fix CIM_REV to handle non integer strings. When working with patches, the changeset revision has a + appended to it. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 4a5a44d7b857 -r 7e4310cd6913 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 30 14:26:38 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 30 09:38:41 2008 -0700 @@ -26,7 +26,11 @@ global CIM_REV global CIM_SET -CIM_REV = int(os.getenv("CIM_REV")) +rev = os.getenv("CIM_REV").strip("+") +if rev.isalnum(): + CIM_REV = int(rev) +else: + CIM_REV = 0 CIM_SET = os.getenv("CIM_SET") if not CIM_REV or not CIM_SET:

2 3

[PATCH] [TEST] #2 LXC support using DefineSystem & VSMS.01
by zli＠linux.vnet.ibm.com 03 Jun '08

03 Jun '08

# HG changeset patch # User Zhengang Li <lizg(a)cn.ibm.com> # Date 1212133201 -28800 # Node ID ddb52ec53368860a18b7e3863b38ea31cb163069 # Parent 5c77329cb53e6340cd6ddbf9c044462fb994eb88 [TEST] #2 LXC support using DefineSystem & VSMS.01 Updates: add the missing address property Signed-off-by: Zhengang Li <lizg(a)cn.ibm.com> diff -r 5c77329cb53e -r ddb52ec53368 suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py --- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Fri May 30 14:26:38 2008 +0800 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/01_definesystem_name.py Fri May 30 15:40:01 2008 +0800 @@ -30,7 +30,7 @@ from CimTest.Globals import do_main from CimTest.Globals import logger -SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV'] +SUPPORTED_TYPES = ['Xen', 'KVM', 'XenFV', 'LXC'] default_dom = 'test_domain' @do_main(SUPPORTED_TYPES) diff -r 5c77329cb53e -r ddb52ec53368 suites/libvirt-cim/lib/XenKvmLib/const.py --- a/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 30 14:26:38 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/const.py Fri May 30 15:40:01 2008 +0800 @@ -85,3 +85,4 @@ #vxml.LXCXML LXC_init_path = os.path.join(_image_dir, 'cimtest_lxc_init') LXC_default_tty = '/dev/ptmx' +LXC_default_mp = '/tmp' diff -r 5c77329cb53e -r ddb52ec53368 suites/libvirt-cim/lib/XenKvmLib/vsms.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri May 30 14:26:38 2008 +0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsms.py Fri May 30 15:40:01 2008 +0800 @@ -102,6 +102,8 @@ self.isFullVirt = (type == 'KVM' or virt == 'XenFV') if self.isFullVirt: self.BootDevice = 'hd' + elif type == 'LXC': + self.InitPath = const.LXC_init_path else: self.Bootloader = live.bootloader(Globals.CIM_IP, 0) self.BootloaderArgs = '' @@ -113,6 +115,9 @@ pass class KVM_VirtualSystemSettingData(CIM_VirtualSystemSettingData): + pass + +class LXC_VirtualSystemSettingData(CIM_VirtualSystemSettingData): pass @eval_cls('VirtualSystemSettingData') @@ -134,6 +139,12 @@ class KVM_DiskResourceAllocationSettingData(CIM_DiskResourceAllocationSettingData): pass + +class LXC_DiskResourceAllocationSettingData(CIMClassMOF): + def __init__(self, mountpoint, source, name): + self.MountPoint = mountpoint + self.Address = source + self.InstanceID = '%s/%s' % (name, mountpoint) @eval_cls('DiskResourceAllocationSettingData') def get_dasd_class(virt): @@ -157,6 +168,9 @@ class KVM_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData): pass +class LXC_NetResourceAllocationSettingData(CIM_NetResourceAllocationSettingData): + pass + @eval_cls('NetResourceAllocationSettingData') def get_nasd_class(virt): pass @@ -175,6 +189,9 @@ pass class KVM_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData): + pass + +class LXC_ProcResourceAllocationSettingData(CIM_ProcResourceAllocationSettingData): pass @eval_cls('ProcResourceAllocationSettingData') @@ -197,6 +214,9 @@ class KVM_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): pass +class LXC_MemResourceAllocationSettingData(CIM_MemResourceAllocationSettingData): + pass + @eval_cls('MemResourceAllocationSettingData') def get_masd_class(virt): pass @@ -212,17 +232,25 @@ class_vssd = get_vssd_class(virt) vssd = class_vssd(name=dom_name, virt=virt) - class_dasd = get_dasd_class(virt) - if virt == 'KVM': - disk_dev = 'hda' - disk_source = const.KVM_disk_path - elif virt == 'XenFV': - disk_dev = 'hda' - disk_source = const.XenFV_disk_path - d = class_dasd( - dev=disk_dev, - source=disk_source, - name=dom_name) + # LXC only takes disk and memory device for now. + # Only disk __init__ takes different params. + if virt == 'LXC': + d = LXC_DiskResourceAllocationSettingData( + mountpoint=const.LXC_default_mp, + source=const.LXC_default_mp, name=dom_name) + else: + class_dasd = get_dasd_class(virt) + if virt == 'KVM': + disk_dev = 'hda' + disk_source = const.KVM_disk_path + elif virt == 'XenFV': + disk_dev = 'hda' + disk_source = const.XenFV_disk_path + d = class_dasd( + dev=disk_dev, + source=disk_source, + name=dom_name) + class_nasd = get_nasd_class(virt) if virt == 'KVM': net_mac= const.KVM_default_mac

3 3

Adding a provider
by Szymanski, Lukasz K 02 Jun '08

02 Jun '08

Hello, I am playing with libvirt-cim providers and trying to figure out how to add another one to the mix. I have version 0.4 of libvirt-cim. I am running SLES10 SP1 as my host machine and a 2.6.16 version of the Xen kernel. I have: Updated the Makefile.am and src/Makefile.am files Created a testprovider.c file in src Created a mof and registration file in schema. For whatever reason, the Makefile.am file does not update the Makefile.in file with my changes so consequently my providers do not get added. Actually, I have had occasional success, which makes this even more bizzare. It says in the Makefile.in file that automake v 1.10.1 is supposed to do this automatically. I have version 1.10.1 of automake. What am I missing? Thanks, Luke Szymanski Unisys Corp.

4 3

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

02 Jun '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212115646 -28800 # Node ID 25c2af6bfccc73196fff0ce96f7162b8b22d0057 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Resubmit ElementConforms.01&03&04 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 25c2af6bfccc suites/libvirt-cim/cimtest/ElementConforms/01_forward.py --- a/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/01_forward.py Fri May 30 10:47:26 2008 +0800 @@ -42,7 +42,7 @@ from CimTest import Globals from CimTest.ReturnCodes import PASS, FAIL -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] test_dom = "domU" def verify_cs(item, id): diff -r 3ac66cf562f0 -r 25c2af6bfccc suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/03_ectp_fwd_errs.py Fri May 30 10:47:26 2008 +0800 @@ -60,9 +60,8 @@ from CimTest import Globals from CimTest.Globals import logger, CIM_USER, CIM_PASS, do_main -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] -bug = '92642' expr_values = { "INVALID_InstID_Keyname" : { 'rc' : pywbem.CIM_ERR_FAILED, \ @@ -82,7 +81,7 @@ k = j * 2 keys[name_val[k]] = name_val[k+1] ret_val = try_assoc(conn, classname, ac_classname, keys, field_name=field, \ - expr_values=expr_values[field], bug_no=bug) + expr_values=expr_values[field], bug_no="") if ret_val != PASS: logger.error("------ FAILED: %s------" % field) name_val[i] = temp diff -r 3ac66cf562f0 -r 25c2af6bfccc suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py --- a/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ElementConforms/04_ectp_rev_errs.py Fri May 30 10:47:26 2008 +0800 @@ -89,9 +89,8 @@ from CimTest.ReturnCodes import PASS, FAIL from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, do_main -sup_types = ['Xen', 'XenFV', 'KVM'] +sup_types = ['Xen', 'XenFV', 'KVM', 'LXC'] -bug = '92642' test_dom = "domU" cs_values = { @@ -122,7 +121,7 @@ else: expr_values = cs_values ret_val = try_assoc(conn, classname, ac_classname, keys, field_name=field, \ - expr_values=expr_values[field], bug_no=bug) + expr_values=expr_values[field], bug_no="") if ret_val != PASS: logger.error("------ FAILED: %s------" % field) name_val[i] = temp

3 3

[PATCH] [TEST] Fixing 02_reverse.py of RAPF
by Deepti B. Kalakeri 02 Jun '08

02 Jun '08

# HG changeset patch # User Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> # Date 1212068877 25200 # Node ID 9fae4065c84575412d10f7c1ea07f153a934db4c # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Fixing 02_reverse.py of RAPF. Added the following extra steps: 1) Defining a domain. 2) creating diskpool, netpool. Without the steps 1 and 2 the tc used to simply passes. The tc will fail on KVM with old libvirt-cim rpm as expected and will pass with the latest source with the fix that Dan submitted yest. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 3ac66cf562f0 -r 9fae4065c845 suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py --- a/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourceAllocationFromPool/02_reverse.py Thu May 29 06:47:57 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,149 @@ 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 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 = "RAPF_dom" +test_vcpus = 1 +test_mem = 128 +test_mac = "00:11:22:33:44:aa" + +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 + + except Exception, details: + logger.error("Exception : %s", details) + return FAIL, vsxml + + return PASS, vsxml + +def get_rasd_or_pool_instid(server, virt, cn): + key_list = ["InstanceID"] + inst = [] + try: + inst = enumclass.enumerate(server, cn, key_list, virt) + except Exception: + logger.error(Globals.CIM_ERROR_ENUMERATE, cn) + return inst, FAIL + return inst, PASS + +def get_instance(server, virt, vsxml, cn, pool_list, app_val=0): + instances, status = get_rasd_or_pool_instid(server, virt, cn) + if status != PASS: + vsxml.undefine(server) + return pool_list, status + + if app_val == 1: + for inst in instances: + pool_list.append(inst.InstanceID) + return instances, pool_list, status + + +def verify_pool_from_RAPF(server, virt, instances, pool_instid_list, cn): + pool = [] + for inst in instances: + try: + pool = assoc.AssociatorNames(server, "ResourceAllocationFromPool", + cn, virt, InstanceID = inst.InstanceID) + except Exception: + logger.error(Globals.CIM_ERROR_ASSOCIATORNAMES, inst.InstanceID) + status = FAIL + + if len(pool) < 1: + logger.error("No associated pool for %s", inst.InstanceID) + return FAIL + + if not pool[0]['InstanceID'] in pool_instid_list: + logger.error("InstanceID Mismatch") + return FAIL + + return PASS + +def get_inst_verify_pool_from_RAPF(server, virt, vsxml, pool_cn, cn): + pool_list = [] + pool, pool_list, status = get_instance(server, virt, vsxml, + pool_cn, pool_list, app_val=1) + if status != PASS: + return status + + devinst, pool_list, status = get_instance(server, virt, vsxml, cn, + pool_list, app_val=0) + if status != PASS: + return status + + status = verify_pool_from_RAPF(server, virt, devinst, pool_list, cn) + + 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 = 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 + status = get_inst_verify_pool_from_RAPF(server, virt, vsxml, 'MemoryPool', + 'MemResourceAllocationSettingData') + if status != PASS: + return status - 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 + status = get_inst_verify_pool_from_RAPF(server, virt, vsxml, 'ProcessorPool', + 'ProcResourceAllocationSettingData') + if status != PASS: + return status - if procpool[0].keybindings['InstanceID'] != "ProcessorPool/0": - logger.error("ProcResourceAllocationSettingData association failed") - status = FAIL + status = get_inst_verify_pool_from_RAPF(server, virt, vsxml, 'DiskPool', + 'DiskResourceAllocationSettingData') + if status != PASS: + return status + status = get_inst_verify_pool_from_RAPF(server, virt, vsxml, 'NetworkPool', + 'NetResourceAllocationSettingData') + if status != PASS: + return status + + cleanup_restore(server, virt) + vsxml.undefine(server) return status if __name__ == "__main__":

3 3

[PATCH] [TEST] #2 Make RHEL 5 XenFV guest grub conf use hda
by Kaitlin Rupert 02 Jun '08

02 Jun '08

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1211564341 25200 # Node ID cefb85c07235328269cd17c08f3368941374ea96 # Parent 3233a070377270931b4cc1d790b6782fee17d1b6 [TEST] #2 Make RHEL 5 XenFV guest grub conf use hda. It looks like qemu on RHEL emulates an ide drive, not a scsi drive. Updates: -Instead of using distro, use qemu-dm version. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 3233a0703772 -r cefb85c07235 suites/libvirt-cim/images/xmt-makefv.sh --- a/suites/libvirt-cim/images/xmt-makefv.sh Fri May 23 18:14:28 2008 +0800 +++ b/suites/libvirt-cim/images/xmt-makefv.sh Fri May 23 10:39:01 2008 -0700 @@ -14,6 +14,9 @@ PARTED="parted -s" TMPMOUNT=/tmp/cimtest_image_temp SIZE=16 +QEMU_VER=082 + +CUR_QEMU_VER=`strings /usr/lib64/xen/bin/qemu-dm | awk '/version [0-9]/ { print $5; }' | sed 's/,//' | sed 's/\.//g'` die() { echo "FAILED: $i" >&2 @@ -110,10 +113,19 @@ timeout 1 title Test Environment root (hd0,0) +EOF + +if [ $CUR_QEMU_VER -lt $QEMU_VER ]; then + cat >>${root}/grub/grub.conf <<EOF + kernel /vmlinuz root=/dev/hda1 + initrd /initrd +EOF +else + cat >>${root}/grub/grub.conf <<EOF kernel /vmlinuz root=/dev/sda1 initrd /initrd EOF - +fi } ramdisk=$1

2 2

[PATCH] Fix setting of the proper CIM network type for network devices
by Dan Smith 30 May '08

30 May '08

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1212175074 25200 # Node ID 19621064f2fb0bf4ec8900fe4ee81c6b8a70d778 # Parent f00dd77c664c258551c5f884a0bee5d842241e4e Fix setting of the proper CIM network type for network devices Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r f00dd77c664c -r 19621064f2fb src/Virt_Device.c --- a/src/Virt_Device.c Tue May 20 11:24:39 2008 -0400 +++ b/src/Virt_Device.c Fri May 30 12:17:54 2008 -0700 @@ -49,6 +49,7 @@ uint16_t cim_type; if (STREQC(dev->type, "ethernet") || + STREQC(dev->type, "network") || STREQC(dev->type, "bridge")) cim_type = CIM_NET_ETHERNET; else

2 1

[PATCH] [TEST] Update ResourcePool.01&02 for LXC support
by yunguol＠cn.ibm.com 30 May '08

30 May '08

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1212129302 -28800 # Node ID 44fcc3becf862600a1a8f8fc9fe0a3d32f042d13 # Parent 3ac66cf562f082546883c1de0d748471b557cd39 [TEST] Update ResourcePool.01&02 for LXC support Signed-off-by: Guolian Yun <yunguol(a)cn.ibm.com> diff -r 3ac66cf562f0 -r 44fcc3becf86 suites/libvirt-cim/cimtest/ResourcePool/01_enum.py --- a/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePool/01_enum.py Fri May 30 14:35:02 2008 +0800 @@ -39,7 +39,7 @@ from XenKvmLib.common_util import cleanup_restore, test_dpath, \ create_diskpool_file -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] diskid = "%s/%s" % ("DiskPool", test_dpath) dp_cn = 'DiskPool' diff -r 3ac66cf562f0 -r 44fcc3becf86 suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py --- a/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Fri May 30 00:24:45 2008 +0800 +++ b/suites/libvirt-cim/cimtest/ResourcePool/02_rp_gi_errors.py Fri May 30 14:35:02 2008 +0800 @@ -40,7 +40,7 @@ from XenKvmLib.common_util import cleanup_restore, test_dpath, \ create_diskpool_file -sup_types = ['Xen', 'KVM'] +sup_types = ['Xen', 'KVM', 'LXC'] expr_values = { "invalid_keyname" : { 'rc' : pywbem.CIM_ERR_FAILED,

2 1

[TEST] on the Device and ResourcePool of container
by Guo Lian Yun 30 May '08

30 May '08

Hi, Who can help me to explain the detail of device and resourcepool setting for container? How to set the other devices in a contain domain xml except memory? Also, I'm not sure of LXC_DiskPool, should I have to create a pool manually for testing? 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

3 2