This patch creates basic functions that allow kimchi users to create an libvirt SCSI storagepool using the rest API. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com&gt; --- docs/API.md | 6 ++++++ src/kimchi/API.json | 19 +++++++++++++++++- src/kimchi/model.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/docs/API.md b/docs/API.md index a86b884..d00cdd5 100644 --- a/docs/API.md +++ b/docs/API.md @@ -242,6 +242,12 @@ Represents a snapshot of the Virtual Machine's primary monitor. Pool types: 'iscsi'. * username: Login username of the iSCSI target. * password: Login password of the iSCSI target. + * adapter_type: Host adapter type: 'scsi_host' or 'fc_host'. + * adapter_name: Scsi host name. + Required if 'scsi_host' type is selected. + * wwnn: Word Wide Node Name. + * wwpn: Word Wide Port Name. + ### Resource: Storage Pool diff --git a/src/kimchi/API.json b/src/kimchi/API.json index e942824..b7eb27b 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -37,7 +37,8 @@ "type": { "description": "The type of the defined Storage Pool", "type": "string", - "pattern": "^dir|netfs|logical|kimchi-iso$", + "pattern": "^dir|netfs|logical|kimchi-iso|scsi$", + "pattern": "^dir|netfs|logical|scsi$", "required": true }, "path": { @@ -76,6 +77,22 @@ "minimum": 1, "maximum": 65535 }, + "adapter_type": { + "description": "Host adapter type: 'scsi_host' or 'fc_host'", + "type": "string" + }, + "adapter_name": { + "description": "SCSI host name", + "type": "string" + }, + "wwnn": { + "description": "Fibre channel Word Wide Node Name", + "type": "string" + }, + "wwpn": { + "description": "Fibre channel Word Wide Port Name", + "type": "string" + }, "auth": { "description": "Storage back-end authentication information", "type": "object", diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 51a4427..0eb8cc4 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -75,8 +75,9 @@ from kimchi.objectstore import ObjectStore from kimchi.rollbackcontext import RollbackContext from kimchi.scan import Scanner from kimchi.screenshot import VMScreenshot -from kimchi.utils import get_enabled_plugins, is_digit, kimchi_log -from kimchi.utils import run_command, parse_cmd_output, patch_find_nfs_target +from kimchi.utils import get_enabled_plugins, is_digit +from kimchi.utils import is_libvirt_version_lesser, kimchi_log, parse_cmd_output +from kimchi.utils import patch_find_nfs_target, run_command from kimchi.vmtemplate import VMTemplate @@ -86,7 +87,11 @@ HOST_STATS_INTERVAL = 1 VM_STATIC_UPDATE_PARAMS = {'name': './name'} VM_LIVE_UPDATE_PARAMS = {} STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', - 'path': '/pool/source/dir/@path'}} + 'path': '/pool/source/dir/@path'}, + 'scsi': {'adapter_type': '/pool/source/adapter/@type', + 'adapter_name': '/pool/source/adapter/@name', + 'wwnn': '/pool/source/adapter/@wwnn', + 'wwpn': '/pool/source/adapter/@wwpn'}} def _uri_to_name(collection, uri): @@ -1095,9 +1100,10 @@ class Model(object): return name pool = conn.storagePoolDefineXML(xml, 0) - if params['type'] in ['logical', 'dir', 'netfs']: + if params['type'] in ['logical', 'dir', 'netfs', 'scsi']: pool.build(libvirt.VIR_STORAGE_POOL_BUILD_NEW) - # autostart dir and logical storage pool created from kimchi + # autostart dir, logical, netfs and scsi storage pools created + # from kimchi pool.setAutostart(1) else: # disable autostart for others @@ -1735,6 +1741,47 @@ class LogicalPoolDef(StoragePoolDef): return xml +class ScsiPoolDef(StoragePoolDef): + poolType = 'scsi' + + def prepare(self, conn=None): + # Adapters type are only available in libvirt >= 1.0.5 + if is_libvirt_version_lesser('1.0.5'): + self.poolArgs['source']['adapter_type'] = 'scsi_host' + tmp_name = self.poolArgs['source']['adapter_name'] + self.poolArgs['source']['adapter_name'] = tmp_name.replace('scsi_','') + msg = "Libvirt version <= 1.0.5. Setting SCSI host name as '%s'; "\ + "setting SCSI adapter type as 'scsi_host'; "\ + "ignoring wwnn and wwpn." %tmp_name + kimchi_log.info(msg) + + @property + def xml(self): + # Required parameters + # name: + # source[adapter_type]: + # source[adapter_name]: + # source[wwnn]: + # source[wwpn]: + # path: + + xml = """ + <pool type='scsi'> + <name>{name}</name> + <source> + <adapter type='{source[adapter_type]}'\ + name='{source[adapter_name]}'\ + wwnn='{source[wwnn]}'\ + wwpn='{source[wwpn]}'/> + </source> + <target> + <path>{path}</path> + </target> + </pool> + """.format(**self.poolArgs) + return xml + + class IscsiPoolDef(StoragePoolDef): poolType = 'iscsi' -- 1.8.4.2

On 01/25/2014 08:26 PM, Aline Manera wrote: I am going to simplify this. My bad... mistake while rebasing This will not be necessary anymore I don't agree, as this does not seem to depend on libvirt compilation. But will implement as FEATURE TEST Will remove this parameter and make tests when creating the VM By KIMCHI design, the 'prepare' function is always called, so I just have to do something according to version of libvirt. All the code I made should work without modifications if libvirt is >= 1.0.5 ... so does not need ELSE. The storagepoll xml works, the Disk xml should be different . ww[P/N]n will be ignored in older versions, if passed.

On 01/23/2014 10:29 PM, Rodrigo Trujillo wrote: Please, don't compare versions Create a feature test to check libvirt has or not support for what you want.

OK On 01/25/2014 08:46 PM, Aline Manera wrote:

This patch implements basic routines to add a disk (scsi) to a new vm template. At this moment, the LUN that will be assigned to guest template will be the first and with more space found. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com&gt; --- src/kimchi/model.py | 24 ++++++++++++++++++++++++ src/kimchi/vmtemplate.py | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 0eb8cc4..552f69d 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1534,9 +1534,33 @@ class LibvirtVMTemplate(VMTemplate): xml = pool.XMLDesc(0) return xmlutils.xpath_get_text(xml, "/pool/target/path")[0] + def _get_storage_type(self): + pool = self._storage_validate() + xml = pool.XMLDesc(0) + return xmlutils.xpath_get_text(xml, "/pool/@type")[0] + + def _get_available_volumes(self): + pool = self._storage_validate() + vol_names = pool.listVolumes() + res = [] + for vol in vol_names: + # Considering a volume as available if there is not any format type + xml = pool.storageVolLookupByName(vol).XMLDesc(0) + if (xmlutils.xpath_get_text(xml, "/volume/target/format/@type")[0] + == 'unknown'): + res.append(( + xmlutils.xpath_get_text(xml, "/volume/target/path")[0], + int (xmlutils.xpath_get_text(xml, + "/volume/capacity")[0]) / 1024**3 ) + ) + res.sort(key=lambda x: x[1]) + return res + def fork_vm_storage(self, vm_uuid): # Provision storage: # TODO: Rebase on the storage API once upstream + if self._get_storage_type() == 'scsi': + return [] pool = self._storage_validate() vol_list = self.to_volume_list(vm_uuid) for v in vol_list: diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 58147e3..d6f807a 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -31,6 +31,7 @@ from kimchi import isoinfo from kimchi import osinfo from kimchi.exception import InvalidParameter, IsoFormatError from kimchi.isoinfo import IsoImage +from kimchi.utils import is_libvirt_version_lesser QEMU_NAMESPACE = "xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'" @@ -180,6 +181,32 @@ class VMTemplate(object): graphics_xml = graphics_xml + spicevmc_xml return graphics_xml + def _get_scsi_disks_xml(self): + ret = "" + # Passthrough configuration + disk_xml = """ + <disk type='volume' device='lun'> + <driver name='qemu' type='raw'/> + <source dev='%(src)s'/> + <target dev='%(dev)s' bus='scsi'/> + </disk>""" + if is_libvirt_version_lesser('1.0.5'): + disk_xml = disk_xml.replace('volume','block') + + luns = self._get_available_volumes() + for i, disk in enumerate(self.info['disks']): + index = disk.get('index', i) + try: + # Get luns with more space firstly + src = luns.pop()[0] + except IndexError: + # Skip if there is not available luns + continue + dev = "sd%s" % string.lowercase[index] + params = {'src': src, 'dev': dev} + ret = ret + disk_xml % params + return ret + def to_volume_list(self, vm_uuid): storage_path = self._get_storage_path() ret = [] @@ -225,7 +252,6 @@ class VMTemplate(object): params = dict(self.info) params['name'] = vm_name params['uuid'] = vm_uuid - params['disks'] = self._get_disks_xml(vm_uuid) params['networks'] = self._get_networks_xml() params['qemu-namespace'] = '' params['cdroms'] = '' @@ -233,6 +259,12 @@ class VMTemplate(object): graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + # SCSI FC disk are different + if self._get_storage_type() == 'scsi': + params['disks'] = self._get_scsi_disks_xml() + else: + params['disks'] = self._get_disks_xml(vm_uuid) + qemu_stream_dns = kwargs.get('qemu_stream_dns', False) libvirt_stream = kwargs.get('libvirt_stream', False) cdrom_xml = self._get_cdrom_xml(libvirt_stream, qemu_stream_dns) @@ -292,3 +324,9 @@ class VMTemplate(object): def _get_storage_path(self): return '' + + def _get_storage_type(self): + return '' + + def _get_available_volumes(self): + return [] -- 1.8.4.2

On 01/25/2014 09:08 PM, Aline Manera wrote: The LUN can and cannot be passed through the JSON API when creating the VM, if not passed, a LUN will be selected automatically This only happens when user has UI. I left the option to not pass any lun, when consuming the API strictly, so higher LUN will be selected automatically ACK The volume information provided by user is being modified in patch [6/7] The xml provides a DISK, just followed previous functions pattern. At this moment, yes, as Kimchi only supports 1 disk. I think this is another scope and another feature: "Support multiple disks". I would love code this, but not in the scope of this patch

On 01/30/2014 12:12 PM, Aline Manera wrote: Ok, lets make LUN a requiments (if pool is SCSI). Ok, I am make LUN a required parameter (if scsi pool). But checking will be in vm creation (model) time. Need to figure a way to add this requirement in json schema checking Oh, maybe I expressed myself wrongly. We would need to support "Multiple disks, in multiple pools". Currently, a given Template is tied to one storage pool only. So all disks of the vm will be created inside that assigned pool. This structure does not allow us to mix different types of disks (like file and lun). We have to changes the template structure and other things, or even pass the storagepool name inside disk list. Thats why I said it another feature.

In order to implement support to SCSI/FC UI, it is necessary to retrieve node devices. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com&gt; --- src/kimchi/control/devices.py | 40 ++++++++++++++++++++++++++++++++++++++++ src/kimchi/control/host.py | 3 +++ src/kimchi/model.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 src/kimchi/control/devices.py diff --git a/src/kimchi/control/devices.py b/src/kimchi/control/devices.py new file mode 100644 index 0000000..d5ef8fe --- /dev/null +++ b/src/kimchi/control/devices.py @@ -0,0 +1,40 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# Authors: +# Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com&gt; +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +from kimchi.control.base import Collection, Resource + + +class Devices(Collection): + def __init__(self, model): + super(Devices, self).__init__(model) + self.resource = Device + + +class Device(Resource): + def __init__(self, model, id): + super(Device, self).__init__(model, id) + + @property + def data(self): + return self.info + diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index 9b19577..82c8c13 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -24,6 +24,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA from kimchi.control.base import Collection, Resource +from kimchi.control.devices import Devices class Host(Resource): @@ -36,6 +37,8 @@ class Host(Resource): self.stats.exposed = True self.partitions = Partitions(self.model) self.partitions.exposed = True + self.devices = Devices(self.model) + self.devices.exposed = True @property def data(self): diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 552f69d..4a5f344 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -361,6 +361,34 @@ class Model(object): self.stats[vm_uuid].update({'disk_io': rate, 'max_disk_io': max_disk_io, 'diskRdKB': diskRdKB, 'diskWrKB': diskWrKB}) + def device_lookup(self, nodedev_name): + return {'name': nodedev_name} + + def devices_get_list(self, _cap=None): + conn = self.conn.get() + if _cap == None: + dev_names = [name.name() for name in conn.listAllDevices(0)] + elif _cap == 'fc_host': + dev_names = self._get_devices_fc_host() + else: + # Get devices with required capability + dev_names = conn.listDevices(_cap,0) + return dev_names + + def _get_devices_fc_host(self): + conn = self.conn.get() + # Libvirt < 1.0.5 does not support fc_host capability + if is_libvirt_version_lesser('1.0.5'): + ret = [] + scsi_hosts = conn.listDevices('scsi_host',0) + for host in scsi_hosts: + xml = conn.nodeDeviceLookupByName(host).XMLDesc(0) + path = '/device/capability/capability/@type' + if 'fc_host' in xmlutils.xpath_get_text(xml, path): + ret.append(host) + return ret + return conn.listDevices('fc_host',0) + def debugreport_lookup(self, name): path = config.get_debugreports_path() file_pattern = os.path.join(path, name) -- 1.8.4.2

On 01/25/2014 09:37 PM, Aline Manera wrote: My understanding is that the "else" code is not necessary because if the libvirt version is equal or higher than 1.0.5 then the "conn.listDevices(..)" call does all the job.

This patch modifies the storagepool add user interface in order to show all Fibre Channel scsi hosts found in the host system and let user to create a pool attached to this host (the LUNs will be the volumes). A second option to use and enable FC storages is when a LUN is assigned as a pool of FS type, hosting guest images. This second option will be implement in the future. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com&gt; --- ui/js/src/kimchi.api.js | 11 +++++++++ ui/js/src/kimchi.storagepool_add_main.js | 40 +++++++++++++++++++++++++++++++- ui/pages/i18n.html.tmpl | 1 + ui/pages/storagepool-add.html.tmpl | 12 ++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 63ddd88..66fc41e 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -731,5 +731,16 @@ var kimchi = { success : suc, error : err }); + }, + + listFCHosts : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/devices?_cap=fc_host', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); } }; diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index e5922b3..8331076 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -40,7 +40,21 @@ kimchi.initStorageAddPage = function() { label : "iSCSI", value : "iscsi" } ]; - kimchi.listHostPartitions(function(data) { + kimchi.listFCHosts(function(data){ + if (data.length > 0) { + options.push( { + label : "SCSI Fibre Channel", + value : "scsi" + }); + } + var scsiFCHtml = $('#scsiFCTmpl').html(); + var scsiFCHostListHtml = ''; + $.each(data, function(index, value) { + scsiFCHostListHtml += kimchi.template(scsiFCHtml, value); + }); + $('.scsifc-hosts').html(scsiFCHostListHtml); + + kimchi.listHostPartitions(function(data) { if (data.length > 0) { options.push({ label : "LOGICAL", @@ -107,21 +121,31 @@ kimchi.initStorageAddPage = function() { $('.logical-section').addClass('tmpl-html'); $('.nfs-section').addClass('tmpl-html'); $('.iscsi-section').addClass('tmpl-html'); + $('.scsifc-section').addClass('tmpl-html'); } else if ($(this).val() === 'netfs') { $('.path-section').addClass('tmpl-html'); $('.logical-section').addClass('tmpl-html'); $('.nfs-section').removeClass('tmpl-html'); $('.iscsi-section').addClass('tmpl-html'); + $('.scsifc-section').addClass('tmpl-html'); } else if ($(this).val() === 'iscsi') { $('.path-section').addClass('tmpl-html'); $('.logical-section').addClass('tmpl-html'); $('.nfs-section').addClass('tmpl-html'); $('.iscsi-section').removeClass('tmpl-html'); + $('.scsifc-section').addClass('tmpl-html'); + } else if ($(this).val() === 'scsi') { + $('.path-section').addClass('tmpl-html'); + $('.logical-section').addClass('tmpl-html'); + $('.nfs-section').addClass('tmpl-html'); + $('.iscsi-section').addClass('tmpl-html'); + $('.scsifc-section').removeClass('tmpl-html'); } else if ($(this).val() === 'logical') { $('.path-section').addClass('tmpl-html'); $('.logical-section').removeClass('tmpl-html'); $('.nfs-section').addClass('tmpl-html'); $('.iscsi-section').addClass('tmpl-html'); + $('.scsifc-section').addClass('tmpl-html'); } }); $('#authId').click(function() { @@ -134,6 +158,7 @@ kimchi.initStorageAddPage = function() { $('#iscsiportId').keyup(function(event) { $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); }); + }); }); }; @@ -154,6 +179,8 @@ kimchi.validateForm = function() { return kimchi.validateNfsForm(); } else if (poolType === "iscsi") { return kimchi.validateIscsiForm(); + } else if (poolType === "scsi") { + return kimchi.validateScsiFCForm(); } else if (poolType === "logical") { return kimchi.validateLogicalForm(); } else { @@ -204,6 +231,15 @@ kimchi.validateIscsiForm = function() { return true; }; +kimchi.validateScsiFCForm = function() { + var fcHost = $('input:radio[name=adapter_name]:checked').val(); + if (fcHost === undefined) { + kimchi.message.error(i18n['msg.validate.pool.edit.scsifchost']); + return false; + } + return true; +}; + kimchi.validateServer = function(serverField) { if ('' === serverField) { kimchi.message.error(i18n['msg.pool.edit.server.blank']); @@ -248,6 +284,8 @@ kimchi.addPool = function(event) { source.path = $('#nfspathId').val(); source.host = $('#nfsserverId').val(); formData.source = source; + } else if (poolType === 'scsi'){ + formData.adapter_type = 'fc_host'; } else if (poolType === 'iscsi') { var source = {}; source.target = $('#iscsiTargetId').val(); diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index d63d4e9..0d6550f 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -100,6 +100,7 @@ var i18n = { 'msg.validate.pool.edit.path':"$_("This is not a real linux path.")", 'msg.validate.pool.edit.nfspath':"$_("Invalid nfs mount path.")", 'msg.validate.pool.edit.logical.device':"$_("No logical device selected.")", + 'msg.validate.pool.edit.scsifchost':"$_("A Fibre Channel SCSI host must be selected.")", 'msg.kimchi.storage.pool.empty':"$_("This storage pool is empty.")", 'msg.kimchi.list.volume.fail':"$_("Failed to list the storage pool.")", 'msg.kimchi.storage.pool.not.active':"$_("The storage pool is not active now.")", diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 14ef23a..c8d4114 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -104,6 +104,12 @@ <div class="host-partition"></div> </section> </div> + <div class="scsifc-section tmpl-html"> + <section class="form-section"> + <h2>3. $_("Select SCSI Fibre Channel Host")</h2> + <div class="scsifc-hosts"></div> + </section> + </div> <div class="iscsi-section tmpl-html"> <section class="form-section"> <h2>3. $_("iSCSI Server")</h2> @@ -154,5 +160,11 @@ <label>{path}</label> </div> </script> + <script id="scsiFCTmpl" type="html/text"> + <div class="field"> + <input type="radio" value="{name}" name="adapter_name"> + <label>{name}</label> + </div> + </script> </body> </html> -- 1.8.4.2

On 01/25/2014 09:46 PM, Aline Manera wrote: This is not a JSON filter ... I am passing the capability parameter to the function. Please, review "devices_get_list" and "_get_devices_fc_host" from patch [4/7], I handle older libvirt in the latest function. I tried to expose through the API what libvirt is capable to do with "listAllDevices" and "listDevices(cap)" . The "listFCHosts" is a very very specific function for the UI.

On 01/30/2014 11:46 AM, Crístian Viana wrote: But thats the idea ... if no scsi fc_hosts are found, the UI shows nothing ACK - Thanks

If a user wants to create a VM using a SCSI Fibre Channel storagepool (where LUNs are the storagepool volumes), he can assign one of the LUNs as the new VM disk, passing the LUN name. This patch implements the backend of this feature. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com&gt; --- docs/API.md | 1 + src/kimchi/model.py | 8 +++++++- src/kimchi/vmtemplate.py | 14 +++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/docs/API.md b/docs/API.md index d00cdd5..af32ec8 100644 --- a/docs/API.md +++ b/docs/API.md @@ -55,6 +55,7 @@ the following general conventions: Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * volume *(optional)*: Fibre channel LUN name to be assigned as disk to VM ### Resource: Virtual Machine diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 4a5f344..5546c4f 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -682,7 +682,8 @@ class Model(object): xml = t.to_vm_xml(name, vm_uuid, libvirt_stream=libvirt_stream, qemu_stream_dns=self.qemu_stream_dns, - graphics=graphics) + graphics=graphics, + volume=params.get('volume')) try: dom = conn.defineXML(xml.encode('utf-8')) except libvirt.libvirtError as e: @@ -1567,6 +1568,11 @@ class LibvirtVMTemplate(VMTemplate): xml = pool.XMLDesc(0) return xmlutils.xpath_get_text(xml, "/pool/@type")[0] + def _get_volume_path(self, volume): + pool = self._storage_validate() + volxml = pool.storageVolLookupByName(volume).XMLDesc(0) + return xmlutils.xpath_get_text(volxml, "/volume/target/path")[0] + def _get_available_volumes(self): pool = self._storage_validate() vol_names = pool.listVolumes() diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index d6f807a..5bdaa67 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -181,7 +181,7 @@ class VMTemplate(object): graphics_xml = graphics_xml + spicevmc_xml return graphics_xml - def _get_scsi_disks_xml(self): + def _get_scsi_disks_xml(self, volume=None): ret = "" # Passthrough configuration disk_xml = """ @@ -193,7 +193,12 @@ class VMTemplate(object): if is_libvirt_version_lesser('1.0.5'): disk_xml = disk_xml.replace('volume','block') - luns = self._get_available_volumes() + # Get a list of available volumes or use which was passed + if volume == None: + luns = self._get_available_volumes() + else: + luns = [(self._get_volume_path(volume),)] + for i, disk in enumerate(self.info['disks']): index = disk.get('index', i) try: @@ -261,7 +266,7 @@ class VMTemplate(object): # SCSI FC disk are different if self._get_storage_type() == 'scsi': - params['disks'] = self._get_scsi_disks_xml() + params['disks'] = self._get_scsi_disks_xml(kwargs.get('volume')) else: params['disks'] = self._get_disks_xml(vm_uuid) @@ -330,3 +335,6 @@ class VMTemplate(object): def _get_available_volumes(self): return [] + + def _get_volume_path(self, volume): + return '' -- 1.8.4.2

On 01/25/2014 09:50 PM, Aline Manera wrote: Another design decision. I can assign a free LUN to the new VM (that is what we have agreed a long time ago) An error would be raised if no LUN are available.

On 01/23/2014 10:30 PM, Rodrigo Trujillo wrote: Is there a case the template info won't be available? It should be for scsi pools, right? We don't need to show anything for other pools I think we need to implement the UI, right? It will show a ugly window Some UI export can look into it? Rodrigo, if you want to do the UI go ahead but make it completely. Otherwise, remove this code and ask UI guys to do it.

On 01/28/2014 07:59 PM, Rodrigo Trujillo wrote: If the user uses the API directly it won't pass thought JS code, right?