- CIM - libvirt List Archives

[PATCH] [TEST] Updated test to only verify disk RASD
by Sharad Mishra 18 Feb '11

18 Feb '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1295018716 28800 # Node ID 8866ff769a7637cbee7c793827152649856815f2 # Parent 2c9689c31d42c2320ecca7a4283bd564c5a27737 [TEST] Updated test to only verify disk RASD. This test was written to look for disk and cdrom. But default VM created by this test case only uses disk and no cdrom. This test has been updated to test for disk only. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 2c9689c31d42 -r 8866ff769a76 suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py --- a/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Fri Jan 14 07:06:49 2011 -0800 +++ b/suites/libvirt-cim/cimtest/RASD/05_disk_rasd_emu_type.py Fri Jan 14 07:25:16 2011 -0800 @@ -42,47 +42,43 @@ if curr_cim_rev < libvirt_em_type_changeset: return SKIP - if options.virt == 'Xen': - emu_types = [0] - else: - emu_types = [0, 1] + exp_emu_type = 0 try: - for exp_emu_type in emu_types: - virt_xml = get_class(options.virt) - cxml = virt_xml(default_dom, emu_type=exp_emu_type) - ret = cxml.cim_define(options.ip) - if not ret: - logger.error("Failed to call DefineSystem()") - return FAIL + virt_xml = get_class(options.virt) + cxml = virt_xml(default_dom, emu_type=exp_emu_type) + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to call DefineSystem()") + return FAIL - drasd= get_typed_class(options.virt, - 'DiskResourceAllocationSettingData') + drasd= get_typed_class(options.virt, + 'DiskResourceAllocationSettingData') - drasd_list = EnumInstances(options.ip, drasd, ret_cim_inst=True) - if len(drasd_list) < 1: - raise Exception("%s returned %i instances, expected at least 1"\ - %(drasd, len(drasd_list))) + drasd_list = EnumInstances(options.ip, drasd, ret_cim_inst=True) + if len(drasd_list) < 1: + raise Exception("%s returned %i instances, expected at least 1"\ + %(drasd, len(drasd_list))) - found_rasd = None - for rasd in drasd_list: - guest, dev, status = parse_instance_id(rasd['InstanceID']) - if status != PASS: - raise Exception("Unable to parse InstanceID: %s" \ - % rasd['InstanceID']) - if guest == default_dom: - if rasd['EmulatedType'] == exp_emu_type: - found_rasd = rasd - status = PASS - break - else: - raise Exception("EmulatedType Mismatch: got %d," - "expected %d" %(rasd['EmulatedType'], - exp_emu_type)) + found_rasd = None + for rasd in drasd_list: + guest, dev, status = parse_instance_id(rasd['InstanceID']) + if status != PASS: + raise Exception("Unable to parse InstanceID: %s" \ + % rasd['InstanceID']) + if guest == default_dom: + if rasd['EmulatedType'] == exp_emu_type: + found_rasd = rasd + status = PASS + break + else: + raise Exception("EmulatedType Mismatch: got %d," + "expected %d" %(rasd['EmulatedType'], + exp_emu_type)) - if found_rasd is None: - raise Exception("DiskRASD for defined dom was not found") + if found_rasd is None: + raise Exception("DiskRASD for defined dom was not found") - cxml.undefine(options.ip) + cxml.undefine(options.ip) except Exception, detail: logger.error("Exception: %s", detail)

2 1

[PATCH] [TEST] Updated test case for VSI
by Sharad Mishra 18 Feb '11

18 Feb '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1295017601 28800 # Node ID a226c6d2bccad847da03d29746b8f2c821957517 # Parent bb3fbbcdfd16998662bc8187dcdac95f959473d0 [TEST] Updated test case for VSI. libvirt-cim netpool template was changed to support VSI and this test has been updated to reflect the new template count. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r bb3fbbcdfd16 -r a226c6d2bcca suites/libvirt-cim/lib/XenKvmLib/rasd.py --- a/suites/libvirt-cim/lib/XenKvmLib/rasd.py Fri Jan 14 06:56:10 2011 -0800 +++ b/suites/libvirt-cim/lib/XenKvmLib/rasd.py Fri Jan 14 07:06:41 2011 -0800 @@ -395,11 +395,14 @@ def get_exp_net_rasd_len(virt, rev, id): net_rasd_template_changes = 861 net_rasd_direct_nettype_changes = 1029 + net_rasd_vsi_nettype_changes = 1043 # NetRASD record for Direct NetType 1 for each min, max, incr, default exp_direct = 4 exp_base_num = 4 + dev_types = 2 + net_types = 3 if id == "NetworkPool/0": pool_types = 3 @@ -408,14 +411,13 @@ return (exp_base_num * pool_types) + (exp_base_num * forward_modes) if rev >= net_rasd_template_changes: - dev_types = 2 - net_types = 3 exp_base_num = exp_base_num * dev_types * net_types - if rev >= net_rasd_direct_nettype_changes: - exp_base_num += exp_direct + if rev >= net_rasd_direct_nettype_changes: + exp_base_num += exp_direct - return exp_base_num + if rev >= net_rasd_vsi_nettype_changes: + exp_base_num = 4 * (dev_types * net_types + exp_direct) return exp_base_num

2 1

[PATCH] [TEST] Updated this testcase to focus on pause/resume
by Sharad Mishra 18 Feb '11

18 Feb '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1295017609 28800 # Node ID 2c9689c31d42c2320ecca7a4283bd564c5a27737 # Parent a226c6d2bccad847da03d29746b8f2c821957517 [TEST] Updated this testcase to focus on pause/resume. This test was running suspend and reboot which is not supported on all hypervisor types. So changed this test case to focus on pause and resume. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r a226c6d2bcca -r 2c9689c31d42 suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py --- a/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Fri Jan 14 07:06:41 2011 -0800 +++ b/suites/libvirt-cim/cimtest/ComputerSystem/33_suspend_reboot.py Fri Jan 14 07:06:49 2011 -0800 @@ -59,7 +59,7 @@ server = options.ip virt = options.virt - tc_scen = ['Start', 'Suspend', 'Reboot'] + tc_scen = ['Start', 'Paused', 'Resume'] action_passed = PASS try: @@ -73,10 +73,10 @@ for action in tc_scen: if action == "Start": status = cxml.cim_start(server) - elif action == "Suspend": - status = cxml.cim_suspend(server) - elif action == "Reboot": - status = cxml.cim_reboot(server) + elif action == "Paused": + status = cxml.cim_pause(server) + elif action == "Resume": + status = cxml.cim_reset(server) else: raise Exception("Unexpected state change: %s" % action)

2 1

Release of libvirt-cim-0.5.11 and libcmpiutil-0.5.4
by Chip Vincent 25 Jan '11

25 Jan '11

When publishing this release, I mistakenly overwrote the released tar files with different ones. The "alternate" versions now have the extension ".override" and you should avoid using them, if possible I'm in the process now of publishing new release (and new version :) with all the upstream content so everything is back in sync. Sorry for any confusion. Also, be aware libvirt-cim-0.5.11 depends on libcmpiutil-0.5.4. libvirt-cim-0.5.11 ftp://libvirt.org/libvirt-cim/libvirt-cim-0.5.11.tar.gz * Update indication providers to the std_indication interface change introduced in libcmpiutil f967d9432f31 (Chip Vincent) * Fix to support domain name with space (Sharad Mishra) * Patch to allow cdrom media change (Sharad Mishra) * Add domain UUID and timestamp to ComputerSystem and MigrationJob Indications (Chip Vincent) * Return profiles according to role (Chip Vincent) * Removing the code to fetch sblim instance (Sharad Mishra) * Update revision and force creation of INFO_STORE during install (Chip Vincent) * NetRASD enumeration to show VSI fields (Sharad Mishra) * Set default VM autostart value (Sharad Mishra) * Generating Deleted indication after Modified indication (Sharad Mishra) * Workaround for Pegasus ObjectPath issue. (Sharad Mishra) * Bypass cdrom check while defining VMs (Sharad Mishra) * Ensure AllocationUnits property populates the libvirt XML 'capacity unit' AND 'allocation unit' so they are the same (Chip Vincent) * Use libvirt to get StorageVolume Path to set SV InstanceID (Sharad Mishra) * Update xml generation to support vepa (Sharad Mishra) libcmpiutil-0.5.4 ftp://libvirt.org/libvirt-cim/libcmpiutil-0.5.4.tar.gz * Restore const to interface to avoid warnings (Chip Vincent) * Add method to merge RASDs (Sharad Mishra) * Missing namespace from migration indications (Sharad Mishra) * Adding CMReturnDone after CMPI InvokeMethod (Sharad Mishra) -- Chip Vincent Open Virtualization, Linux Technology Center IBM Systems & Technology Group phone: 919-254-4482, T/L 444-4482 email: cvincent(a)us.ibm.com

2 1

[PATCH] UUID and Timestamp were incorrectly set for indications
by Sharad Mishra 14 Jan '11

14 Jan '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1294774143 28800 # Node ID 16a78de40b7fd62ee6d83e1491b52a4cf86a3839 # Parent 28f3d6f46a06aa5be6aba8bcfeda55bd0ddc5468 UUID and Timestamp were incorrectly set for indications. CMSetProperty call was failing to set uuid and timestamp since they were not properly passed. signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 28f3d6f46a06 -r 16a78de40b7f src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Mon Dec 27 16:32:02 2010 -0800 +++ b/src/Virt_ComputerSystemIndication.c Tue Jan 11 11:29:03 2011 -0800 @@ -282,11 +282,11 @@ uuid = CMGetProperty(affected_inst, "UUID", &s); CMSetProperty(ind, "IndicationIdentifier", - (CMPIValue *)&uuid, CMPI_string); + (CMPIValue *)&(uuid.value), CMPI_string); timestamp = CMNewDateTime(broker, &s); CMSetProperty(ind, "IndicationTime", - (CMPIValue *)timestamp, CMPI_dateTime); + (CMPIValue *)&timestamp, CMPI_dateTime); if (ind_type == CS_MODIFIED) { CMSetProperty(ind, "PreviousInstance", diff -r 28f3d6f46a06 -r 16a78de40b7f src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Mon Dec 27 16:32:02 2010 -0800 +++ b/src/Virt_VSMigrationService.c Tue Jan 11 11:29:03 2011 -0800 @@ -755,6 +755,7 @@ return false; ind_name = ind_type_to_name(ind_type); + CU_DEBUG("Raising %s indication", ind_name); ref = CMGetObjectPath(inst, &s); @@ -847,7 +848,7 @@ timestamp = CMNewDateTime(broker, s); CMSetProperty(ind, "IndicationTime", - (CMPIValue *)timestamp, CMPI_dateTime); + (CMPIValue *)&timestamp, CMPI_dateTime); if (ind_type == MIG_MODIFIED) { /* Need to copy job inst before attaching as PreviousInstance

2 1

[PATCH] Fixing NullPointerException
by Sharad Mishra 14 Jan '11

14 Jan '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1293660976 28800 # Node ID a4f6fba67e8e85aaec6969c39cfaa016b60779d3 # Parent 35396e5b805193c024b6d4f065136d7b57a0b03d Fixing NullPointerException CMPIInstance 'inst' is used before it is set. With this patch sending a one line change to set previous instance correctly. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 35396e5b8051 -r a4f6fba67e8e src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Dec 14 13:59:51 2010 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Wed Dec 29 14:16:16 2010 -0800 @@ -1378,16 +1378,6 @@ goto out; } - if (cu_get_str_prop(inst, "autoStart", &autoStartFlag) != CMPI_RC_OK) - autoStartFlag = strdup("disable"); - - if (STREQ(autoStartFlag, "enable")) - autoflag = 1; - else - autoflag = 0; - if((virDomainSetAutostart(dom, autoflag)) == -1) - CU_DEBUG("Failed to set autostart flag."); - name = virDomainGetName(dom); *s = get_domain_by_name(_BROKER, ref, name, &inst); @@ -1396,6 +1386,20 @@ cu_statusf(_BROKER, s, CMPI_RC_ERR_FAILED, "Failed to lookup resulting system"); + goto out; + } + + if (inst != NULL) { + if (cu_get_str_prop(inst, "autoStart", + &autoStartFlag) != CMPI_RC_OK) + autoStartFlag = strdup("disable"); + + if (STREQ(autoStartFlag, "enable")) + autoflag = 1; + else + autoflag = 0; + if((virDomainSetAutostart(dom, autoflag)) == -1) + CU_DEBUG("Failed to set autostart flag."); } out: @@ -2424,12 +2428,12 @@ goto out; } + prev_inst = orig_inst; s = cu_merge_instances(rasd, orig_inst); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Failed to merge Instances"); goto out; } - prev_inst = orig_inst; rasd = orig_inst; }

2 1

[PATCH] Patch to fix missing DiskPool type
by Sharad Mishra 14 Jan '11

14 Jan '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1293496322 28800 # Node ID 28f3d6f46a06aa5be6aba8bcfeda55bd0ddc5468 # Parent 35396e5b805193c024b6d4f065136d7b57a0b03d Patch to fix missing DiskPool type. DiskPool type was not being populated. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 35396e5b8051 -r 28f3d6f46a06 libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Tue Dec 14 13:59:51 2010 -0800 +++ b/libxkutil/pool_parsing.c Mon Dec 27 16:32:02 2010 -0800 @@ -166,6 +166,30 @@ return 1; } +char *get_disk_pool_type(uint16_t type) +{ + + switch (type) { + case DISK_POOL_DIR: + return "dir"; + case DISK_POOL_FS: + return "fs"; + case DISK_POOL_NETFS: + return "netfs"; + case DISK_POOL_DISK: + return "disk"; + case DISK_POOL_ISCSI: + return "iscsi"; + case DISK_POOL_LOGICAL: + return "logical"; + case DISK_POOL_SCSI: + return "scsi"; + default: + return NULL; + } + +} + static const char *parse_disk_pool(xmlNodeSet *nsv, struct disk_pool *pool) { xmlNode **nodes = nsv->nodeTab; diff -r 35396e5b8051 -r 28f3d6f46a06 libxkutil/pool_parsing.h --- a/libxkutil/pool_parsing.h Tue Dec 14 13:59:51 2010 -0800 +++ b/libxkutil/pool_parsing.h Mon Dec 27 16:32:02 2010 -0800 @@ -86,6 +86,7 @@ void cleanup_virt_pool_res(struct virt_pool_res **res); int get_pool_from_xml(const char *xml, struct virt_pool *pool, int type); +char *get_disk_pool_type(uint16_t type); int define_pool(virConnectPtr conn, const char *xml, int res_type); int destroy_pool(virConnectPtr conn, const char *name, int res_type); diff -r 35396e5b8051 -r 28f3d6f46a06 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Tue Dec 14 13:59:51 2010 -0800 +++ b/src/Virt_DevicePool.c Mon Dec 27 16:32:02 2010 -0800 @@ -172,6 +172,7 @@ virStoragePoolInfo info; uint64_t cap; uint64_t res; + uint16_t type; struct virt_pool *pool_vals = NULL; const char *pool_str = NULL; @@ -204,6 +205,10 @@ CMSetProperty(inst, "Path", (CMPIValue *)pool_str, CMPI_chars); } + type = pool_vals->pool_info.disk.pool_type; + CMSetProperty(inst, "OtherResourceType", + (CMPIValue *)get_disk_pool_type(type), + CMPI_chars); } result = true; @@ -957,11 +962,19 @@ const char *refcn, const CMPIBroker *broker) { + CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *inst; char *poolid = NULL; inst = get_typed_instance(broker, refcn, "DiskPool", ns); + if (inst == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Unable to init DiskPool instance"); + goto out; + } + if (asprintf(&poolid, "DiskPool/%s", pool->tag) == -1) return NULL; @@ -976,6 +989,7 @@ CU_DEBUG("Failed to set capacity for disk pool: %s", pool->tag); +out: free(poolid); return inst;

2 1

[PATCH] Added support for qcow2 format type
by Sharad Mishra 14 Jan '11

14 Jan '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1293079091 28800 # Node ID 353104beb7b459f715f64bd88feb899bfce4458f # Parent 35396e5b805193c024b6d4f065136d7b57a0b03d Added support for qcow2 format type. Only 'raw' storage volume was supported by libvirt-cim. This patch adds support for qcow2. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r 35396e5b8051 -r 353104beb7b4 libxkutil/pool_parsing.h --- a/libxkutil/pool_parsing.h Tue Dec 14 13:59:51 2010 -0800 +++ b/libxkutil/pool_parsing.h Wed Dec 22 20:38:11 2010 -0800 @@ -66,7 +66,8 @@ struct storage_vol { enum {VOL_FORMAT_UNKNOWN, - VOL_FORMAT_RAW} format_type; + VOL_FORMAT_RAW, + VOL_FORMAT_QCOW2} format_type; char *vol_name; char *path; uint16_t alloc; diff -r 35396e5b8051 -r 353104beb7b4 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Tue Dec 14 13:59:51 2010 -0800 +++ b/libxkutil/xmlgen.c Wed Dec 22 20:38:11 2010 -0800 @@ -1134,6 +1134,8 @@ switch (type) { case VOL_FORMAT_RAW: return "raw"; + case VOL_FORMAT_QCOW2: + return "qcow2"; default: CU_DEBUG("Unsupported storage volume type"); }

2 1

[PATCH] [TEST] Verify that disk can be dynamically modified
by Sharad Mishra 14 Jan '11

14 Jan '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1293659957 28800 # Node ID 52487783c9e1ae0967aa6f2c72269a85290c3f22 # Parent c08c7fb1eb78c209fd6af1fc40b9858b0027061b [TEST] Verify that disk can be dynamically modified. This test case will create a new VM (define and start) and add a virtio disk and then modify it. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r c08c7fb1eb78 -r 52487783c9e1 suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/30_dynamic_disk_mod.py Wed Dec 29 13:59:17 2010 -0800 @@ -0,0 +1,88 @@ +#!/usr/bin/python +# +# Copyright 2008 IBM Corp. +# +# Authors: +# Sharad Mishra <snmishra(a)us.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +import sys +import pywbem +from pywbem.cim_obj import CIMInstanceName +from XenKvmLib import vsms +from XenKvmLib import vxml +from XenKvmLib.classes import get_typed_class +from CimTest.Globals import logger +from XenKvmLib.const import do_main +from CimTest.ReturnCodes import FAIL, PASS +from XenKvmLib import vsms_util + +sup_types = ['Xen', 'KVM', 'XenFV'] +default_dom = 'rstest_domain' + +@do_main(sup_types) +def main(): + options = main.options + + if options.virt == 'KVM': + nddev = 'vda' + else: + nddev = 'xvdb' + + service = vsms.get_vsms_class(options.virt)(options.ip) + cxml = vxml.get_class(options.virt)(default_dom) + classname = get_typed_class(options.virt, 'VirtualSystemSettingData') + inst_id = '%s:%s' % (options.virt, default_dom) + vssd_ref = CIMInstanceName(classname, keybindings = { + 'InstanceID' : inst_id, + 'CreationClassName' : classname}) + dasd = vsms.get_dasd_class(options.virt)(dev=nddev, + source=cxml.secondary_disk_path, + name=default_dom) + disk_attr = { 'nddev' : nddev, + 'src_path' : cxml.secondary_disk_path + } + + cxml.undefine(options.ip) + cxml = vxml.get_class(options.virt)(default_dom) + ret = cxml.cim_define(options.ip) + if not ret: + logger.error("Failed to define the dom: %s", default_dom) + return FAIL + + ret = cxml.start(options.ip) + if not ret: + logger.error("Failed to start the dom: %s", default_dom) + return FAIL + + status = vsms_util.add_disk_res(options.ip, service, cxml, vssd_ref, + dasd, disk_attr) + if status != PASS: + return FAIL + dasd = vsms.get_dasd_class(options.virt)(dev='vdc', + instanceid='rstest_domain/vda', + source='/home/rss.iso', + name=default_dom) + + service = vsms.get_vsms_class(options.virt)(options.ip) + output = service.ModifyResourceSettings(ResourceSettings = [str(dasd)]) + + return status + +if __name__ == "__main__": + sys.exit(main()) +

2 1

[PATCH] [TEST] Updated the test to create qcow2 storage volumes
by Sharad Mishra 14 Jan '11

14 Jan '11

# HG changeset patch # User Sharad Mishra <snmishra(a)us.ibm.com> # Date 1293219718 28800 # Node ID c08c7fb1eb78c209fd6af1fc40b9858b0027061b # Parent d88da81a62f6c4cd6bfc0310f360e4d77863d9f4 [TEST] Updated the test to create qcow2 storage volumes. This test has been updated to create not just raw storage volumes, but also qcow2. Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com> diff -r d88da81a62f6 -r c08c7fb1eb78 suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Wed Dec 22 18:37:01 2010 -0800 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/10_create_storagevolume.py Fri Dec 24 11:41:58 2010 -0800 @@ -42,6 +42,7 @@ from XenKvmLib.classes import get_typed_class, inst_to_mof from XenKvmLib.common_util import destroy_diskpool from XenKvmLib.pool import create_pool, undefine_diskpool, DIR_POOL +from pywbem.cim_types import Uint64 pool_attr = { 'Path' : _image_dir } vol_name = "cimtest-vol.img" @@ -62,7 +63,7 @@ return PASS, rasd -def get_stovol_settings(server, virt, dp_id, pool_name): +def get_stovol_settings(server, virt, dp_id, pool_name, format): status, dp_rasds = get_template_rasd_from_sdc(virt, server, dp_id) if status != PASS: logger.error("Failed to get the StorageVol RASD's") @@ -79,7 +80,8 @@ if not pool_name in dpool_rasd['PoolID']: return None - + dpool_rasd['FormatType'] = Uint64(format) + stovol_settings = inst_to_mof(dpool_rasd) return stovol_settings @@ -197,67 +199,71 @@ # vol creation, we can extend dp_types to include netfs etc dp_types = { "DISK_POOL_DIR" : DIR_POOL } - for pool_name, pool_type in dp_types.iteritems(): - status = FAIL - res = [FAIL] - found = 0 - clean_pool=True - try: - if pool_type == DIR_POOL: - pool_name = default_pool_name - clean_pool=False - else: - status = create_pool(server, virt, pool_name, pool_attr, - mode_type=pool_type, pool_type="DiskPool") + format_types = [1, 2] - if status != PASS: - logger.error("Failed to create pool '%s'", pool_name) - return status + for fs in format_types: + for pool_name, pool_type in dp_types.iteritems(): + status = FAIL + res = [FAIL] + found = 0 + clean_pool=True + try: + if pool_type == DIR_POOL: + pool_name = default_pool_name + clean_pool=False + else: + status = create_pool(server, virt, pool_name, pool_attr, + mode_type=pool_type, pool_type="DiskPool") - dp_inst_id = "%s/%s" % (dp_cn, pool_name) - stovol_settings = get_stovol_settings(server, virt, - dp_inst_id, pool_name) - if stovol_settings == None: - raise Exception("Failed to get the defualt StorageVolRASD info") + if status != PASS: + logger.error("Failed to create pool '%s'", pool_name) + return status - disk_pool_inst = get_diskpool(server, virt, dp_cn, dp_inst_id) - if disk_pool_inst == None: - raise Exception("DiskPool instance for '%s' not found!" \ - % pool_name) + dp_inst_id = "%s/%s" % (dp_cn, pool_name) + stovol_settings = get_stovol_settings(server, virt, + dp_inst_id, pool_name, fs) + if stovol_settings == None: + raise Exception("Failed to get the defualt StorageVolRASD info") + + disk_pool_inst = get_diskpool(server, virt, dp_cn, dp_inst_id) + if disk_pool_inst == None: + raise Exception("DiskPool instance for '%s' not found!" \ + % pool_name) - rpcs = get_typed_class(virt, "ResourcePoolConfigurationService") - rpcs_conn = eval("rpcs_service." + rpcs)(server) - res = rpcs_conn.CreateResourceInPool(Settings=stovol_settings, - Pool=disk_pool_inst) - if res[0] != PASS: - raise Exception("Failed to create the Vol %s" % vol_name) + rpcs = get_typed_class(virt, "ResourcePoolConfigurationService") + rpcs_conn = eval("rpcs_service." + rpcs)(server) + res = rpcs_conn.CreateResourceInPool(Settings=stovol_settings, + Pool=disk_pool_inst) + if res[0] != PASS: + raise Exception("Failed to create the Vol %s" % vol_name) - if res[1]['Resource']['InstanceID'] != exp_vol_path and \ - cim_rev >= libvirt_stovol_instance_id: - raise Exception("Incorrect InstanceID") - else: - status = PASS + if res[1]['Resource']['InstanceID'] != exp_vol_path and \ + cim_rev >= libvirt_stovol_instance_id: + raise Exception("Incorrect InstanceID") + else: + status = PASS - found = verify_vol(server, virt, pool_name, exp_vol_path, found) - stovol_status = verify_template_rasd_exists(virt, server, - dp_inst_id, - exp_vol_path) + found = verify_vol(server, virt, pool_name, exp_vol_path, found) + stovol_status = verify_template_rasd_exists(virt, server, + dp_inst_id, + exp_vol_path) - ret = cleanup_pool_vol(server, virt, pool_name, - clean_pool, exp_vol_path) - if res[0] == PASS and found == 1 and \ - ret == PASS and stovol_status == PASS and \ - status == PASS: - status = PASS - else: - return FAIL + ret = cleanup_pool_vol(server, virt, pool_name, + clean_pool, exp_vol_path) + if res[0] == PASS and found == 1 and \ + ret == PASS and stovol_status == PASS and \ + status == PASS: + status = PASS + else: + return FAIL - except Exception, details: - logger.error("Exception details: %s", details) - cleanup_pool_vol(server, virt, pool_name, - clean_pool, exp_vol_path) - status = FAIL + except Exception, details: + logger.error("Exception details: %s", details) + cleanup_pool_vol(server, virt, pool_name, + clean_pool, exp_vol_path) + status = FAIL return status + if __name__ == "__main__": sys.exit(main())

2 1