- Kimchi-devel - oVirt List Archives

[PATCH ] Show error message if debug report generation errors.
by Leonardo Garcia 25 Mar '14

25 Mar '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> If the process of generating a debug report in Kimchi fails while it was executing (e.g. due to running out of disk space to generate the report), the error message was not being shown in the Kimchi UI. Basically src/kimchi/control/tasks.py was putting the error message in a JSON field called message, while the UI was looking for the error message in a field called reason. Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> --- ui/js/src/kimchi.report_add_main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 15cc76b..3248e2f 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -23,11 +23,11 @@ kimchi.report_add_main = function() { result: result }); }, function(result) { - if (result['reason']) { - var errText = result['reason']; + if (result['message']) { + var errText = result['message']; } else { - var errText = result['responseJSON']['reason']; + var errText = result['responseJSON']['message']; } result && kimchi.message.error(errText) submitButton -- 1.8.5.3

3 2

[PATCH 0/2] Fixes on Update feature
by Aline Manera 25 Mar '14

25 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): bug fix: Display update progress on real time bug fix: Update progress area when an error occurs during update process src/kimchi/swupdate.py | 16 +++++++++++----- ui/js/src/kimchi.host.js | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) -- 1.7.10.4

3 6

[PATCH] bug fix: Allow user specifies the repository name when adding a new YUM repo
by Aline Manera 25 Mar '14

25 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The backend already supports the repo_name as an optional parameter while creating a new YUM repo but the jsonschema and docs are not consistent with that. Fix it. Also insert repo_name under "config" as it is YUM specific information. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- docs/API.md | 1 + src/kimchi/API.json | 5 +++++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 7 ++++--- src/kimchi/repositories.py | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/API.md b/docs/API.md index a380558..fed7f5e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -854,6 +854,7 @@ http://, ftp:// or file:// URL. * repo_id *(optional)*: Unique YUM repository ID * config: A dictionary that contains specific data according to repository type. + * repo_name *(optional)*: YUM Repository name * mirrorlist *(optional)*: Specifies a URL to a file containing a list of baseurls for YUM repository * dist: Distribution to DEB repository diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 9bde6a2..8ecd665 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -552,6 +552,11 @@ "error": "KCHREPOS0006E" } }, + "repo_name": { + "description": "YUM repository name", + "type": "string", + "error": "KCHREPOS0023E" + }, "mirrorlist": { "description": "URL to a file containing a list of baseurls", "type": "string", diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 1f84034..c084e21 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -248,4 +248,5 @@ messages = { "KCHREPOS0020E": _("Could not enable repository %(repo_id)s."), "KCHREPOS0021E": _("Could not disable repository %(repo_id)s."), "KCHREPOS0022E": _("YUM Repository ID already exists"), + "KCHREPOS0023E": _("YUM Repository name must be a string"), } diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 01480f4..b272933 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -1135,13 +1135,14 @@ class MockRepositories(object): def addRepository(self, params): # Create and enable the repository repo_id = params['repo_id'] + config = params.get('config', {}) repo = {'repo_id': repo_id, 'baseurl': params.get('baseurl'), 'enabled': True, - 'config': {'repo_name': params.get('repo_name', repo_id), - 'gpgkey': params.get('gpgkey', []), + 'config': {'repo_name': config.get('repo_name', repo_id), + 'gpgkey': config.get('gpgkey', []), 'gpgcheck': True, - 'mirrorlist': params.get('mirrorlist', "")} + 'mirrorlist': config.get('mirrorlist', "")} } self._repos[repo_id] = repo diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 39dde12..93603e8 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -174,7 +174,7 @@ class YumRepo(object): if repo_id in repos.repos.keys(): raise InvalidOperation("KCHREPOS0022E", {'repo_id': repo_id}) - repo_name = params.get('repo_name', None) + repo_name = config.get('repo_name', None) if repo_name is None: repo_name = repo_id -- 1.7.10.4

2 2

[PATCH V2] bug fix: Instantiate the apt-get manager when update the apt-get packages list
by Aline Manera 25 Mar '14

25 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> V1 - V2: - Follow Zhen Zhou suggestion I tested it on Ubuntu. Aline Manera (1): bug fix: Instantiate the apt-get manager when update the apt-get packages list src/kimchi/swupdate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.7.10.4

2 3

[PATCH V4 0/4] check the python code with pyflakes
by shaohef＠linux.vnet.ibm.com 25 Mar '14

25 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4 address Rodrigo's comment. add delete the cloned template in rollback. V2 -> V3 address zhengsheng's comment. improve the SKIP_PYFLAKES_ERR list. V1 -> V2 address Crístian'comment: remove the whole statement "info = self._get_vm(name).inf" address ming's comment: break down the patch into small patches by the pyflakes error. Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster. This is important to improve the code quality. ShaoHe Feng (4): make pyflakes happly, remove the unused import module make pyflakes happly, remove unused availables add template_delete to rollback after create a template run pyflakes when make check Makefile.am | 7 +++++++ configure.ac | 7 +++++++ contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + docs/README.md | 6 +++--- src/kimchi/control/plugins.py | 2 +- src/kimchi/featuretests.py | 2 -- src/kimchi/mockmodel.py | 5 ++--- src/kimchi/model/storagepools.py | 2 +- src/kimchi/screenshot.py | 1 - src/kimchi/template.py | 1 - tests/test_model.py | 2 ++ tests/test_server.py | 1 - ui/pages/help/gen-index.py | 1 - 14 files changed, 25 insertions(+), 14 deletions(-) -- 1.8.5.3

4 14

[PATCH v2] Issue#349: Software Update Grid Keeps Loading when Error Returns
by Hongliang Wang 25 Mar '14

25 Mar '14

Software update grid keeps loading on UI when server returns 500 error. Instead, we shall remove the loading UI and add a message UI to let the user know something is wrong, as well as add a button to allow the user retry. v1 -> v2: 2a) Made message more user-friendly and informative (Aline's comment) Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 20 +++++++++++++ ui/js/src/kimchi.api.js | 4 +-- ui/js/src/kimchi.grid.js | 66 +++++++++++++++++++++++++++++++++---------- ui/js/src/kimchi.host.js | 11 +++++++- ui/pages/i18n.html.tmpl | 5 ++++ 5 files changed, 87 insertions(+), 19 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 44ae614..684dd7b 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -239,3 +239,23 @@ height: 48px; width: 49px; } + +.grid-message { + background: white; + box-sizing: border-box; + bottom: 0; + left: 0; + overflow: auto; + padding: .2em .5em; + position: absolute; + right: 0; + z-index: 5; +} + +.grid-message-text { + line-height: 25px; +} + +.retry-button { + margin: 0 1em; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4310435..11f83df 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -838,10 +838,8 @@ var kimchi = { }, 200); break; case 'finished': - suc(result); - break; case 'failed': - err(result); + suc(result); break; default: break; diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 540f1ba..f35228d 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -62,6 +62,18 @@ kimchi.widget.Grid = function(params) { '</div>', '</div>', '</div>', + '<div class="grid-message hidden">', + '<div class="grid-message-text">', + i18n['KCHGRD6002M'], + '<button class="retry-button btn-small">', + i18n['KCHGRD6003M'], + '</button>', + '</div>', + '<div class="detailed-title">', + i18n['KCHGRD6004M'], + '</div>', + '<div class="detailed-text"></div>', + '</div>', '</div>' ]; @@ -161,6 +173,9 @@ kimchi.widget.Grid = function(params) { var maskNode = $('.grid-mask', gridNode); maskNode.css('top', captionHeight + 'px'); + var messageNode = $('.grid-message', gridNode); + messageNode.css('top', captionHeight + 'px'); + var fillBody = function(container, fields, data) { var tbody = ($('tbody', container).length && $('tbody', container)) || $('<tbody></tbody>').appendTo(container); @@ -384,28 +399,49 @@ kimchi.widget.Grid = function(params) { $('body').on('mousemove', positionResizer); $('body').on('mouseup', endResizing); + this.showMessage = function(msg) { + $('.detailed-text', messageNode).text(msg); + $(messageNode).removeClass('hidden'); + }; + + this.hideMessage = function() { + $(messageNode).addClass('hidden'); + }; + this.destroy = function() { $('body').off('mousemove', positionResizer); $('body').off('mouseup', endResizing); }; var data = params['data']; - if(!data) { - return; - } + var self = this; + var reload = function() { + if(!data) { + return; + } - if($.isArray(data)) { - this.setData(data); - return; - } + $(messageNode).addClass('hidden'); - if($.isFunction(data)) { - var self = this; - var loadData = data; - maskNode.removeClass('hidden'); - loadData(function(data) { + if($.isArray(data)) { self.setData(data); - maskNode.addClass('hidden'); - }); - } + return; + } + + if($.isFunction(data)) { + var loadData = data; + maskNode.removeClass('hidden'); + loadData(function(data) { + self.setData(data); + maskNode.addClass('hidden'); + }); + } + }; + + var reloadButton = $('.retry-button', gridNode); + $(reloadButton).on('click', function(event) { + reload(); + }); + + this.reload = reload; + reload(); }; diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index ae2ee7d..53a4541 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -57,7 +57,9 @@ kimchi.host_main = function() { kimchi.topic('kimchi/softwareUpdated').publish({ result: result }); - }, function(result) { + }, function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + kimchi.message.error(message || i18n['KCHUPD6009M']); $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); }, reloadProgressArea); } @@ -100,6 +102,13 @@ kimchi.host_main = function() { var updateButton = $('#' + softwareUpdatesGridID + '-update-button'); $(updateButton).prop('disabled', softwareUpdates.length === 0); + }, function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + if($.isFunction(gridCallback)) { + gridCallback([]); + } + softwareUpdatesGrid && + softwareUpdatesGrid.showMessage(message || i18n['KCHUPD6008M']); }); }; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..9f7537f 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -60,6 +60,9 @@ var i18n = { 'KCHAPI6006M': "$_("Warning")", 'KCHGRD6001M': "$_("Loading...")", + 'KCHGRD6002M': "$_("An error occurs while checking for packages update.")", + 'KCHGRD6003M': "$_("Retry")", + 'KCHGRD6004M': "$_("Detailed message:")", 'KCHTMPL6001W': "$_("No iso found")", @@ -87,6 +90,8 @@ var i18n = { 'KCHUPD6005M': "$_("Repository")", 'KCHUPD6006M': "$_("Update All")", 'KCHUPD6007M': "$_("Updating...")", + 'KCHUPD6008M': "$_("Failed to retrieve updates.")", + 'KCHUPD6009M': "$_("Failed to update package(s).")", 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", -- 1.8.1.4

2 2

[PATCH] hack for create a vm from scsi/iscsi volume
by shaohef＠linux.vnet.ibm.com 25 Mar '14

25 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> after apply this patch. you can find a usb scsi targe, and create a scsi pool on this usb scsi target. and then create a VM on the lun of this pool. This patch is just for scsi test. Do not need to merge this patch. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 7b151f2..feee1c3 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -244,6 +244,14 @@ class DevicesModel(object): def _get_devices_fc_host(self): conn = self.conn.get() # Libvirt < 1.0.5 does not support fc_host capability + ret = [] + scsi_hosts = conn.listDevices('scsi_host', 0) + for host in scsi_hosts: + xml = conn.nodeDeviceLookupByName(host).XMLDesc(0) + path = '/device/path' + if 'usb' in xmlutils.xpath_get_text(xml, path)[0]: + ret.append(host) + return ret if not CapabilitiesModel().fc_host_support: ret = [] scsi_hosts = conn.listDevices('scsi_host', 0) -- 1.8.5.3

1 0

[WIP 1/2] UI: add list Host Devices API
by shaohef＠linux.vnet.ibm.com 25 Mar '14

25 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> This API is used to get the Devices of Host. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4310435..d6d7c4b 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -706,6 +706,18 @@ var kimchi = { }); }, + listHostDevices: function(cap, suc, err) { + parameters = cap && "?_cap=" + cap + kimchi.requestJSON({ + url : kimchi.url + 'host/devices' + parameters, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); + }, + getStorageServers: function(type, suc, err) { var url = kimchi.url + 'storageservers?_target_type=' + type; kimchi.requestJSON({ -- 1.8.5.3

3 4

Planning for next release
by Aline Manera 25 Mar '14

25 Mar '14

Hi all, In some days we will have Kimchi 1.2 released so we need to start planning the next release. I would like to ask to everyone input your ideas into the Backlog <https://github.com/kimchi-project/kimchi/wiki/Todo-Backlog> page More than add new features to Kimchi we need to think about improving what is in Kimchi today. Any suggestion is very welcome. Thanks, Aline Manera

1 0

Call for translations
by Aline Manera 25 Mar '14

25 Mar '14

Hi all, As Kimchi 1.2 will be released in some days we need to get all messages translated. So I would like to call for final translation of the code. According to the following statistics, the current code needs some work: en_US.po: 153 translated messages, 5 fuzzy translations, 240 untranslated messages. pt_BR.po: 141 translated messages, 5 fuzzy translations, 252 untranslated messages. zh_CN.po: 151 translated messages, 6 fuzzy translations, 241 untranslated messages. Thanks for your help! Aline Manera

1 0