- CIM - libvirt List Archives

[PATCH 0 of 4] Add support fore creating directory based storage pools
by Kaitlin Rupert 07 Apr '09

07 Apr '09

libvirt support various storage pool types - support for these pool types will be added in additional patchsets. This set just adds support for directory based pools.

2 5

[PATCH] [TEST] Adding new tc to cover offline migration
by Deepti B. Kalakeri 07 Apr '09

07 Apr '09

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1239014625 25200 # Node ID e0c9e0c4b5a3c59ac721286522cbf0f663858090 # Parent 7ec8f401505cb9089e875fececa34814c0ea82cb [TEST] Adding new tc to cover offline migration. Tested with KVM and Xen with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r 7ec8f401505c -r e0c9e0c4b5a3 suites/libvirt-cim/cimtest/VirtualSystemMigrationService/07_remote_offline_migration.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/07_remote_offline_migration.py Mon Apr 06 03:43:45 2009 -0700 @@ -0,0 +1,137 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# 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 +# 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 +# +# +# This testcase is used to verify the offline(other) remote migration. +# +# Date : 12-03-09 +# + +import sys +import os +from socket import gethostname, gethostbyaddr +from XenKvmLib import vxml +from XenKvmLib.xm_virt_util import domain_list, net_list +from CimTest.Globals import logger +from XenKvmLib.const import do_main, default_network_name +from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.classes import get_typed_class +from XenKvmLib.vsmigrations import local_remote_migrate +from XenKvmLib.common_util import poll_for_state_change, create_netpool_conf,\ + destroy_netpool + +sup_types = ['KVM', 'Xen'] + +REQUESTED_STATE = 3 + +def setup_guest(test_dom, ip, virt): + virt_xml = vxml.get_class(virt) + cxml = virt_xml(test_dom) + ret = cxml.cim_define(ip) + if not ret: + logger.error("Error define domain %s", test_dom) + return FAIL, cxml + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + REQUESTED_STATE) + if status != PASS: + cxml.undefine(test_dom) + logger.error("'%s' didn't change state as expected" % test_dom) + return FAIL, cxml + + return PASS, cxml + +def cleanup_guest_netpool(virt, cxml, test_dom, t_sysname, s_sysname): + # Clean the domain on target machine. + # This is req when migration is successful, also when migration is not + # completely successful VM might be created on the target machine + # and hence need to clean. + target_list = domain_list(t_sysname, virt) + if target_list != None and test_dom in target_list: + ret_value = cxml.undefine(t_sysname) + if not ret_value: + logger.info("Failed to undefine the migrated domain '%s' on '%s'", + test_dom, t_sysname) + + # clean the networkpool created on the remote machine + target_net_list = net_list(t_sysname, virt) + if target_net_list != None and default_network_name in target_net_list: + ret_value = destroy_netpool(t_sysname, virt, default_network_name) + if ret_value != PASS: + logger.info("Unable to destroy networkpool '%s' on '%s'", + default_network_name, t_sysname) + + # Remote Migration not Successful, clean the domain on src machine + src_list = domain_list(s_sysname, virt) + if src_list != None and test_dom in src_list: + ret_value = cxml.undefine(s_sysname) + if not ret_value: + logger.info("Failed to undefine the domain '%s' on source '%s'", + test_dom, s_sysname) + + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + s_sysname = gethostbyaddr(options.ip)[0] + t_sysname = gethostbyaddr(options.t_url)[0] + if options.virt == 'KVM' and (t_sysname == s_sysname or \ + t_sysname in s_sysname): + logger.info("Libvirt does not support local migratoin for KVM") + return SKIP + + status = FAIL + test_dom = 'VM_frm_' + gethostname() + + try: + status, cxml = setup_guest(test_dom, s_sysname, virt) + if status != PASS: + logger.error("Error setting up the guest") + return status + + # create the networkpool used in the domain to be migrated + # on the target machine. + t_net_list = net_list(t_sysname, virt) + if t_net_list != None and default_network_name not in t_net_list: + status, netpool = create_netpool_conf(t_sysname, virt, + net_name=default_network_name) + if status != PASS: + raise Exception("Unable to create network pool '%s' on '%s'" + % (default_network_name, t_sysname)) + + # Migrate the test_dom to t_sysname. + # Enable remote migration by setting remote_migrate=1 + status = local_remote_migrate(s_sysname, t_sysname, virt, + remote_migrate=1, guest_name=test_dom, + mtype='offline') + except Exception, details: + logger.error("Exception details :%s", details) + status = FAIL + + cleanup_guest_netpool(virt, cxml, test_dom, t_sysname, s_sysname) + + return status + +if __name__ == "__main__": + sys.exit(main()) +

3 4

[PATCH] [TEST] Adding new tc to cover restart and resume migration scenarios
by Deepti B. Kalakeri 07 Apr '09

07 Apr '09

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1239014783 25200 # Node ID a063e2b6e79e70ff8a253b1b37c437f82d38eb26 # Parent e0c9e0c4b5a3c59ac721286522cbf0f663858090 [TEST] Adding new tc to cover restart and resume migration scenarios . Tested with KVM and Xen with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r e0c9e0c4b5a3 -r a063e2b6e79e suites/libvirt-cim/cimtest/VirtualSystemMigrationService/08_remote_restart_resume_migration.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/suites/libvirt-cim/cimtest/VirtualSystemMigrationService/08_remote_restart_resume_migration.py Mon Apr 06 03:46:23 2009 -0700 @@ -0,0 +1,182 @@ +#!/usr/bin/python +# +# Copyright 2009 IBM Corp. +# +# Authors: +# 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 +# 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 +# +# +# This testcase is used to verify the resume and restart remote migration. +# +# Date : 05-04-2009 +# + +import sys +import os +from socket import gethostname, gethostbyaddr +from XenKvmLib import vxml +from XenKvmLib.xm_virt_util import domain_list, net_list +from CimTest.Globals import logger +from XenKvmLib.const import do_main, default_network_name +from CimTest.ReturnCodes import PASS, FAIL, SKIP +from XenKvmLib.classes import get_typed_class +from XenKvmLib.vsmigrations import local_remote_migrate +from XenKvmLib.common_util import poll_for_state_change, create_netpool_conf,\ + destroy_netpool + +sup_types = ['KVM', 'Xen'] + +REQUESTED_STATE = 2 + +def setup_guest(test_dom, ip, virt): + virt_xml = vxml.get_class(virt) + cxml = virt_xml(test_dom) + ret = cxml.cim_define(ip) + if not ret: + logger.error("Error define domain %s", test_dom) + return FAIL, cxml + + status = cxml.cim_start(ip) + if status != PASS: + cxml.undefine(test_dom) + logger.error("Error to start domain %s", test_dom) + return FAIL, cxml + + status, dom_cs = poll_for_state_change(ip, virt, test_dom, + REQUESTED_STATE) + if status != PASS: + cxml.cim_destroy(test_dom) + cxml.undefine(test_dom) + logger.error("'%s' didn't change state as expected" % test_dom) + return FAIL, cxml + + return PASS, cxml + +def cleanup_guest(virt, cxml, test_dom, t_sysname, s_sysname): + # Clean the domain on target machine. + # This is req when migration is successful, also when migration is not + # completely successful VM might be created on the target machine + # and hence need to clean. + target_list = domain_list(t_sysname, virt) + if target_list != None and test_dom in target_list: + ret_value = cxml.destroy(t_sysname) + if not ret_value: + logger.info("Failed to destroy the migrated domain '%s' on '%s'", + test_dom, t_sysname) + + ret_value = cxml.undefine(t_sysname) + if not ret_value: + logger.info("Failed to undefine the migrated domain '%s' on '%s'", + test_dom, t_sysname) + + # Remote Migration not Successful, clean the domain on src machine + src_list = domain_list(s_sysname, virt) + if src_list != None and test_dom in src_list: + ret_value = cxml.cim_destroy(s_sysname) + if not ret_value: + logger.info("Failed to destroy the domain '%s' on the source '%s'", + test_dom, s_sysname) + + ret_value = cxml.undefine(s_sysname) + if not ret_value: + logger.info("Failed to undefine the domain '%s' on source '%s'", + test_dom, s_sysname) + + +def str_status(status): + if status == PASS: + return 'PASSED' + else: + return 'FAILED' + +@do_main(sup_types) +def main(): + options = main.options + virt = options.virt + s_sysname = gethostbyaddr(options.ip)[0] + t_sysname = gethostbyaddr(options.t_url)[0] + if options.virt == 'KVM' and (t_sysname == s_sysname or \ + t_sysname in s_sysname): + logger.info("Libvirt does not support local migratoin for KVM") + return SKIP + + status = FAIL + test_dom = 'VM_frm_' + gethostname() + net_pool_name = default_network_name + mig_types = [ 'restart', 'resume' ] + status_resume = status_restart = None + + try: + + for mig_type in mig_types: + logger.info("Executing '%s' migration for '%s' from '%s' to '%s'", + mig_type, test_dom, s_sysname, t_sysname) + status, cxml = setup_guest(test_dom, s_sysname, virt) + if status != PASS: + logger.error("Error setting up the guest") + return status + + # create the networkpool used in the domain to be migrated + # on the target machine. + t_net_list = net_list(t_sysname, virt) + if t_net_list != None and net_pool_name not in t_net_list: + status, netpool = create_netpool_conf(t_sysname, virt, + net_name=net_pool_name) + if status != PASS: + raise Exception("Unable to create network pool '%s' on '%s'" + % (net_pool_name, t_sysname)) + + # Migrate the test_dom to t_sysname. + # Enable remote migration by setting remote_migrate=1 + status = local_remote_migrate(s_sysname, t_sysname, virt, + remote_migrate=1, guest_name=test_dom, + mtype=mig_type) + + logger.info("'%s' Migration for '%s %s' \n", + mig_type, test_dom, str_status(status)) + if mig_type == 'restart' : + status_restart = status + else: + status_resume = status + + cleanup_guest(virt, cxml, test_dom, t_sysname, s_sysname) + + except Exception, details: + logger.error("Exception details is :%s", details) + cleanup_guest(virt, cxml, test_dom, t_sysname, s_sysname) + status = FAIL + + # clean the networkpool created on the remote machine + target_net_list = net_list(t_sysname, virt) + if target_net_list != None and net_pool_name in target_net_list: + ret_value = destroy_netpool(t_sysname, virt, net_pool_name) + if ret_value != PASS: + logger.info("Unable to destroy networkpool '%s' on '%s'", + net_pool_name, t_sysname) + + if status_restart != PASS or status_resume != PASS: + status = FAIL + else: + status = PASS + + logger.info("Test case %s", str_status(status)) + return status + +if __name__ == "__main__": + sys.exit(main()) +

2 1

[PATCH] [TEST] Adding remote_copy_guest_image() to vsmigration.py
by Deepti B. Kalakeri 07 Apr '09

07 Apr '09

# HG changeset patch # User Deepti B. Kalakeri<deeptik(a)linux.vnet.ibm.com> # Date 1238772223 25200 # Node ID 8923fbe5cb2a4321feff81be63a6c458ebdae52d # Parent bfd8818c151aec7e9fa8a675fe29e03e4e07824e [TEST] Adding remote_copy_guest_image() to vsmigration.py. This is needed to make sure that we have the required image files on the destination for the remote migration tests to be successful. Tested for KVM and Xen with current sources. Signed-off-by: Deepti B. Kalakeri <deeptik(a)linux.vnet.ibm.com> diff -r bfd8818c151a -r 8923fbe5cb2a suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py --- a/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py Sun Mar 29 16:04:03 2009 -0700 +++ b/suites/libvirt-cim/lib/XenKvmLib/vsmigrations.py Fri Apr 03 08:23:43 2009 -0700 @@ -21,16 +21,19 @@ # # +import random from time import sleep +from VirtLib import utils from pywbem import WBEMConnection, CIMInstanceName from CimTest.CimExt import CIMMethodClass, CIMClassMOF from CimTest.ReturnCodes import PASS, FAIL -from XenKvmLib import enumclass +from XenKvmLib.enumclass import EnumInstances from XenKvmLib.classes import get_typed_class, virt_types from XenKvmLib.xm_virt_util import domain_list from XenKvmLib.const import get_provider_version from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS, \ CIM_ERROR_ENUMERATE + # Migration constants CIM_MIGRATE_OFFLINE=1 CIM_MIGRATE_LIVE=2 @@ -129,6 +132,41 @@ return msd.mof() +def remote_copy_guest_image(virt, s_sysname, t_sysname, test_dom): + cn_name = get_typed_class(virt, 'DiskResourceAllocationSettingData') + req_image = backup_image = None + try: + d_rasds = EnumInstances(s_sysname, cn_name, ret_cim_inst=True) + for d_rasd in d_rasds: + if test_dom in d_rasd["InstanceID"]: + req_image = d_rasd["Address"] + break + + if req_image == None: + logger.error("Failed to get Disk RASD info for '%s'", test_dom) + return FAIL, req_image, backup_image + + # Check if the image file with the same name already exist on the machine. + # Back it up. Copy the required working image to the destination. + cmd = "/bin/ls -l %s" % req_image + rc, out = utils.run_remote(t_sysname, cmd) + if rc == 0: + backup_image = req_image + "." + str(random.randint(1, 100)) + cmd = 'mv %s %s' % (req_image, backup_image) + rc, out = utils.run_remote(t_sysname, cmd) + + s, o = utils.copy_remote(t_sysname, req_image, remote=req_image) + if s != 0: + logger.error("Failed to copy the image file '%s' for migration"\ + " to '%s'", req_image, t_sysname) + return FAIL, req_image, backup_image + except Exception, details: + logger.error("Exception in remote_copy_guest_image()") + logger.error("Exception details %s", details) + return FAIL, req_image, backup_image + + return PASS, req_image, backup_image + def check_possible_host_migration(service, cs_ref, ip, msd=None): res = None try: @@ -181,7 +219,7 @@ mig_job_cn = get_typed_class(virt, 'MigrationJob') try: - job = enumclass.EnumInstances(src_ip, mig_job_cn) + job = EnumInstances(src_ip, mig_job_cn) if len(job) < 1: logger.error("'%s' returned empty list", mig_job_cn) return FAIL, None @@ -285,6 +323,14 @@ logger.error("Guest to be migrated not specified.") return FAIL + if remote_migrate == 1: + status, req_image, backup_image = remote_copy_guest_image(virt, + s_sysname, + t_sysname, + guest_name) + if status != PASS: + return status + # Get the guest ref guest_ref = get_guest_ref(guest_name, virt) if guest_ref == None or guest_ref['Name'] != guest_name: @@ -320,4 +366,15 @@ status = check_migration_job(s_sysname, id, t_sysname, guest_name, remote_migrate, virt, timeout=time_out) + # Make sure we do not remove the images on the local machine + if remote_migrate == 1: + # Cleanup the images that is copied on the remote machine + cmd = "rm -rf %s" % req_image + rc, out = utils.run_remote(t_sysname, cmd) + + # Copy the backed up image if any on the remote machine + if backup_image != None: + cmd = 'mv %s %s' % (backup_image, req_image) + rc, out = utils.run_remote(t_sysname, cmd) + return status

2 1

[PATCH] This patch removes the error throwed when volume info cannot be extracted in the disk template generation
by Richard Maciel 02 Apr '09

02 Apr '09

# HG changeset patch # User Richard Maciel <rmaciel(a)linux.vnet.ibm.com> # Date 1238653874 10800 # Node ID 2f4943568299ef76e285e34412ec5ba5f2badbd7 # Parent 3dff43d9b55fdd8b684370a5e1de61640924d63e This patch removes the error throwed when volume info cannot be extracted in the disk template generation If volume information is not available, only a CU_DEBUG message should be generated. Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com> diff -r 3dff43d9b55f -r 2f4943568299 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Mar 31 14:25:53 2009 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Thu Apr 02 03:31:14 2009 -0300 @@ -846,10 +846,7 @@ ret = virStorageVolGetInfo(volume_ptr, &vol_info); if (ret == -1) { - virt_set_status(_BROKER, &s, - CMPI_RC_ERR_FAILED, - virStorageVolGetConnect(volume_ptr), - "Unable to get volume information"); + CU_DEBUG("Unable to get volume information"); goto out; }

1 0

[PATCH 0 of 2] Add support for DeleteResourcePool()
by Kaitlin Rupert 02 Apr '09

02 Apr '09

2 3

How does libvirt-CIM
by Medlyn, Dayne (VSL - Ft Collins) 01 Apr '09

01 Apr '09

The web page advertises that libvirt-CIM is based on the CIM 2.16 schema. As we look at the latest libvirt-CIM in the HG repository there are a number of classes that are not in the 2.16 schema but show up in later schemas (2.19.1 and 2.20 experimental), for example CIM_VirtualSystemMigrationCapabilities class. Can you help me understand what the strategy is relative to the use/implementation of classes not part of the 2.16 schema but now part of current schema? Are there plans to re-base to a newer version of the CIM schema? Thanks. Dayne Medlyn

2 1

[PATCH] [TEST] Add branch of err code to RPCS/04
by yunguol＠cn.ibm.com 31 Mar '09

31 Mar '09

# HG changeset patch # User Guolian Yun <yunguol(a)cn.ibm.com> # Date 1238482424 25200 # Node ID 9722c5133bdb3f6402244e64e3daf8d2e046dd6f # Parent 9e3054481df49d4045498d50188a62acddffab15 [TEST] Add branch of err code to RPCS/04 Tested for KVM, Xen with current sources and rpm Signed-off-by: Guolian Yun<yunguol(a)cn.ibm.com> diff -r 9e3054481df4 -r 9722c5133bdb suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py --- a/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Tue Mar 24 19:15:48 2009 -0700 +++ b/suites/libvirt-cim/cimtest/ResourcePoolConfigurationService/04_CreateChildResourcePool.py Mon Mar 30 23:53:44 2009 -0700 @@ -52,17 +52,22 @@ from XenKvmLib import rpcs_service from CimTest.Globals import logger from CimTest.ReturnCodes import FAIL, PASS -from XenKvmLib.const import do_main, platform_sup +from XenKvmLib.const import do_main, platform_sup, get_provider_version from XenKvmLib.classes import get_typed_class -cim_errno = pywbem.CIM_ERR_NOT_SUPPORTED cim_mname = "CreateChildResourcePool" +libvirt_cim_child_pool_rev = 837 @do_main(platform_sup) def main(): options = main.options rpcs_conn = eval("rpcs_service." + get_typed_class(options.virt, \ "ResourcePoolConfigurationService"))(options.ip) + curr_cim_rev, changeset = get_provider_version(options.virt, options.ip) + if curr_cim_rev >= libvirt_cim_child_pool_rev: + cim_errno = 4 + else: + cim_errno = pywbem.CIM_ERR_NOT_SUPPORTED try: rpcs_conn.CreateChildResourcePool() except pywbem.CIMError, (err_no, desc):

2 1

Test Run Summary (Mar 31 2009): KVM on Fedora release 10.90 (Rawhide) with Pegasus
by Guo Lian Yun 31 Mar '09

31 Mar '09

================================================= Test Run Summary (Mar 31 2009): KVM on Fedora release 10.90 (Rawhide) with Pegasus ================================================= Distro: Fedora release 10.90 (Rawhide) Kernel: 2.6.29-0.24.rc0.git13.fc11.x86_64 libvirt: 0.6.1 Hypervisor: QEMU 0.10.0 CIMOM: Pegasus 2.7.2 Libvirt-cim revision: 839 Libvirt-cim changeset: 47050ea54020 Cimtest revision: 659 Cimtest changeset: 9e3054481df4 ================================================= FAIL : 7 XFAIL : 3 SKIP : 5 PASS : 134 ----------------- Total : 149 ================================================= FAIL Test Summary: HostSystem - 03_hs_to_settdefcap.py: FAIL ResourcePoolConfigurationService - 04_CreateChildResourcePool.py: FAIL SettingsDefineCapabilities - 01_forward.py: FAIL VirtualSystemManagementService - 09_procrasd_persist.py: FAIL VirtualSystemManagementService - 11_define_memrasdunits.py: FAIL VirtualSystemManagementService - 12_referenced_config.py: FAIL VirtualSystemManagementService - 14_define_sys_disk.py: FAIL ================================================= XFAIL Test Summary: ComputerSystem - 32_start_reboot.py: XFAIL ComputerSystem - 33_suspend_reboot.py: XFAIL VirtualSystemManagementService - 16_removeresource.py: XFAIL ================================================= SKIP Test Summary: VSSD - 02_bootldr.py: SKIP VirtualSystemMigrationService - 01_migratable_host.py: SKIP VirtualSystemMigrationService - 02_host_migrate_type.py: SKIP VirtualSystemMigrationService - 05_migratable_host_errs.py: SKIP VirtualSystemMigrationService - 06_remote_live_migration.py: SKIP ================================================= Full 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: PASS -------------------------------------------------------------------- ComputerSystem - 06_paused_active_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 22_define_suspend.py: PASS -------------------------------------------------------------------- ComputerSystem - 23_pause_pause.py: PASS -------------------------------------------------------------------- ComputerSystem - 27_define_pause_errs.py: PASS -------------------------------------------------------------------- ComputerSystem - 32_start_reboot.py: XFAIL ERROR - Got CIM error CIM_ERR_FAILED: Unable to reboot domain: this function is not supported by the hypervisor: virDomainReboot with return code 1 ERROR - Exception: Unable reboot dom 'cs_test_domain' InvokeMethod(RequestStateChange): CIM_ERR_FAILED: Unable to reboot domain: this function is not supported by the hypervisor: virDomainReboot Bug:<00005> -------------------------------------------------------------------- ComputerSystem - 33_suspend_reboot.py: XFAIL ERROR - Got CIM error CIM_ERR_NOT_SUPPORTED: State not supported with return code 7 ERROR - Exception: Unable Suspend dom 'test_domain' InvokeMethod(RequestStateChange): CIM_ERR_NOT_SUPPORTED: State not supported Bug:<00012> -------------------------------------------------------------------- ComputerSystem - 35_start_reset.py: PASS -------------------------------------------------------------------- ComputerSystem - 40_RSC_start.py: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: FAIL ERROR - 'KVM_SettingsDefineCapabilities' returned 88 RASD objects instead of 8 CIM_ERR_INVALID_CLASS: Linux_ComputerSystem -------------------------------------------------------------------- HostSystem - 04_hs_to_EAPF.py: PASS -------------------------------------------------------------------- HostSystem - 05_hs_gi_errs.py: PASS -------------------------------------------------------------------- HostSystem - 06_hs_to_vsms.py: PASS -------------------------------------------------------------------- HostedAccessPoint - 01_forward.py: PASS -------------------------------------------------------------------- HostedAccessPoint - 02_reverse.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 -------------------------------------------------------------------- KVMRedirectionSAP - 01_enum_KVMredSAP.py: PASS -------------------------------------------------------------------- LogicalDisk - 01_disk.py: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- 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: PASS -------------------------------------------------------------------- RASD - 03_rasd_errs.py: PASS -------------------------------------------------------------------- RASD - 04_disk_rasd_size.py: PASS -------------------------------------------------------------------- RASD - 05_disk_rasd_emu_type.py: PASS -------------------------------------------------------------------- RedirectionService - 01_enum_crs.py: PASS -------------------------------------------------------------------- RedirectionService - 02_enum_crscap.py: PASS -------------------------------------------------------------------- RedirectionService - 03_RedirectionSAP_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: FAIL ERROR - Unexpected rc code 4 and description CIM_ERR_INVALID_PARAMETER InvokeMethod(CreateChildResourcePool): CIM_ERR_INVALID_PARAMETER -------------------------------------------------------------------- ResourcePoolConfigurationService - 05_AddResourcesToResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 06_RemoveResourcesFromResourcePool.py: PASS -------------------------------------------------------------------- ResourcePoolConfigurationService - 07_DeleteResourcePool.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 01_forward.py: PASS -------------------------------------------------------------------- ServiceAccessBySAP - 02_reverse.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: FAIL ERROR - KVM_SettingsDefineCapabilities returned 0 ResourcePool objects instead of 8 CIM_ERR_FAILED: Unable to get volume information: cannot open volume '/tmp/tmpSQbE28': No such file or directory -------------------------------------------------------------------- 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 -------------------------------------------------------------------- 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 - Unable to set template ProcRASD CIM_ERR_FAILED: Unable to get volume information: cannot open volume '/tmp/tmpSQbE28': No such file or directory -------------------------------------------------------------------- VirtualSystemManagementService - 10_hv_version.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 11_define_memrasdunits.py: FAIL ERROR - KeyError : 'KVM_MemResourceAllocationSettingData' Traceback (most recent call last): File "./lib/XenKvmLib/const.py", line 143, in do_try File "11_define_memrasdunits.py", line 119, in main status = try_define(options, units, value, cxml) File "11_define_memrasdunits.py", line 60, in try_define if rasd_list[mrasd_cn] is None: KeyError: 'KVM_MemResourceAllocationSettingData' ERROR - None CIM_ERR_FAILED: Unable to get volume information: cannot open volume '/tmp/tmpSQbE28': No such file or directory -------------------------------------------------------------------- VirtualSystemManagementService - 12_referenced_config.py: FAIL ERROR - 'KVM_NetResourceAllocationSettingData' CIM_ERR_FAILED: Unable to get volume information: cannot open volume '/tmp/tmpSQbE28': No such file or directory -------------------------------------------------------------------- VirtualSystemManagementService - 13_refconfig_additional_devs.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 14_define_sys_disk.py: FAIL ERROR - Unable to get template RASDs for rstest_disk_domain CIM_ERR_FAILED: Unable to get volume information: cannot open volume '/tmp/tmpSQbE28': No such file or directory -------------------------------------------------------------------- VirtualSystemManagementService - 15_mod_system_settings.py: PASS -------------------------------------------------------------------- VirtualSystemManagementService - 16_removeresource.py: XFAIL ERROR - 0 RASD insts for domain/mouse:ps2 CIM_ERR_NOT_FOUND: No such instance (no device domain/mouse:ps2) Bug:<00014> -------------------------------------------------------------------- VirtualSystemManagementService - 17_removeresource_neg.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 -------------------------------------------------------------------- VirtualSystemMigrationService - 06_remote_live_migration.py: SKIP -------------------------------------------------------------------- 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 --------------------------------------------------------------------

1 0

[PATCH] (#5) Changed the output of AllocationCapability association when using DiskPool as input
by Richard Maciel 31 Mar '09

31 Mar '09

# HG changeset patch # User Richard Maciel <rmaciel(a)linux.vnet.ibm.com> # Date 1236119796 10800 # Node ID e2fa7b350add17b43dcd0037edcfcc16d98c37c1 # Parent 9010a4ffa133439c3e66a64552840e2a76ef9ad9 (#5) Changed the output of AllocationCapability association when using DiskPool as input This patch fix the results of a 'association instances' query when passing a disk pool AllocationCapabilities reference as input. Before this patch, this query returned RASD templates for the disk pools, but now it returns the RASD templates for each of the volumes which composes the disk pool passed as input. 5: - Using code organization suggested, to reduce code duplication - Fixed email address in the beginning of the code 4: - Joined both set_disk_props functions in only one (using #if to separate versions). This removed duplicated code. - Fixed memory leak points 3: - Kept code for versions which doesn't support disk pools 2: - Changed code style based on feedback - When emulation_type = 1 (cdrom device), the VirtualQuantity property of the template is not set - Changed ID of cdrom device - LXC is handled in a special way, because it doesn't have volumes To test: - Create a domain containing a diskpool and some volumes - Execute query: wbemcli ein 'http://localhost:5988/root/virt:CIM_AllocationCapabilities' - Select the reference to a diskpool and use in an association query like the one below: wbemcli ai -nl -ac KVM_SettingsDefineCapabilities 'http://@localhost:5988/root/virt:KVM_AllocationCapabilities.InstanceID="DiskPool/default"' - There must be four templates for each volume in the diskpool (MINIMUM, MAXIMUM, DEFAULT, INCREMENT) and their address must correspond to the address of the volume Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com> diff -r 9010a4ffa133 -r e2fa7b350add src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Mar 17 15:18:27 2009 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Tue Mar 03 19:36:36 2009 -0300 @@ -4,6 +4,7 @@ * Authors: * Dan Smith <danms(a)us.ibm.com> * Jay Gagnon <grendel(a)linux.vnet.ibm.com> + * Richard Maciel <rmaciel(a)linux.vnet.ibm.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -50,6 +51,16 @@ #include "Virt_AllocationCapabilities.h" #include "Virt_Device.h" +/* + * Right now, detect support and use it, if available. + * Later, this can be a configure option if needed + */ +#if LIBVIR_VERSION_NUMBER > 4000 +# define VIR_USE_LIBVIRT_STORAGE 1 +#else +# define VIR_USE_LIBVIRT_STORAGE 0 +#endif + const static CMPIBroker *_BROKER; /* These are used in more than one place so they are defined here. */ @@ -561,7 +572,129 @@ out: return s; } + +static CMPIStatus set_disk_props(int type, + const CMPIObjectPath *ref, + const char *id, + const char *disk_path, + uint64_t disk_size, + uint16_t emu_type, + struct inst_list *list) +{ + const char *dev; + CMPIInstance *inst; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + if (type == DOMAIN_LXC) { + dev = "/lxc_mnt/tmp"; + } + else { + dev = "hda"; + } + + inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_DISK); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; + + CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); + CMSetProperty(inst, "AllocationQuantity", + (CMPIValue *)"MegaBytes", CMPI_chars); + CMSetProperty(inst, "Address", (CMPIValue *)disk_path, CMPI_chars); + + if (type == DOMAIN_LXC) + CMSetProperty(inst, "MountPoint", (CMPIValue *)dev, CMPI_chars); + else { + if (emu_type == 0) + CMSetProperty(inst, "VirtualQuantity", + (CMPIValue *)&disk_size, CMPI_uint64); + + if (type == DOMAIN_XENPV) { + dev = "xvda"; + CMSetProperty(inst, "Caption", + (CMPIValue *)"PV disk", CMPI_chars); + } else if (type == DOMAIN_XENFV) { + CMSetProperty(inst, "Caption", + (CMPIValue *)"FV disk", CMPI_chars); + } + + CMSetProperty(inst, "VirtualDevice", + (CMPIValue *)dev, CMPI_chars); + CMSetProperty(inst, "EmulatedType", + (CMPIValue *)&emu_type, CMPI_uint16); + } + + inst_list_add(list, inst); + + out: + return s; +} + +static CMPIStatus cdrom_template(const CMPIObjectPath *ref, + int template_type, + struct inst_list *list) +{ + char *pfx = NULL; + const char *id; + const char *vol_path = "/dev/null"; + uint64_t vol_size = 0; + CMPIStatus s = {CMPI_RC_OK, NULL}; + uint16_t emu_type = 1; + + switch(template_type) { + case SDC_RASD_MIN: + id = "Minimum CDROM"; + break; + case SDC_RASD_MAX: + id = "Maximum CDROM"; + break; + case SDC_RASD_INC: + id = "Increment CDROM"; + break; + case SDC_RASD_DEF: + id = "Default CDROM"; + break; + default: + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported sdc_rasd type"); + goto out; + } + + pfx = class_prefix_name(CLASSNAME(ref)); + if (STREQ(pfx, "Xen")) { + int xen_type[2] = {DOMAIN_XENFV, DOMAIN_XENPV}; + int i = 0; + for (; i < 2; i++) { + s = set_disk_props(xen_type[i], + ref, + id, + vol_path, + vol_size, + emu_type, + list); + } + } else if (STREQ(pfx, "KVM")) { + s = set_disk_props(DOMAIN_KVM, + ref, + id, + vol_path, + vol_size, + emu_type, + list); + + } else if (!STREQ(pfx, "LXC")){ + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported virtualization type"); + } + + out: + free(pfx); + + return s; +} + static int get_disk_freespace(const CMPIObjectPath *ref, CMPIStatus *s, uint64_t *free_space) @@ -587,7 +720,7 @@ goto out; } - /* Getting the relevant resource pool directly finds the free space + /* Getting the relevant resource pool directly finds the free space * for us. It is in the Capacity field. */ *s = get_pool_by_name(_BROKER, ref, inst_id, &pool_inst); if (s->rc != CMPI_RC_OK) @@ -608,82 +741,39 @@ return ret; } -static CMPIStatus set_disk_props(int type, - const CMPIObjectPath *ref, - const char *id, - uint64_t disk_size, - uint16_t emu_type, - struct inst_list *list) +static CMPIStatus default_disk_template(const CMPIObjectPath *ref, + int template_type, + struct inst_list *list) { - const char *addr; - const char *dev; - CMPIInstance *inst; + uint64_t disk_size = 0; + int emu_type = 0; + char *pfx = NULL; + const char *disk_path = "/dev/null"; + const char *id; + int type = 0; + bool ret; + CMPIStatus s = {CMPI_RC_OK, NULL}; - if (type == DOMAIN_LXC) { - addr = "/tmp"; - dev = "/lxc_mnt/tmp"; - } - else { - dev = "hda"; - addr = "/dev/null"; - } - - inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_DISK); - if ((inst == NULL) || (s.rc != CMPI_RC_OK)) - goto out; - - CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); - CMSetProperty(inst, "AllocationQuantity", - (CMPIValue *)"MegaBytes", CMPI_chars); - CMSetProperty(inst, "VirtualQuantity", - (CMPIValue *)&disk_size, CMPI_uint64); - CMSetProperty(inst, "Address", (CMPIValue *)addr, CMPI_chars); - - if (type == DOMAIN_LXC) - CMSetProperty(inst, "MountPoint", (CMPIValue *)dev, CMPI_chars); - else { - if (type == DOMAIN_XENPV) { - dev = "xvda"; - CMSetProperty(inst, "Caption", - (CMPIValue *)"PV disk", CMPI_chars); - } else if (type == DOMAIN_XENFV) { - CMSetProperty(inst, "Caption", - (CMPIValue *)"FV disk", CMPI_chars); - } - - CMSetProperty(inst, "VirtualDevice", - (CMPIValue *)dev, CMPI_chars); - CMSetProperty(inst, "EmulatedType", - (CMPIValue *)&emu_type, CMPI_uint16); - } - - inst_list_add(list, inst); - - out: - return s; -} - -static CMPIStatus disk_template(const CMPIObjectPath *ref, - int template_type, - struct inst_list *list) -{ - bool ret; - char *pfx; - const char *id; - uint64_t disk_size; - uint16_t emu_type = 0; - CMPIStatus s = {CMPI_RC_OK, NULL}; + pfx = class_prefix_name(CLASSNAME(ref)); switch(template_type) { case SDC_RASD_MIN: - disk_size = SDC_DISK_MIN; + if (!STREQ(pfx, "LXC")) { + ret = get_disk_freespace(ref, &s, &disk_size); + if (!ret) + goto out; + if (SDC_DISK_MIN < disk_size) + disk_size = SDC_DISK_MIN; + } id = "Minimum"; break; case SDC_RASD_MAX: - ret = get_disk_freespace(ref, &s, &disk_size); - if (!ret) - goto out; + if (!STREQ(pfx, "LXC")) { + ret = get_disk_freespace(ref, &s, &disk_size); + if (!ret) + goto out; + } id = "Maximum"; break; case SDC_RASD_INC: @@ -701,67 +791,273 @@ goto out; } + if (STREQ(pfx, "Xen")) { + int xen_type[2] = {DOMAIN_XENFV, DOMAIN_XENPV}; + int i = 0; + + for (; i < 2; i++) { + s = set_disk_props(xen_type[i], + ref, + id, + disk_path, + disk_size, + emu_type, + list); + if (s.rc != CMPI_RC_OK) + goto out; + } + } else { + if (STREQ(pfx, "KVM")) { + type = DOMAIN_KVM; + } else if (STREQ(pfx, "LXC")) { + type = DOMAIN_LXC; + disk_path = "/tmp"; + disk_size = 0; + } + + s = set_disk_props(type, + ref, + id, + disk_path, + disk_size, + emu_type, + list); + } + + out: + free(pfx); + return s; +} + +#if VIR_USE_LIBVIRT_STORAGE +static CMPIStatus volume_template(const CMPIObjectPath *ref, + int template_type, + virStorageVolPtr volume_ptr, + struct inst_list *list) +{ + char *pfx = NULL; + const char *id; + char *vol_path = NULL; + uint64_t vol_size; + virStorageVolInfo vol_info; + CMPIStatus s = {CMPI_RC_OK, NULL}; + int ret; + uint16_t emu_type = 0; + + ret = virStorageVolGetInfo(volume_ptr, &vol_info); + if (ret == -1) { + virt_set_status(_BROKER, &s, + CMPI_RC_ERR_FAILED, + virStorageVolGetConnect(volume_ptr), + "Unable to get volume information"); + goto out; + } + + switch(template_type) { + case SDC_RASD_MIN: + if (SDC_DISK_MIN > (uint64_t)vol_info.capacity) + vol_size = (uint64_t)vol_info.capacity; + else + vol_size = SDC_DISK_MIN; + id = "Minimum"; + break; + case SDC_RASD_MAX: + vol_size = (uint64_t)vol_info.capacity; + id = "Maximum"; + break; + case SDC_RASD_INC: + vol_size = SDC_DISK_INC; + id = "Increment"; + break; + case SDC_RASD_DEF: + vol_size = (uint64_t)vol_info.allocation; + id = "Default"; + break; + default: + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported sdc_rasd type"); + goto out; + } + + vol_path = virStorageVolGetPath(volume_ptr); + if (vol_path == NULL) { + virt_set_status(_BROKER, &s, + CMPI_RC_ERR_FAILED, + virStorageVolGetConnect(volume_ptr), + "Unable to get volume path"); + goto out; + } + pfx = class_prefix_name(CLASSNAME(ref)); if (STREQ(pfx, "Xen")) { int xen_type[2] = {DOMAIN_XENFV, DOMAIN_XENPV}; int i = 0; - + for (; i < 2; i++) { - emu_type = 0; s = set_disk_props(xen_type[i], - ref, - id, - disk_size, - emu_type, - list); - if (s.rc != CMPI_RC_OK) - goto out; - - emu_type = 1; - s = set_disk_props(xen_type[i], - ref, - id, - disk_size, - emu_type, - list); - if (s.rc != CMPI_RC_OK) - goto out; + ref, + id, + vol_path, + vol_size, + emu_type, + list); } } else if (STREQ(pfx, "KVM")) { s = set_disk_props(DOMAIN_KVM, - ref, - id, - disk_size, - emu_type, - list); - if (s.rc != CMPI_RC_OK) - goto out; - - emu_type = 1; - s = set_disk_props(DOMAIN_KVM, - ref, - id, - disk_size, - emu_type, - list); - } else if (STREQ(pfx, "LXC")) { - s = set_disk_props(DOMAIN_LXC, - ref, - id, - disk_size, - emu_type, - list); + ref, + id, + vol_path, + vol_size, + emu_type, + list); } else { - cu_statusf(_BROKER, &s, + cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Unsupported virtualization type"); } out: + free(pfx); + free(vol_path); + return s; } +static CMPIStatus disk_template(const CMPIObjectPath *ref, + int template_type, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + virConnectPtr conn = NULL; + virStoragePoolPtr poolptr = NULL; + virStorageVolPtr volptr = NULL; + const char *instid = NULL; + char *host = NULL; + const char *poolname = NULL; + char **volnames = NULL; + int numvols = 0; + int numvolsret = 0; + int i; + char *pfx = NULL; + + pfx = class_prefix_name(CLASSNAME(ref)); + if (STREQ(pfx, "LXC")) { + s = default_disk_template(ref, template_type, list); + goto out; + } + + conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s); + + if (cu_get_str_path(ref, "InstanceID", &instid) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get InstanceID for disk device"); + goto out; + } + + if (parse_fq_devid(instid, &host, (char **)&poolname) != 1) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get pool device id"); + goto out; + } + + if ((poolptr = virStoragePoolLookupByName(conn, poolname)) == NULL) { + virt_set_status(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + conn, + "Storage pool `%s' not found", + poolname); + goto out; + } + + if ((numvols = virStoragePoolNumOfVolumes(poolptr)) == -1) { + virt_set_status(_BROKER, &s, + CMPI_RC_ERR_FAILED, + conn, + "Unable to get the number of volumes \ + of storage pool `%s'", + poolname); + goto out; + } + + volnames = (char **)malloc(sizeof(char *) * numvols); + if (volnames == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Could not allocate space for list of volumes \ + of storage pool `%s'", + poolname); + goto out; + } + + numvolsret = virStoragePoolListVolumes(poolptr, volnames, numvols); + + if (numvolsret == -1) { + virt_set_status(_BROKER, &s, + CMPI_RC_ERR_FAILED, + conn, + "Unable to get a pointer to volumes \ + of storage pool `%s'", + poolname); + goto out; + } + + for (i = 0; i < numvolsret; i++) { + volptr = virStorageVolLookupByName(poolptr, volnames[i]); + if (volptr == NULL) { + virt_set_status(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + conn, + "Storage Volume `%s' not found", + volnames[i]); + goto out; + } + + s = volume_template(ref, template_type, volptr, list); + if (s.rc != CMPI_RC_OK) + goto out; + } + + s = cdrom_template(ref, template_type, list); + + out: + free(pfx); + free(volnames); + free(host); + virStorageVolFree(volptr); + virStoragePoolFree(poolptr); + virConnectClose(conn); + + return s; +} +#else +static CMPIStatus disk_template(const CMPIObjectPath *ref, + int template_type, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + char *pfx = NULL; + + s = default_disk_template(ref, template_type, list); + if (s.rc != CMPI_RC_OK) + goto out; + + pfx = class_prefix_name(CLASSNAME(ref)); + if (STREQ(pfx, "LXC")) + goto out; + + s = cdrom_template(ref, template_type, list); + + out: + free(pfx); + + return s; +} +#endif + static CMPIStatus graphics_template(const CMPIObjectPath *ref, int template_type, struct inst_list *list)

1 0