- Kimchi-devel - oVirt List Archives

About the author information in Kimchi source code
by Shu Ming 04 Mar '14

04 Mar '14

Hi, As you have seen, we have author information in Kimchi source code to specially honour the writer of the original source files and the succeeding writers with substantial change. Unfortunately, I found the authors in some files were updated without any substantial change. One recent example about this is "src/kimchi/model/debugreports.py", the author was changed to "Aline Manera" and the original author was gone. And this change was introduced by "refactor model: Create a separated model for debug report resource" that got a new file "debugreports.py" split from another huge file without much change. I don't think this split was deserved to change the author in the new file. Then, how do we define what is "substantial change". I would say it is a new feature changing the file with more than 1/3 of the total lines of code. It is a not necessary a hard rule, but it is obvious that code split should not be deserved to have a new author for the file.

6 5

[PATCH v2 0/2] Github bug #307: Add storage pool list
by Daniel Barboza 03 Mar '14

03 Mar '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Changelog: v2: - Fixing message ID These patches fixes the bug where the list of storage pool types can take a long time to appear. The solution used here is to detach the view of such list with the return of the JSON that loads the partition data. To test this patch I recomend doing the following change in src/kimchi/model/hosts.py: + import time class PartitionsModel(object): def __init__(self, **kargs): pass def get_list(self): + time.sleep(10) result = disks.get_partitions_names() return result The sleep(10) call will ensure that get_list (which returns the partition data) will take at least 10 seconds to execute. It is enough time to select the LOGICAL type and see how the UI is working before and after the JSON call. Daniel Henrique Barboza (2): Github bug #307: add storage pool type list - JS changes Github bug #307: storage pool type list - html and string changes po/en_US.po | 21 +++- po/kimchi.pot | 20 +++- po/pt_BR.po | 21 +++- po/zh_CN.po | 21 +++- ui/js/src/kimchi.storagepool_add_main.js | 177 ++++++++++++++++--------------- ui/pages/i18n.html.tmpl | 5 +- ui/pages/storagepool-add.html.tmpl | 7 +- 7 files changed, 177 insertions(+), 95 deletions(-) -- 1.8.3.1

4 6

[PATCH V2] UI: template support spice
by shaohef＠linux.vnet.ibm.com 03 Mar '14

03 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 Declare local variable to avoid overwriting the value outer scope unintentionally. ShaoHe Feng (1): UI: template support spice ui/js/src/kimchi.template_edit_main.js | 14 ++++++++++++-- ui/pages/template-edit.html.tmpl | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) -- 1.8.4.2

5 7

[PATCH] cherrpy does not encode the return of get_error_page from changeset 3591:35064e17ea5d. The 3591:35064e17ea5d is lower than 3.2.5 version (changeset 3677:052f32b1d563). And it is higher than 3.2.4 version (changeset 3497:cd8acbc5f2b3).
by shaohef＠linux.vnet.ibm.com 03 Mar '14

03 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> issue: https://github.com/kimchi-project/kimchi/issues/333 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/root.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/kimchi/root.py b/src/kimchi/root.py index 3956ea6..5bad9b4 100644 --- a/src/kimchi/root.py +++ b/src/kimchi/root.py @@ -22,6 +22,7 @@ import json import os +from distutils.version import LooseVersion from kimchi import auth from kimchi import template from kimchi.i18n import messages @@ -49,7 +50,8 @@ class Root(Resource): def error_production_handler(self, status, message, traceback, version): data = {'code': status, 'reason': message} res = template.render('error.html', data) - if type(res) is unicode: + if (type(res) is unicode and + LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): res = res.encode("utf-8") return res @@ -57,7 +59,8 @@ class Root(Resource): data = {'code': status, 'reason': message, 'call_stack': cherrypy._cperror.format_exc()} res = template.render('error.html', data) - if type(res) is unicode: + if (type(res) is unicode and + LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): res = res.encode("utf-8") return res -- 1.8.4.2

2 1

[PATCH] Fix debug report UI: Error handling and line selection
by Rodrigo Trujillo 03 Mar '14

03 Mar '14

If a user tries to delete a report and some error occurs, no message is showed in the UI. Also, after delete the report, all lines become unselected but remove and download buttons are enabled. So user is able to click on remove button again, but will not know which report is going to be deleted. This patch disables the buttons, so user have to select the report again to perform the operations, avoiding mistakes. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6e7f333..7974054 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -66,8 +66,13 @@ kimchi.host_main = function() { kimchi.deleteReport({ name: report['name'] }, function(result) { + $('#' + reportGridID + '-remove-button') + .prop('disabled', true); + $('#' + reportGridID + '-download-button') + .prop('disabled', true); listDebugReports(); }, function(error) { + kimchi.message.error(error.responseJSON.reason); }); }); } -- 1.8.5.3

2 1

[PATCH] issue #66: Auto generate template name in backend when none is provided
by Aline Manera 03 Mar '14

03 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The only required parameter to create a template is the cdrom ISO image. The name must be create automatically on backend when no one is passed. Fix it. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/mockmodel.py | 8 +++++++- src/kimchi/model/templates.py | 9 ++++++++- ui/js/src/kimchi.template_add_main.js | 16 ---------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 50b5f0e..f99b4cd 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -216,7 +216,13 @@ class MockModel(object): raise NotFoundError("KCHTMPL0002E", {'name': name}) def templates_create(self, params): - name = params['name'] + name = params.get('name', '').strip() + if not name: + iso = params['cdrom'] + iso_name = os.path.splitext(iso[iso.rfind('/') + 1:])[0] + name = iso_name + str(int(time.time()*1000)) + params['name'] = name + if name in self._mock_templates: raise InvalidOperation("KCHTMPL0001E", {'name': name}) diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 7afb0e0..3062bd7 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -19,6 +19,7 @@ import copy import os +import time import libvirt @@ -34,7 +35,13 @@ class TemplatesModel(object): self.conn = kargs['conn'] def create(self, params): - name = params['name'] + name = params.get('name', '').strip() + if not name: + iso = params['cdrom'] + iso_name = os.path.splitext(iso[iso.rfind('/') + 1:])[0] + name = iso_name + str(int(time.time()*1000)) + params['name'] = name + conn = self.conn.get() pool_uri = params.get(u'storagepool', '') diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 31326df..098a706 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -219,7 +219,6 @@ kimchi.template_add_main = function() { return; } var data = { - "name" : kimchi.get_iso_name(isoFile), "cdrom" : isoFile }; addTemplate(data); @@ -331,7 +330,6 @@ kimchi.template_add_main = function() { return; } var data = { - "name" : kimchi.get_iso_name(isoUrl), "cdrom" : isoUrl }; addTemplate(data); @@ -355,7 +353,6 @@ kimchi.template_add_main = function() { var successNum = 0; var addTemplate = function(isoInfo) { var data = { - "name" : kimchi.get_iso_name(isoInfo.name), "os_distro" : isoInfo.os_distro, "os_version" : isoInfo.os_version, "cdrom" : isoInfo.path @@ -419,16 +416,3 @@ kimchi.is_iso_file = function(isoFile) { } return false; }; - -kimchi.get_iso_name = function(isoPath) { - if ((isoPath.charAt(isoPath.length - 1) == "/") == true) { - isoPath = isoPath.substring(0, isoPath.length - 1) - } - if (/.iso$/.test(isoPath)) { - return isoPath.substring(isoPath.lastIndexOf("/") + 1, - isoPath.lastIndexOf(".")) + new Date().getTime(); - } else { - return isoPath.substring(isoPath.lastIndexOf("/") + 1) + - new Date().getTime(); - } -}; -- 1.7.10.4

3 3

[PATCH] bug fix: Only check for ISO images in active pools
by Aline Manera 03 Mar '14

03 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The wrong exception was expected while searching for ISO files in the storage pools. Independent of the exception raised it should not block users to create a template, so use the generic Exception to catch any error. Fix it to avoit the error below. Request Headers: COOKIE: kimchi=a50f5cb488c331754db1a642eaba89f7fe71c0b8; userid=alinefm HOST: localhost:8000 CONNECTION: keep-alive Remote-Addr: 127.0.0.1 ACCEPT: application/json, text/javascript, */*; q=0.01 USER-AGENT: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:27.0) Gecko/20100101 Firefox/27.0 X-REQUESTED-WITH: XMLHttpRequest ACCEPT-LANGUAGE: en-us,en;q=0.7,pt-br;q=0.3 Content-Type: application/json REFERER: http://localhost:8000/ ACCEPT-ENCODING: gzip, deflate [28/Feb/2014:12:27:50] HTTP Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/cherrypy/_cprequest.py", line 656, in respond response.body = self.handler() File "/usr/lib/python2.7/dist-packages/cherrypy/lib/encoding.py", line 188, in __call__ self.body = self.oldhandler(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/cherrypy/_cpdispatch.py", line 34, in __call__ return self.callable(*self.args, **self.kwargs) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 274, in index return self.get(filter_params) File "/home/alinefm/kimchi/src/kimchi/control/storagevolumes.py", line 71, in get res_list = get_list(*self.model_args) File "/home/alinefm/kimchi/src/kimchi/model/storagevolumes.py", line 170, in get_list pool.refresh(0) File "/home/alinefm/kimchi/src/kimchi/model/libvirtconnection.py", line 62, in wrapper ret = f(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/libvirt.py", line 2220, in refresh if ret == -1: raise libvirtError ('virStoragePoolRefresh() failed', pool=self) libvirtError: Requested operation is not valid: storage pool is not active Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/storagevolumes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 8defdb7..3e21268 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -169,7 +169,7 @@ class IsoVolumesModel(object): pool = StoragePoolModel.get_storagepool(pool_name, self.conn) pool.refresh(0) volumes = pool.listVolumes() - except InvalidOperation: + except Exception: # Skip inactive pools continue -- 1.7.10.4

3 4

[PATCH 0/2] bug fix: Do not probe ISO file while checking template integrity
by Aline Manera 03 Mar '14

03 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): vmtemplate: Remove useless imports bug fix: Do not probe ISO file while checking template integrity src/kimchi/vmtemplate.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 1.7.10.4

3 6

[PATCH 0/2] bug fix: Enable NFS path field when a NFS server is provided
by Aline Manera 03 Mar '14

03 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): bug fix: Enable NFS path field when a NFS server is provided Fix typo on KCHAPI6005E message po/en_US.po | 24 ++++++++++++++++++++++-- po/kimchi.pot | 24 ++++++++++++++++++++++-- po/pt_BR.po | 24 ++++++++++++++++++++++-- po/zh_CN.po | 24 ++++++++++++++++++++++-- ui/js/src/kimchi.storagepool_add_main.js | 2 +- ui/pages/i18n.html.tmpl | 2 +- 6 files changed, 90 insertions(+), 10 deletions(-) -- 1.7.10.4

4 8

[PATCH] Fix software update action into Host resource
by Paulo Vital 03 Mar '14

03 Mar '14

Previous change on how to handle the update packages action forgot to add some necessary parameters to work in UI. Whitout this patch no action will be exectued when clicking on "Update All" buttons from Hongliang Wang's patch: "UI: Software Update Support". Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index d0d2190..a7db7c9 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -44,6 +44,8 @@ HOST_STATS_INTERVAL = 1 class HostModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] + self.objstore = kargs['objstore'] + self.task = TaskModel(**kargs) self.host_info = self._get_host_info() def _get_host_info(self): -- 1.8.3.1

3 2