March 2014 - Kimchi-devel - oVirt List Archives

[PATCH ] Optimize return code check.
by Leonardo Garcia 26 Mar '14

26 Mar '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> Instead of doing two comparisons, make just one and make this check faster. Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> --- src/kimchi/model/debugreports.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index 6ae282a..479d936 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -68,10 +68,7 @@ class DebugReportsModel(object): command = ['sosreport', '--batch', '--name=%s' % name] output, error, retcode = run_command(command) - if retcode < 0: - raise OperationFailed("KCHDR0003E", {'name': name, - 'err': retcode}) - elif retcode > 0: + if retcode != 0: raise OperationFailed("KCHDR0003E", {'name': name, 'err': retcode}) -- 1.8.5.3

4 3

[PATCH V2] Show error message from debug report generation async task
by Rodrigo Trujillo 26 Mar '14

26 Mar '14

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. 'reason' is used in standard exception json returned only. Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.report_add_main.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 15cc76b..8759c2b 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -23,9 +23,11 @@ kimchi.report_add_main = function() { result: result }); }, function(result) { - if (result['reason']) { - var errText = result['reason']; + // Error message from Async Task status + if (result['message']) { + var errText = result['message']; } + // Error message from standard kimchi exception else { var errText = result['responseJSON']['reason']; } -- 1.8.5.3

2 2

[PATCH] bug fix: Lock YUM operations
by Aline Manera 26 Mar '14

26 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> In addition to cherrypy lock - that avoids concurrent requests - we also need to use the yum.doLock() to avoid different applications running YUM, example, Kimchi and Package Kit. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/i18n.py | 4 ++++ src/kimchi/repositories.py | 27 ++++++++++++++++++++------- src/kimchi/swupdate.py | 9 +++++++-- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index c084e21..398d49a 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -249,4 +249,8 @@ messages = { "KCHREPOS0021E": _("Could not disable repository %(repo_id)s."), "KCHREPOS0022E": _("YUM Repository ID already exists"), "KCHREPOS0023E": _("YUM Repository name must be a string"), + "KCHREPOS0024E": _("Unable to list repositories. Details: '%(err)s'"), + "KCHREPOS0025E": _("Unable to retrieve repository information. Details: '%(err)s'"), + "KCHREPOS0026E": _("Unable to add repository. Details: '%(err)s'"), + "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"), } diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index bdf5df5..1c74f04 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -115,14 +115,26 @@ class YumRepo(object): self._confdir = d break + def _get_repos(self, errcode): + try: + yb = self._yb() + yb.doLock() + repos = yb.repos + yb.doUnlock() + except Exception, e: + kimchiLock.release() + raise OperationFailed(errcode, {'err': e.message}) + + return repos + def getRepositoriesList(self): """ Return a list of repositories IDs """ kimchiLock.acquire() - repos = self._yb().repos.repos.keys() + repos = self._get_repos('KCHREPOS0024E') kimchiLock.release() - return repos + return repos.repos.keys() def getRepo(self, repo_id): """ @@ -130,8 +142,9 @@ class YumRepo(object): repository ID format with the information of a YumRepository object. """ kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0025E') kimchiLock.release() + if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) @@ -169,7 +182,7 @@ class YumRepo(object): repo_id = "kimchi_repo_%s" % str(int(time.time() * 1000)) kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0026E') kimchiLock.release() if repo_id in repos.repos.keys(): raise InvalidOperation("KCHREPOS0022E", {'repo_id': repo_id}) @@ -199,7 +212,7 @@ class YumRepo(object): def toggleRepo(self, repo_id, enable): kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0011E') kimchiLock.release() if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) @@ -234,7 +247,7 @@ class YumRepo(object): Update a given repository in repositories.Repositories() format """ kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0011E') kimchiLock.release() if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) @@ -265,7 +278,7 @@ class YumRepo(object): Remove a given repository """ kimchiLock.acquire() - repos = self._yb().repos + repos = self._get_repos('KCHREPOS0027E') kimchiLock.release() if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 625b091..9489900 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -149,8 +149,13 @@ class YumUpdate(object): """ Update the list of packages to be updated in the system. """ - self._yb = getattr(__import__('yum'), 'YumBase')() - self._pkgs = self._yb.doPackageLists('updates') + try: + yb = getattr(__import__('yum'), 'YumBase')() + yb.doLock() + self._pkgs = yb.doPackageLists('updates') + yb.doUnlock() + except Exception, e: + raise OperationFailed('KCHPKGUPD0003E', {'err': e.message}) def getPackagesList(self): """ -- 1.7.10.4

2 2

[PATCH 0/5] Fix 'disk full' issue
by Rodrigo Trujillo 25 Mar '14

25 Mar '14

If the disk where objectstore (Kimchi database) is full, then a lot of errors will be raised without any special treatment. This can lead the system to an unexpected state. This patchset modifies kimchi in order to give the right treatment to exceptions, showing the error to the user or hidding when possible. Rodrigo Trujillo (5): Fix 'disk full' issue: Change objectstore exception handling Fix 'disk full' issue: Fix Templates db store/delete error handling Fix 'disk full' issue: Fix storage volume error handling Fix 'disk full' issue: Fix storagepool and asynctasks error handling Fix 'disk full' issue: Fix vms/screenshot db store/delete error handling src/kimchi/asynctask.py | 7 ++-- src/kimchi/i18n.py | 5 +++ src/kimchi/model/storagepools.py | 8 +++-- src/kimchi/model/storagevolumes.py | 45 +++++++++++++++---------- src/kimchi/model/templates.py | 22 ++++++++---- src/kimchi/model/vms.py | 68 +++++++++++++++++++++++++++----------- src/kimchi/objectstore.py | 8 +++++ 7 files changed, 113 insertions(+), 50 deletions(-) -- 1.8.5.3

2 13

[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

[PATCH] bug fix: instantiate the Yum manager when update the yum packages list
by shaohef＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> an instance just refresh packagekit once. for example: $ sudo PYTHONPATH=src python -c ' > from yum import YumBase > YumBase().doPackageLists("updates") > _yb = YumBase() > _yb.doPackageLists("updates") > _yb.doPackageLists("updates") > ' Loaded plugins: langpacks, refresh-packagekit Loaded plugins: langpacks, refresh-packagekit you can seen the second _yb.doPackageLists will not refresh packagekit. The apt manager may also has the same problem. But not test it on ubuntu, will send a patch later after I have check. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index ff5c9d1..dc48153 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -136,14 +136,14 @@ class YumUpdate(object): """ def __init__(self): self._pkgs = {} - self._yb = getattr(__import__('yum'), 'YumBase')() + self._yb = getattr(__import__('yum'), 'YumBase') self.update_cmd = ["yum", "-y", "update"] def _refreshUpdateList(self): """ Update the list of packages to be updated in the system. """ - self._pkgs = self._yb.doPackageLists('updates') + self._pkgs = self._yb().doPackageLists('updates') def getPackagesList(self): """ -- 1.8.5.3

4 4

[PATCH] run pyflakes when make check
by shaohef＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> 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. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- Makefile.am | 7 +++++++ configure.ac | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2fdafb1..c68f050 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,14 @@ PEP8_WHITELIST = \ tests/utils.py \ $(NULL) +SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" + check-local: + find . -path './.git' -prune -type f -o \ + -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \ + grep -w -v $(SKIP_PYFLAKES_ERR) | \ + while read LINE; do echo "$$LINE"; false; done + $(PEP8) --version $(PEP8) --filename '*.py,*.py.in' $(PEP8_WHITELIST) diff --git a/configure.ac b/configure.ac index 365348f..a625f35 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,13 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.10]) AC_PATH_PROG([CHEETAH], [cheetah], [/usr/bin/cheetah]) +# Checking for pyflakes +AC_PATH_PROG([PYFLAKES], [pyflakes]) +if test "x$PYFLAKES" = "x"; then + AC_MSG_WARN([pyflakes not found]) +fi + + AC_CONFIG_FILES([ po/Makefile.in po/gen-pot -- 1.8.5.3

2 1

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

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V4 -> V5 We do not need pyflakes to run or build Kimchi. It is only used for developers to check code style. 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 +++++++ 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 - 11 files changed, 20 insertions(+), 11 deletions(-) -- 1.8.5.3

2 5

[PATCH v5] Remove debug report's file path from UI
by Mark Wu 24 Mar '14

24 Mar '14

Now the file path displayed on UI is "/data/debugreports/<reportname>/", It's misleading because people could assume it's path on file system, but it's the uri path in fact. We don't need expose the URI path because the download button can help user to get the file. So this patch removes it from UI. And this patch also renames debug report's 'file' attribute to 'uri', because we use it to represent the download uri path. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- docs/API.md | 2 +- src/kimchi/control/debugreports.py | 4 ++-- src/kimchi/mockmodel.py | 2 +- src/kimchi/model/debugreports.py | 2 +- tests/test_rest.py | 2 +- ui/css/theme-default/host.css | 4 ---- ui/js/src/kimchi.host.js | 4 ---- ui/pages/i18n.html.tmpl | 1 - 8 files changed, 6 insertions(+), 15 deletions(-) diff --git a/docs/API.md b/docs/API.md index 8d6682b..a380558 100644 --- a/docs/API.md +++ b/docs/API.md @@ -672,7 +672,7 @@ specific to the low level collection tool being used. * **GET**: Retrieve the full description of Debug Report * name: The debug report name used to identify the report - * file: The debug report file name used to identify the report + * uri: The URI path to download a debug report * time: The time when the debug report is created * **DELETE**: Remove the Debug Report diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 9922cfa..3c12230 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -37,7 +37,7 @@ class DebugReport(Resource): @property def data(self): return {'name': self.ident, - 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} @@ -47,4 +47,4 @@ class DebugReportContent(Resource): def get(self): self.lookup() - raise internal_redirect(self.info['file']) + raise internal_redirect(self.info['uri']) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index d40f61a..01480f4 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -311,7 +311,7 @@ class MockModel(object): ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime)) file_target = os.path.split(file_target)[-1] file_target = os.path.join("/data/debugreports", file_target) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def debugreportcontent_lookup(self, name): diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..6ae282a 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -162,7 +162,7 @@ class DebugReportModel(object): ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime)) file_target = os.path.split(file_target)[-1] file_target = os.path.join("/data/debugreports", file_target) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def delete(self, name): diff --git a/tests/test_rest.py b/tests/test_rest.py index fe8d3c4..3f2e449 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1507,7 +1507,7 @@ class RestTests(unittest.TestCase): self.assertEquals(200, resp.status) resp = request(host, port, '/debugreports/report1') debugre = json.loads(resp.read()) - resp = request(host, port, debugre['file']) + resp = request(host, port, debugre['uri']) self.assertEquals(200, resp.status) def test_host(self): diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 0f8b941..8af34f5 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -215,14 +215,10 @@ } .debug-report-name, -.debug-report-file, .debug-report-time { width: 200px; } -.debug-report-file { - width: 300px; -} /* End of Debug Report */ /* Software Updates */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index ae2ee7d..5d32c4a 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -188,10 +188,6 @@ kimchi.host_main = function() { label: i18n['KCHDR6003M'], 'class': 'debug-report-name' }, { - name: 'file', - label: i18n['KCHDR6004M'], - 'class': 'debug-report-file' - }, { name: 'time', label: i18n['KCHDR6005M'], 'class': 'debug-report-time' diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..a626759 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -92,7 +92,6 @@ var i18n = { 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", 'KCHDR6002M': "$_("Debug Reports")", 'KCHDR6003M': "$_("Name")", - 'KCHDR6004M': "$_("File Path")", 'KCHDR6005M': "$_("Generated Time")", 'KCHDR6006M': "$_("Generate")", 'KCHDR6007M': "$_("Generating...")", -- 1.8.4.2

2 1

[PATCH] partitions: Fix when disk does not have extended partition
by lvroyce＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Disk may just have primary partitions, this makes getExtendedPartition return none and throw exception when refer to extended partition path. Fix this by check whether extended partition exists. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index cada869..ce0c5bb 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -86,8 +86,8 @@ def _is_dev_extended_partition(devType, devNodePath): return False diskPath = devNodePath.rstrip('0123456789') device = PDevice(diskPath) - disk = PDisk(device) - if disk.getExtendedPartition().path == devNodePath: + extended_part = PDisk(device).getExtendedPartition() + if extended_part and extended_part.path == devNodePath: return True return False -- 1.8.3.2

3 2

[PATCH V2 1/2] bug fix: instantiate the Yum manager when update the yum packages list
by shaohef＠linux.vnet.ibm.com 24 Mar '14

24 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> an instance just refresh packagekit once. for example: $ sudo PYTHONPATH=src python -c ' > from yum import YumBase > YumBase().doPackageLists("updates") > _yb = YumBase() > _yb.doPackageLists("updates") > _yb.doPackageLists("updates") > ' Loaded plugins: langpacks, refresh-packagekit Loaded plugins: langpacks, refresh-packagekit you can seen the second _yb.doPackageLists will not refresh packagekit. The apt manager may also has the same problem. But not test it on ubuntu, will send a patch later after I have check. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 45f7920..3238e44 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -137,13 +137,13 @@ class YumUpdate(object): """ def __init__(self): self._pkgs = {} - self._yb = getattr(__import__('yum'), 'YumBase')() self.update_cmd = ["yum", "-y", "update"] def _refreshUpdateList(self): """ Update the list of packages to be updated in the system. """ + self._yb = getattr(__import__('yum'), 'YumBase')() self._pkgs = self._yb.doPackageLists('updates') def getPackagesList(self): -- 1.8.5.3

2 2

[PATCH v4] Remove debug report's file path from UI
by Mark Wu 24 Mar '14

24 Mar '14

Now the file path displayed on UI is "/data/debugreports/<reportname>/", It's misleading because people could assume it's path on file system, but it's the uri path in fact. We don't need expose the URI path because the download button can help user to get the file. So this patch removes it from UI. And this patch also renames debug report's 'file' attribute to 'uri', because we use it to represent the download uri path. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- v3 -> v4: Update mockmodel accordingly. docs/API.md | 2 +- src/kimchi/control/debugreports.py | 2 +- src/kimchi/mockmodel.py | 2 +- src/kimchi/model/debugreports.py | 2 +- ui/css/theme-default/host.css | 4 ---- ui/js/src/kimchi.host.js | 4 ---- ui/pages/i18n.html.tmpl | 1 - 7 files changed, 4 insertions(+), 13 deletions(-) diff --git a/docs/API.md b/docs/API.md index 672ef14..105498a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -672,7 +672,7 @@ specific to the low level collection tool being used. * **GET**: Retrieve the full description of Debug Report * name: The debug report name used to identify the report - * file: The debug report file name used to identify the report + * uri: The URI path to download a debug report * time: The time when the debug report is created * **DELETE**: Remove the Debug Report diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 9922cfa..6efae23 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -37,7 +37,7 @@ class DebugReport(Resource): @property def data(self): return {'name': self.ident, - 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 743c7c6..3690776 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -311,7 +311,7 @@ class MockModel(object): ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime)) file_target = os.path.split(file_target)[-1] file_target = os.path.join("/data/debugreports", file_target) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def debugreportcontent_lookup(self, name): diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..6ae282a 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -162,7 +162,7 @@ class DebugReportModel(object): ctime = time.strftime("%Y-%m-%d-%H:%M:%S", time.localtime(ctime)) file_target = os.path.split(file_target)[-1] file_target = os.path.join("/data/debugreports", file_target) - return {'file': file_target, + return {'uri': file_target, 'ctime': ctime} def delete(self, name): diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 0f8b941..8af34f5 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -215,14 +215,10 @@ } .debug-report-name, -.debug-report-file, .debug-report-time { width: 200px; } -.debug-report-file { - width: 300px; -} /* End of Debug Report */ /* Software Updates */ diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 6300f37..fa7b4c8 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -186,10 +186,6 @@ kimchi.host_main = function() { label: i18n['KCHDR6003M'], 'class': 'debug-report-name' }, { - name: 'file', - label: i18n['KCHDR6004M'], - 'class': 'debug-report-file' - }, { name: 'time', label: i18n['KCHDR6005M'], 'class': 'debug-report-time' diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 2f47e50..a626759 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -92,7 +92,6 @@ var i18n = { 'KCHDR6001M': "$_("Debug report will be removed permanently and can't be recovered. Do you want to continue?")", 'KCHDR6002M': "$_("Debug Reports")", 'KCHDR6003M': "$_("Name")", - 'KCHDR6004M': "$_("File Path")", 'KCHDR6005M': "$_("Generated Time")", 'KCHDR6006M': "$_("Generate")", 'KCHDR6007M': "$_("Generating...")", -- 1.8.4.2

2 2

[PATCH V2 0/2] Fix non persistent network handling
by Rodrigo Trujillo 24 Mar '14

24 Mar '14

V2: Address Ming comments: - Updates API.md - remove useless comments and return V1: Kimchi networks have the same problem storage had. Non persistent networks are not stop, they are removed by libvirt and this causes an error in Kimchi. Rodrigo Trujillo (2): Fix non persistent network handling (backend) Fix non persistent network handling (frontend) docs/API.md | 2 ++ src/kimchi/control/networks.py | 3 ++- src/kimchi/model/networks.py | 3 ++- ui/js/src/kimchi.network.js | 55 ++++++++++++++++++++++++++++-------------- ui/pages/i18n.html.tmpl | 1 + 5 files changed, 44 insertions(+), 20 deletions(-) -- 1.8.5.3

2 3

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

24 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. 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 6e4678f..2990cdd 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..362cde2 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -60,6 +60,9 @@ var i18n = { 'KCHAPI6006M': "$_("Warning")", 'KCHGRD6001M': "$_("Loading...")", + 'KCHGRD6002M': "$_("Operation failed.")", + '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

3 3

[PATCH] Fix build dependency of pep8
by lvroyce＠linux.vnet.ibm.com 22 Mar '14

22 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> On fresh installation, make check will fail because of lack of pep8 checker. Add it to build dependency. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 7 ++++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index c2b2a40..0a730b6 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -24,6 +24,7 @@ Depends: python-cherrypy3 (>= 3.2.0), open-iscsi, firewalld Build-Depends: libxslt, + pep8, python-libxml2 Maintainer: Aline Manera <alinefm(a)br.ibm.com> Description: Kimchi web server diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index bf80104..18bd369 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -31,6 +31,7 @@ Requires: nfs-utils Requires: iscsi-initiator-utils BuildRequires: libxslt BuildRequires: libxml2-python +BuildRequires: python-pep8 %if 0%{?rhel} == 6 Requires: python-ordereddict diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index cba0899..efbb876 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -27,6 +27,7 @@ Requires: nfs-client Requires: open-iscsi BuildRequires: libxslt-tools BuildRequires: python-libxml2 +BuildRequires: python-pep8 %if 0%{?sles_version} == 11 Requires: python-ordereddict diff --git a/docs/README.md b/docs/README.md index 8b8b181..9875ee1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,7 +53,8 @@ Install Dependencies PyPAM m2crypto python-jsonschema rpm-build \ qemu-kvm python-psutil python-ethtool sos \ python-ipaddr python-lxml nfs-utils \ - iscsi-initiator-utils libxslt pyparted + iscsi-initiator-utils libxslt pyparted \ + python-pep8 # If using RHEL6, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict # Restart libvirt to allow configuration changes to take effect @@ -75,7 +76,7 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc python-parted + open-iscsi lvm2 xsltproc python-parted pep8 Packages version requirement: python-jsonschema >= 1.3.0 @@ -89,7 +90,7 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml python-parted + libxslt-tools python-xml python-parted python-pep8 Packages version requirement: python-psutil >= 0.6.0 -- 1.8.3.2

4 3

2 errors on rhel7 beta
by Sheldon 21 Mar '14

21 Mar '14

1. can not install python-cheetah for missing Dependency. 1. --> Finished Dependency Resolution 2. Error: Package: python-cheetah-2.4.4-4.el7.x86_64 (epel) 3. Requires: python-pygments 4. You could try using --skip-broken to work around the problem 5. You could try running: rpm -Va --nofiles --nodigest I just install epel and cdrom repo. 2. can not start kimchid first time, restart kimchid again, it can works. 1. sudo ./src/kimchid 2. libvirt: Storage Driver error : Storage pool not found: no storage pool with matching name 'default' 3. Loading YumUpdate features. 4. Loaded plugins: langpacks, product-id 5. libvirt: Network Driver error : Network not found: no network with matching name 'default' 6. libvirt: Network Driver error : Failed to create symlink '/etc/libvirt/qemu/networks/autostart/default.xml' to '/etc/libvirt/qemu/networks/default.xml': File exists 7. Fatal: Cannot create default network because of KCHNET0008E: Unable to create network default. Details: Failed to create symlink '/etc/libvirt/qemu/networks/autostart/default.xml' to '/etc/libvirt/qemu/networks/default.xml': File exists, exit kimchid I run kimchi on nested kimchi. check the default network address, kimchi lookup 192.168.123.0/24 for default, it is different with the default network address on host. -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 1