- Kimchi-devel - oVirt List Archives

[PATCH] fix lock for apt package manager
by lvroyce＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested with: 1.Model test update/add/remove repositories. 2.UI test. Global lock is acquired for kimchi to update/add/remove and list package informations. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 50 ++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 1c74f04..98fc3de 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -310,6 +310,7 @@ class AptRepo(object): getattr(__import__('apt_pkg'), 'init_config')() getattr(__import__('apt_pkg'), 'init_system')() config = getattr(__import__('apt_pkg'), 'config') + self.pkg_lock = getattr(__import__('apt_pkg'), 'SystemLock') module = __import__('aptsources.sourceslist', globals(), locals(), ['SourcesList'], -1) @@ -322,6 +323,16 @@ class AptRepo(object): fd.write("# This file is managed by Kimchi and it must not " "be modified manually\n") + def _get_repos(self): + try: + with self.pkg_lock(): + repos = self._sourceslist() + repos.refresh() + except Exception, e: + raise OperationFailed('KCHREPOS0025E', {'err': e.message}) + + return repos + def _get_repo_id(self, repo): data = urlparse.urlparse(repo.uri) name = data.hostname or data.path @@ -329,8 +340,7 @@ class AptRepo(object): def _get_source_entry(self, repo_id): kimchiLock.acquire() - repos = self._sourceslist() - repos.refresh() + repos = self._get_repos() kimchiLock.release() for r in repos: @@ -354,8 +364,7 @@ class AptRepo(object): _get_repo_id() """ kimchiLock.acquire() - repos = self._sourceslist() - repos.refresh() + repos = self._get_repos() kimchiLock.release() res = [] @@ -400,12 +409,15 @@ class AptRepo(object): dist = config['dist'] comps = config.get('comps', []) - kimchiLock.acquire() - repos = self._sourceslist() - repos.refresh() - source_entry = repos.add('deb', uri, dist, comps, file=self.filename) - repos.save() - kimchiLock.release() + with kimchiLock: + try: + repos = self._get_repos() + source_entry = repos.add('deb', uri, dist, comps, file=self.filename) + with self.pkg_lock(): + repos.save() + except Exception as e: + raise OperationFailed("KCHREPOS0026E", {'err': e.message}) + return self._get_repo_id(source_entry) @@ -430,11 +442,11 @@ class AptRepo(object): kimchiLock.acquire() try: - repos = self._sourceslist() - repos.refresh() - repos.remove(r) - repos.add(line, r.uri, r.dist, r.comps, file=self.filename) - repos.save() + repos = self._get_repos() + with self.pkg_lock(): + repos.remove(r) + repos.add(line, r.uri, r.dist, r.comps, file=self.filename) + repos.save() except: if enable: raise OperationFailed("KCHREPOS0020E", {'repo_id': repo_id}) @@ -476,10 +488,10 @@ class AptRepo(object): kimchiLock.acquire() try: - repos = self._sourceslist() - repos.refresh() - repos.remove(r) - repos.save() + repos = self._get_repos() + with self.pkg_lock(): + repos.remove(r) + repos.save() except: raise OperationFailed("KCHREPOS0017E", {'repo_id': repo_id}) finally: -- 1.8.3.2

2 3

[PATCH 0/2] Fixes for apt swupdate
by lvroyce＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: Ubuntu 13.10 Royce Lv (2): Fix swupdate listing Add lock in swupdate src/kimchi/swupdate.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 1.8.3.2

2 3

[PATCH] Sort device paths shown when creating a logical storage pool
by Rodrigo Trujillo 26 Mar '14

26 Mar '14

This path sorts the output list of devices by their paths, improving the user experience. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 10833be..97a30d1 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -26,6 +26,7 @@ kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { var deviceHtml = $('#partitionTmpl').html(); + data.sort(function (a, b){return a.path.localeCompare(b.path)}); var listHtml = ''; $.each(data, function(index, value) { if (value.type === 'part' || value.type === 'disk') { -- 1.8.5.3

2 1

[PATCH 0/3] create a VM from an iscsi pool template
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> This patch just support create vm on iscsi lun. Now we have support iSCSI or SCSI pool. Here we want to create volumes for VM in those pools. The best way to do it is on template level - and not on vm level For if we create a template just assign a iSCSI or SCSI pool, the user still need to choose a volume for his VM. Also as we discussion, we do not mix disks from 2 different types of storage pools, for instance: we do not create a template with 2 disks, where one comes from a ISCSI pool and other is a .img in a DIR pool. ShaoHe Feng (3): add a method to get iscsi storage pool auth information. generate a iscsi volume disk for a guest create a VM from an iscsi pool template. src/kimchi/model/templates.py | 11 +++++++++++ src/kimchi/model/vms.py | 4 +++- src/kimchi/vmtemplate.py | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 2 deletions(-) -- 1.8.5.3

2 5

[PATCH V2 0/3] create a VM from an iscsi pool template
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2: address aline's comment. storage_type = self._get_storage_type() if storage_type == 'iscsi': .... elif storage_type == 'scsi': This patch just support create vm on iscsi lun. Now we have support iSCSI or SCSI pool. Here we want to create volumes for VM in those pools. The best way to do it is on template level - and not on vm level For if we create a template just assign a iSCSI or SCSI pool, the user still need to choose a volume for his VM. Also as we discussion, we do not mix disks from 2 different types of storage pools, for instance: we do not create a template with 2 disks, where one comes from a ISCSI pool and other is a .img in a DIR pool. ShaoHe Feng (3): add a method to get iscsi storage pool auth information. generate a iscsi volume disk for a guest create a VM from an iscsi pool template. src/kimchi/model/templates.py | 11 +++++++++++ src/kimchi/model/vms.py | 4 +++- src/kimchi/vmtemplate.py | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 2 deletions(-) -- 1.8.5.3

2 5

[PATCH] create a VM from an scsi pool template
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> support to create a VM from a scsi pool template. >From the libvirt document: we can create a lun disk for vm by two format: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='scsi-pool' volume='unit:0:0:0' /> <target dev='vda' bus='virtio'/> </disk> and <disk type='block' device='lun'> <driver name='qemu' type='raw' cache='none'/> <source dev='/dev/disk'/> <target dev='sda' bus='scsi'/> </disk> The later, VM disk is "block" and the device "lun", except that generic SCSI commands from the guest are accepted and passed through to the physical device, and this will only be recognized for actual raw devices. This is high performance than the former. But later, disk device='lun' is only valid for block type disk source. It does not support a volume from a pool formate like: <source pool='scsi-pool' volume='unit:0:0:0' /> So I assign the disk source is block instead of volume from a pool in both passthrough or non-passthrough. 1. how to test this patch: create a scsi pool named "my-scsi" by virsh 2.get the volumes name of this pool: $ sudo virsh vol-list my-scsi Name Path ----------------------------------------- unit:0:0:0 /dev/disk/by-id/wwn-0x60014056aefaef96d4e4033953d9627d 3. create a template with this pool like this: $ curl -u <user> -H "Content-Type: application/json" \ -H "Accept: application/json" \ http://localhost:8000/templates/ -X POST -d ' { "cpus": 1, "cdrom":"/home/shhfeng/iso/f17.iso", "name":"F17-SCSI", "storagepool":"/storagepools/my-scsi", "disks":[ { "index":0, "volume":"unit:0:0:0" } ] }' 4. create a VM with this template and start it. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 2 +- src/kimchi/vmtemplate.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 483b9ae..ef1d617 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -184,7 +184,7 @@ class VMsModel(object): # If storagepool is SCSI, volumes will be LUNs and must be passed by # the user from UI or manually. vol_list = [] - if t._get_storage_type() == "iscsi": + if t._get_storage_type() in ["iscsi", "scsi"]: vol_list = [] elif t._get_storage_type() in READONLY_POOL_TYPE: if not params.get('volumes'): diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4ecba6e..e753ec2 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -181,7 +181,10 @@ class VMTemplate(object): graphics_xml = graphics_xml + spicevmc_xml return graphics_xml - def _get_scsi_disks_xml(self, luns): + def _get_scsi_disks_xml(self): + luns = [disk['volume'] for disk in self.info.get('disks', {}) + if 'volume' in disk] + ret = "" # Passthrough configuration disk_xml = """ @@ -193,8 +196,10 @@ class VMTemplate(object): if not self.fc_host_support: disk_xml = disk_xml.replace('volume','block') + pool = self._storage_validate() # Creating disk xml for each lun passed - for index,(lun, path) in enumerate(luns): + for index, lun in enumerate(luns): + path = pool.storageVolLookupByName(lun).path() dev = "sd%s" % string.lowercase[index] params = {'src': path, 'dev': dev} ret = ret + disk_xml % params @@ -309,7 +314,7 @@ class VMTemplate(object): if storage_type == "iscsi": params['disks'] = self._get_iscsi_disks_xml() elif storage_type == "scsi": - params['disks'] = self._get_scsi_disks_xml(kwargs.get('volumes')) + params['disks'] = self._get_scsi_disks_xml() else: params['disks'] = self._get_disks_xml(vm_uuid) -- 1.8.5.3

2 2

[PATCH] UI: template edit page support scsi lun
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> User can choose a volume of scsi/iscsi pool from the template edit page. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 38 +++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 58f4506..b7d6cb6 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -32,19 +32,39 @@ kimchi.template_edit_main = function() { $('input[name="disks"]').val(disks[0].size); var options = [{label: 'VNC', value: 'vnc'}, {label: 'Spice', value: 'spice'}]; kimchi.select('template-edit-graphics-list', options); + var scsipools = {}; kimchi.listStoragePools(function(result) { var options = []; if (result && result.length) { $.each(result, function(index, storagePool) { if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); + if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ + scsipools[storagePool.name] = []; + kimchi.listStorageVolumes(storagePool.name, function(result) { + if (result && result.length) { + $.each(result, function(index, storageVolume) { + options.push({ + label: storagePool.name + '/' + storageVolume.name, + value: '/storagepools/' + storagePool.name + '/' + storageVolume.name + }); + scsipools[storagePool.name].push(storageVolume) + }); + } + kimchi.select('template-edit-storagePool-list', options); + }); + } + else { + options.push({ + label: storagePool.name, + value: '/storagepools/' + storagePool.name + }); + } } }); } - kimchi.select('template-edit-storagePool-list', options); + if ($.isEmptyObject(scsipools)) { + kimchi.select('template-edit-storagePool-list', options); + } }); kimchi.listNetworks(function(result) { if(result && result.length > 0) { @@ -91,6 +111,14 @@ kimchi.template_edit_main = function() { }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); + storagepool = data['storagepool']; + storageArray = storagepool.split("/"); + if (storageArray.length > 3){ + /* Support only 1 disk at this moment */ + delete data["disks"][0].size; + data["disks"][0].volume = storageArray.pop(); + data['storagepool'] = storageArray.join("/"); + } var networks = templateEditForm.serializeObject().networks; if (networks instanceof Array) { data.networks = networks; -- 1.8.5.3

2 2

[PATCH] Help for scsi fibre channel
by Kersten Richter 26 Mar '14

26 Mar '14

Added help for scsi fibre channel on storage page. Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/storage.dita | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/pages/help/storage.dita b/ui/pages/help/storage.dita index 97ee0cc..284eabb 100644 --- a/ui/pages/help/storage.dita +++ b/ui/pages/help/storage.dita @@ -65,7 +65,7 @@ the following:<dl><dlentry> <li>In the <uicontrol>Storage pool name</uicontrol> field, type the name to be used to identify the storage pool.</li> <li>In the <uicontrol>Storage pool type</uicontrol> list, select the -type: <dl rev="rev1"><dlentry> +type: <dl><dlentry> <dt><uicontrol>DIR</uicontrol></dt> <dd>Specifies a directory pool. When selecting <uicontrol>DIR</uicontrol>, type the <uicontrol>Storage path</uicontrol> (file path to the storage @@ -85,10 +85,14 @@ the iSCSI server. You can optionally select to add iSCSI authentication.</dd> <dt><uicontrol>Logical</uicontrol></dt> <dd>Specifies a logical volume storage pool. Select the location to the device in <uicontrol>Device path</uicontrol>.</dd> -</dlentry></dl><?Pub Caret 591?></li> +</dlentry><dlentry> +<dt><uicontrol>SCSI Fibre Channel</uicontrol></dt> +<dd>Specifies a pool based on an SCSI Fibre Channel. Select which +SCSI adapter to use.</dd> +</dlentry></dl><?Pub Caret 0?></li> <li>Click <uicontrol>Create</uicontrol>.</li> </ol> </csbody> </cshelp> </cshelp> -<?Pub *0000003764?> +<?Pub *0000003914?> -- 1.7.1

2 2

[V2 0/2] Fibre Channel SCSI Storage Pool UI
by huoyuxin＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> V1 - V2: Address comments of Message Id, menu width Yu Xin Huo (2): Fibre Channel SCSI Storage Pool UI Add translation for FC SCSI Storage Pool po/en_US.po | 6 +++++ po/kimchi.pot | 6 +++++ po/pt_BR.po | 6 +++++ po/zh_CN.po | 6 +++++ ui/css/theme-default/storage.css | 2 +- ui/js/src/kimchi.api.js | 14 +++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 31 ++++++++++++++++++++++++++++- ui/pages/i18n.html.tmpl | 2 +- ui/pages/storagepool-add.html.tmpl | 12 +++++++++++ 9 files changed, 81 insertions(+), 4 deletions(-)

2 4

[PATCH] Fix for repositories help
by Kersten Richter 26 Mar '14

26 Mar '14

Edited file host.dita Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/host.dita | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ui/pages/help/host.dita b/ui/pages/help/host.dita index 9f42575..cd693b3 100644 --- a/ui/pages/help/host.dita +++ b/ui/pages/help/host.dita @@ -43,9 +43,14 @@ All</uicontrol>. You cannot select individual packages for updates.</dd> <dd>This section displays repositories that are associated with the host system. You can add, enable, edit, or remove repositories. Adding a repository associates it with the host system while enabling a repository -allows the host to access it. You can add <filepath>yum</filepath> repositories -and <filepath>deb</filepath> repositories. You may not be able to -add a <uicontrol>GPG Check</uicontrol> to all types of repositories.</dd> +allows the host to access it. If your system is Red Hat Enterprise +Linux or Fedora, you can add <filepath>yum</filepath> repositories. +If your system is Ubuntu or Debian, then add <filepath>deb</filepath> repositories.If +you are working with yum repositories, you can add a GPG check to +verify that a package from this repository have not been corrupted. +Select a repository and then <uicontrol>Edit</uicontrol>. Select <uicontrol>Yes</uicontrol> to +enable GPG Check and then enter a URL to the GPG key file for the +repository.<?Pub Caret 156?></dd> </dlentry><dlentry> <dt>Debug reports</dt> <dd>This section displays debug reports, including name and file path. @@ -58,8 +63,8 @@ configuration and diagnostic information, such as the running kernel version, loaded modules, and system and service configuration files. The command also runs external programs to collect further information and stores this output in the resulting archive. </dd> -</dlentry></dl><?Pub Caret 901?> +</dlentry></dl> </csbody> <?tm 1392659967 1?> </cshelp> -<?Pub *0000003172?> +<?Pub *0000003492?> -- 1.7.1

2 2