- Kimchi-devel - oVirt List Archives

[PATCH v3 0/2] Remove nginx configuration on rpm -e
by Ramon Medeiros 20 Apr '15

20 Apr '15

Changes v3: Extend changes to suse v2: Remove only nginx conf. Let certificates on the machine Ramon Medeiros (2): Create empty files on rpm build Remove nginx conf on suse contrib/kimchi.spec.fedora.in | 5 +++++ contrib/kimchi.spec.suse.in | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) -- 1.8.3.1

2 3

[PATCH 1/2 V2] Set qcow2 as default disk format in new templates
by Rodrigo Trujillo 20 Apr '15

20 Apr '15

Users are allowed to provide disk format when creating a new Template. However this is optional. This option sets qcow2 as default disk format for every new Template created. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 3c31346..ede2541 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -33,7 +33,8 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), 'ppc64le': ('ppc64le')} -common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], +common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10, + 'format': 'qcow2'}], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} -- 2.1.0

2 4

[PATCH V2] Template: Assign 'raw' to disk format if pool is 'logical' or [i]scsi
by Rodrigo Trujillo 20 Apr '15

20 Apr '15

Kimchi always creates raw disk format to new vm disks if the storagepool is logical, iscsi or scsi. But, new templates where not using this logic and was possible, through API calls, to create a template with a SCSI storagepool and disk format vmdk, for instance. This patch fixes this issue and makes necessary change in one of the tests in order to avoid an error with _get_storage_type() and deactivated storagepools. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/model/templates.py | 4 ++-- src/kimchi/vmtemplate.py | 5 +++++ tests/test_template.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 6bc8aca..8a1820d 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -94,7 +94,7 @@ class TemplatesModel(object): # Creates the template class with necessary information # Checkings will be done while creating this class, so any exception # will be raised here - t = LibvirtVMTemplate(params, scan=True) + t = LibvirtVMTemplate(params, scan=True, conn=self.conn) name = params['name'] try: with self.objstore as session: @@ -231,8 +231,8 @@ class TemplateModel(object): class LibvirtVMTemplate(VMTemplate): def __init__(self, args, scan=False, conn=None): - VMTemplate.__init__(self, args, scan) self.conn = conn + VMTemplate.__init__(self, args, scan) def _storage_validate(self): pool_uri = self.info['storagepool'] diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 62772e5..3e4630d 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -75,6 +75,11 @@ class VMTemplate(object): args['graphics'] = graphics self.info.update(args) + # Assign right disk format to logical and [i]scsi storagepools + if self._get_storage_type() in ['logical', 'iscsi', 'scsi']: + for i, disk in enumerate(self.info['disks']): + self.info['disks'][i]['format'] = 'raw' + def _get_os_info(self, args, scan): distro = version = 'unknown' diff --git a/tests/test_template.py b/tests/test_template.py index 23a24fb..acdb7c6 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -329,6 +329,8 @@ class TemplateTests(unittest.TestCase): pool = {'type': 'dir', 'name': 'dir-pool', 'path': '/tmp/dir-pool'} self.request('/storagepools', json.dumps(pool), 'POST') + pool_uri = '/storagepools/%s' % pool['name'].encode('utf-8') + self.request(pool_uri + '/activate', '{}', 'POST') # Create a template using the custom network and pool t = {'name': 'test', 'cdrom': '/tmp/mock.iso', -- 2.1.0

2 2

[PATCH V2] Fix disk format lock during VM creation
by Rodrigo Trujillo 20 Apr '15

20 Apr '15

Users are able to pass the disk format (qcow, raw, etc) in disk Template information. However, Kimchi is ignoring this information and always creating QCOW2 disk images (if the storagepool is not 'LOGICAL') when it creates a VM based on a given Template. This patch fixes this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index ec477dd..62772e5 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -193,7 +193,6 @@ class VMTemplate(object): def to_volume_list(self, vm_uuid): storage_path = self._get_storage_path() - fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' ret = [] for i, d in enumerate(self.info['disks']): index = d.get('index', i) @@ -201,11 +200,16 @@ class VMTemplate(object): info = {'name': volume, 'capacity': d['size'], - 'format': fmt, + 'format': d.get('format', 'qcow2'), 'path': '%s/%s' % (storage_path, volume)} + # Validate disk format + if self._get_storage_type() in ['logical'] and \ + info['format'] != 'raw': + info['format'] = 'raw' + if 'logical' == self._get_storage_type() or \ - fmt not in ['qcow2', 'raw']: + info['format'] not in ['qcow2', 'raw']: info['allocation'] = info['capacity'] else: info['allocation'] = 0 -- 2.1.0

2 2

[RFC]Puppet deployment for Kimchi
by Royce Lv 20 Apr '15

20 Apr '15

Hi, Kimchi's initial design concept is good out of box experience for users. With features added, we have some advanced feature which needs complex user set up (such as iscsi, nfs, ldap,peer discovery etc). This makes testing, concept model set up, configuration not easy for new users. To boost user experience, I would suggest to supply puppet script samples for these set ups.

2 2

[PATCH v4 0/7] Async Disk Creation
by Christy Perez 17 Apr '15

17 Apr '15

If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (7): Granular Task Queries: Backend Granular task query test updates Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates VMs Async Create: UI Translation update to add 'Creating' docs/API.md | 16 ++++++ po/de_DE.po | 103 ++++++++++++++++++++----------------- po/en_US.po | 83 +++++++++++++++++------------- po/es_ES.po | 102 +++++++++++++++++++----------------- po/fr_FR.po | 102 +++++++++++++++++++----------------- po/it_IT.po | 102 +++++++++++++++++++----------------- po/ja_JP.po | 102 +++++++++++++++++++----------------- po/kimchi.pot | 84 +++++++++++++++++------------- po/ko_KR.po | 102 +++++++++++++++++++----------------- po/pt_BR.po | 102 +++++++++++++++++++----------------- po/ru_RU.po | 102 +++++++++++++++++++----------------- po/zh_CN.po | 102 +++++++++++++++++++----------------- po/zh_TW.po | 102 +++++++++++++++++++----------------- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 +-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 12 +++-- src/kimchi/model/vms.py | 33 +++++++++--- src/kimchi/model/vmsnapshots.py | 5 +- tests/test_authorization.py | 23 +++++---- tests/test_mockmodel.py | 12 +++-- tests/test_model.py | 60 ++++++++++++++------- tests/test_model_storagevolume.py | 2 +- tests/test_rest.py | 77 ++++++++++++++++++++------- ui/css/theme-default/list.css | 18 +++++++ ui/js/src/kimchi.guest_main.js | 29 +++++++++-- ui/pages/guest.html.tmpl | 3 ++ 29 files changed, 886 insertions(+), 613 deletions(-) -- 2.1.0

1 8

[PATCH] Template: Assign 'raw' to disk format if pool is 'logical' or [i]scsi
by Rodrigo Trujillo 17 Apr '15

17 Apr '15

Kimchi always creates raw disk format to new vm disks if the storagepool is logical, iscsi or scsi. But, new templates where not using this logic and was possible, through API calls, to create a template with a SCSI storagepool and disk format vmdk, for instance. This patch fixes this issue. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/model/templates.py | 4 ++-- src/kimchi/vmtemplate.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 6bc8aca..8a1820d 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -94,7 +94,7 @@ class TemplatesModel(object): # Creates the template class with necessary information # Checkings will be done while creating this class, so any exception # will be raised here - t = LibvirtVMTemplate(params, scan=True) + t = LibvirtVMTemplate(params, scan=True, conn=self.conn) name = params['name'] try: with self.objstore as session: @@ -231,8 +231,8 @@ class TemplateModel(object): class LibvirtVMTemplate(VMTemplate): def __init__(self, args, scan=False, conn=None): - VMTemplate.__init__(self, args, scan) self.conn = conn + VMTemplate.__init__(self, args, scan) def _storage_validate(self): pool_uri = self.info['storagepool'] diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 62772e5..a309357 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -75,6 +75,11 @@ class VMTemplate(object): args['graphics'] = graphics self.info.update(args) + # Assign right disk format to logical and [i]scsi storagepools + if self._get_storage_type() in ['logical', 'iscsi', 'scsi']: + for i,disk in enumerate(self.info['disks']): + self.info['disks'][i]['format'] = 'raw' + def _get_os_info(self, args, scan): distro = version = 'unknown' -- 2.1.0

1 1

[PATCH] UI-Template Edit: Enable user to change disk format
by Rodrigo Trujillo 16 Apr '15

16 Apr '15

This patch adds a new field (Disk Format) in Storage tab in Template edit window. Users will then be allowed to select any disk format supported by Libvirt and Kimchi backend. The default disk format is qcow2 (first option), so, for compatibility, if the template register in objecstore does not contain the disk format information, the new field is going to set 'qcow2' automatically. For iscsi storagepools, the new field is going to be disabled and the format is going to be set automatically as 'raw', just like the backend behaves currently, avoiding errors. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 8 +++++-- ui/js/src/kimchi.template_edit_main.js | 40 +++++++++++++++++++++++++++++----- ui/pages/template-edit.html.tmpl | 16 ++++++++++++++ 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 7abee7c..ed9f02c 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -95,7 +95,7 @@ #edit-template-tabs .template-storage-cell{ display: inline-block; - width: 230px; + width: 180px; } #edit-template-tabs .template-storage-cell label { @@ -114,7 +114,11 @@ } #form-template-storage .template-tab-body .template-storage-name { - width: 220px; + width: 170px; +} + +#form-template-storage .template-tab-body .template-storage-disk-format { + width: 160px; } #edit-template-tabs .template-tab-body input[readonly] { diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 85f76cd..48ae26b 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -67,7 +67,7 @@ kimchi.template_edit_main = function() { $('.template-tab-body', '#form-template-storage').append(nodeStorage); var storageOptions = ''; var scsiOptions = ''; - $('select', '#form-template-storage').find('option').remove(); + $('select:first', '#form-template-storage').find('option').remove(); $.each(result, function(index, storageEntities) { if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso')) { if(storageEntities.type === 'iscsi' || storageEntities.type === 'scsi') { @@ -77,7 +77,7 @@ kimchi.template_edit_main = function() { var isSlected = tmpPath === thisName ? ' selected' : ''; scsiOptions += '<option' + isSlected + '>' + tmpPath + '</option>'; }); - $('select', '#form-template-storage').append(scsiOptions); + $('select:first', '#form-template-storage').append(scsiOptions); }, function() {}); } else { var isSlected = storageEntities.name === thisName ? ' selected' : ''; @@ -85,8 +85,20 @@ kimchi.template_edit_main = function() { } } }); - $('select', '#form-template-storage').append(storageOptions); - $('select', '#form-template-storage').change(function() { + $('select:first', '#form-template-storage').append(storageOptions); + + // Set disk format + $('select:last option', '#form-template-storage').each(function() { + if ($(this).text() == storageData.storageDiskFormat) { + $(this).prop('selected', true); + } + }); + + $('select:last', '#form-template-storage').change(function() { + $('.template-storage-disk-format').val($(this).val()); + }); + + $('select:first', '#form-template-storage').change(function() { var selectedItem = $(this).parent().parent(); var tempStorageNameFull = $(this).val(); var tempName = tempStorageNameFull.split('/'); @@ -99,9 +111,19 @@ kimchi.template_edit_main = function() { kimchi.getStoragePoolVolume(tempStorageName, tempName[tempName.length-1], function(info) { volSize = info.capacity / Math.pow(1024, 3); $('.template-storage-disk', selectedItem).attr('readonly', true).val(volSize); + $('select:last option', selectedItem).each(function() { + this.selected = (this.text == 'raw'); + }); + $('select:last', selectedItem).prop('disabled', true).change(); }); } else { $('.template-storage-disk', selectedItem).attr('readonly', false); + if ($('select:last', selectedItem).prop('disabled') == true) { + $('select:last option', selectedItem).each(function() { + this.selected = (this.text == 'qcow2'); + }); + $('select:last', selectedItem).prop('disabled', false).change(); + } } }); }); @@ -120,7 +142,8 @@ kimchi.template_edit_main = function() { editMode : 'hide', storageName : defaultPool, storageType : defaultType, - storageDisk : diskEntities.size + storageDisk : diskEntities.size, + storageDiskFormat : diskEntities.format ? diskEntities.format : 'qcow2' } if (diskEntities.volume) { @@ -131,6 +154,10 @@ kimchi.template_edit_main = function() { nodeData.storageDisk = volSize; addStorageItem(nodeData); $('.template-storage-disk').attr('readonly', true); + $('select:last option', '#form-template-storage').each(function() { + this.selected = (this.text == 'raw'); + }); + $('select:last', '#form-template-storage').prop('disabled', true).change(); }); } else { addStorageItem(storageNodeData); @@ -271,7 +298,8 @@ kimchi.template_edit_main = function() { origDisks[0]['volume'] && delete origDisks[0]['volume']; origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); } - data[field] = origDisks; + origDisks[0].format = $('.template-storage-disk-format', tmpItem).val(); + data[field] = origDisks; } else if (field == 'graphics') { var type = $('#form-template-general [name="' + field + '"]').val(); diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index c7832c9..e64a30f 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -104,6 +104,7 @@ <span class="template-storage-cell">$_("Storage Pool")</span> <span class="template-storage-cell">$_("Type")</span> <span class="template-storage-cell">$_("Disk(GB)")</span> + <span class="template-storage-cell">$_("Disk Format")</span> <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> <div class="template-tab-body"> @@ -160,6 +161,21 @@ <span class="template-storage-cell"> <input class="template-storage-disk" value={storageDisk} type="text" /> </span> + <span class="template-storage-cell"> + <input class="template-storage-disk-format" value={storageDiskFormat} type="text" style="display:none" /> + <select> + <option>qcow2</option> + <option>raw</option> + <option>bochs</option> + <option>cloop</option> + <option>cow</option> + <option>dmg</option> + <option>qcow</option> + <option>qed</option> + <option>vmdk</option> + <option>vpc</option> + </select> + </span> </div> </script> <script id="template-interface-tmpl" type="text/html"> -- 2.1.0

2 2

[PATCH] Set qcow2 as default disk format in new templates
by Rodrigo Trujillo 16 Apr '15

16 Apr '15

Users are allowed to provide disk format when creating a new Template. However this is optional. This option sets qcow2 as default disk format for every new Template created. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 3c31346..ede2541 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -33,7 +33,8 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), 'ppc64le': ('ppc64le')} -common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], +common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10, + 'format': 'qcow2'}], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} -- 2.1.0

2 2

[PATCH 0/2] Objectstore and server tests
by Aline Manera 16 Apr '15

16 Apr '15

On way to complete the tests refactoring, I am sending 2 patches: one related to objectstore tests and other one about server tests. Aline Manera (2): Object store tests Server tests tests/test_mockmodel.py | 35 ------ tests/test_model.py | 71 ------------ tests/test_objectstore.py | 96 ++++++++++++++++ tests/test_rest.py | 176 ----------------------------- tests/test_server.py | 274 +++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 356 insertions(+), 296 deletions(-) create mode 100644 tests/test_objectstore.py -- 2.1.0

2 4