March 2014 - Kimchi-devel - oVirt List Archives

[PATCH v3] [UI] Grid Loading Mask - Some Elements are Missing
by Hongliang Wang 18 Mar '14

18 Mar '14

Some elements were lost and add them back here: 1) Show a message under the icon 2) Put the icon and text in the center both horizontally and vertically 3) Give the mask a opacity value 4) Hide the mask initially v2 -> v3: 3a) Put toolbar under mask (Adam King's comment) v1 -> v2: 2a) Rebased. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 13 +++++++------ ui/js/src/kimchi.grid.js | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 958bdb0..44ae614 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -214,27 +214,28 @@ } .grid-mask { + background: rgba(190, 190, 190, .9); bottom: 0; left: 0; position: absolute; right: 0; - top: 48px; + z-index: 5; } .grid-loading { bottom: 0; - height: 100%; + height: 68px; left: 0; margin: auto; + position: absolute; right: 0; text-align: center; top: 0; - width: 100%; + width: 49px; } .grid-loading-icon { background: url("../images/theme-default/kimchi-loading.gif") no-repeat left top; - height: 100%; - width: 100%; - background-position: center; + height: 48px; + width: 49px; } diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index e5892ff..540f1ba 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -57,7 +57,9 @@ kimchi.widget.Grid = function(params) { '<div class="grid-mask hidden">', '<div class="grid-loading">', '<div class="grid-loading-icon"></div>', - '<div class="grid-loading-text"></div>', + '<div class="grid-loading-text">', + i18n['KCHGRD6001M'], + '</div>', '</div>', '</div>', '</div>' @@ -157,7 +159,7 @@ kimchi.widget.Grid = function(params) { gridContentNode.css('top', (captionHeight + toolbarHeight) + 'px'); var maskNode = $('.grid-mask', gridNode); - maskNode.css('top', (captionHeight + toolbarHeight) + 'px'); + maskNode.css('top', captionHeight + 'px'); var fillBody = function(container, fields, data) { var tbody = ($('tbody', container).length && $('tbody', container)) -- 1.8.1.4

3 2

[PATCH] [UI] Fix Bug - Text Overlapped in Template Add Window
by Hongliang Wang 18 Mar '14

18 Mar '14

Aline found the bug which is caused by commit 23b5850. Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/window.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index 3d6d563..22e6327 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -49,7 +49,8 @@ max-height: 100%; } -.window header { +.window>header, +.window>form>header { position: absolute; left: 0; right: 0; @@ -99,12 +100,14 @@ cursor: pointer; } -.window header>.close:HOVER { +.window>header>.close:HOVER, +.window>form>header>.close:HOVER { border: 2px solid #444; color: #444; } -.window header>.title { +.window>header>.title, +.window>form>header>.title { font-size: 18px; height: 48px; line-height: 48px; -- 1.8.1.4

4 3

[PATCH] Fix multiple pep8
by lvroyce＠linux.vnet.ibm.com 18 Mar '14

18 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Make check fails with pep8 version 1.3.3. Fix files revolve to comply with pep8. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 2 +- src/kimchi/model/networks.py | 2 +- src/kimchi/osinfo.py | 2 +- src/kimchi/root.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index b042d73..501afb2 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -136,7 +136,7 @@ def check_auth_session(): kimchiRobot = cherrypy.request.headers.get('Kimchi-Robot') if kimchiRobot == "kimchi-robot": if (time.time() - cherrypy.session[REFRESH] > - cherrypy.session.timeout * 60): + cherrypy.session.timeout * 60): cherrypy.session[USER_ID] = None cherrypy.lib.sessions.expire() raise cherrypy.HTTPError(401) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0242156..b7096e5 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -64,7 +64,7 @@ class NetworksModel(object): # FIXME we can not distinguish this error from other internal # error by error code. if ("network is already in use by interface" - in e.message.lower()): + in e.message.lower()): # libvirt do not support update IP element, so delete the # the network and create new one. net.undefine() diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 02dbabf..c5f889b 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -113,7 +113,7 @@ def lookup(distro, version): if distro in modern_version_bases[arch]: if LooseVersion(version) >= LooseVersion( - modern_version_bases[arch][distro]): + modern_version_bases[arch][distro]): params.update(template_specs[arch]['modern']) else: params.update(template_specs[arch]['old']) diff --git a/src/kimchi/root.py b/src/kimchi/root.py index 5bad9b4..9bae34a 100644 --- a/src/kimchi/root.py +++ b/src/kimchi/root.py @@ -51,7 +51,7 @@ class Root(Resource): data = {'code': status, 'reason': message} res = template.render('error.html', data) if (type(res) is unicode and - LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): + LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): res = res.encode("utf-8") return res @@ -60,7 +60,7 @@ class Root(Resource): 'call_stack': cherrypy._cperror.format_exc()} res = template.render('error.html', data) if (type(res) is unicode and - LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): + LooseVersion(cherrypy.__version__) < LooseVersion('3.2.5')): res = res.encode("utf-8") return res -- 1.8.1.2

3 2

[PATCH] Skip 'screendump' for vms no video device configured
by Mark Wu 18 Mar '14

18 Mar '14

It's observed that if a vm is created by external tool and doesn't have video device, libivrt will keep reporting the following error message: "internal error: unable to execute QEMU command 'screendump': There is no QemuConsole I can screendump from." This patch skips screendump for that kinds of vms to avoid the error message and repeately sending the black images. On UI side, it changes to display vm's icon instead of the black image if it doesn't have video device. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 6 +++++- ui/js/src/kimchi.guest_main.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3b8a666..79b335c 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -275,6 +275,10 @@ class VMModel(object): def _live_vm_update(self, dom, params): pass + def _has_video(self, dom): + dom = ElementTree.fromstring(dom.XMLDesc(0)) + return dom.find('devices/video') is not None + def lookup(self, name): dom = self.get_vm(name, self.conn) info = dom.info() @@ -284,7 +288,7 @@ class VMModel(object): graphics_type, graphics_listen, graphics_port = graphics graphics_port = graphics_port if state == 'running' else None try: - if state == 'running': + if state == 'running' and self._has_video(dom): screenshot = self.vmscreenshot.lookup(name) elif state == 'shutoff': # reset vm stats when it is powered off to avoid sending diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index bdd5a69..8a20d07 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -186,7 +186,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { guestTitle.html(vmObject.name); //Setup the VM console thumbnail display - var curImg = vmObject.state == 'running' ? vmObject.screenshot : vmObject.icon; + var curImg = vmObject.screenshot || vmObject.icon; var load_src = curImg || 'images/icon-vm.png'; var tile_src = prevScreenImage || vmObject['load-src']; var liveTile=result.find('div[name=guest-tile] > .tile'); -- 1.8.4.2

3 2

[RFC] create a vm on a lun directly
by Sheldon 18 Mar '14

18 Mar '14

Now we have support iSCSI or SCSI pool. But we do not make use of the iSCSI or SCSI pool at present. Here we want to create volumes for VM in those pools. The best way to do it is on template level - and not on vm level For if we create a template just assign a iSCSI or SCSI pool, the user still need to choose a volume for his VM. in the edit template page, we list the storage pool and the volume like: dir-pool-1 nfs-pool-2 iscsi-pool-1/lun-1 iscsi-pool-1/lun-2 iscsi-pool-1/lun-3 scsi-pool-1/lun-1 scsi-pool-1/lun-2 when selecting the storage pool with type iSCSI or SCSI the user also select the volume. The user can create a VM with this volume. But we should let user know it is dangerous to avoid user mistake when he choose the volume. 1. Now we only use the volume to create the vm not support shareable volume. use the same volume in multiples vms, a new install will overwrite the current content. We can check the volume ref_cnt to avoid this. 2. even this lun is not used buy vm, maybe the Adam has added a lun to a VG or use it on other purpose Should we check the lun is is used external kimchi? If a lun is added to a VG, need to check it? If adam format a lun and create a files system on, need to check it? Or we just prompt the data on this volume will destroyed. -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

4 3

[PATCH] [PATCH] bug fix: instantiate the apt-get manager when update the apt-get packages list
by shaohef＠linux.vnet.ibm.com 18 Mar '14

18 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> I have not test this patch on ubuntu. I just test the yum patch. We should make sure: 1. apt-get packages list can be updated after apt-get update a package. 2. there should not be a apt-get lock conflict when get apt-get packages list and update apt-get packages. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index dc48153..6ab968f 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -170,16 +170,17 @@ class AptUpdate(object): """ def __init__(self): self._pkgs = {} - self._apt_cache = getattr(__import__('apt'), 'Cache')() + self._apt_cache = getattr(__import__('apt'), 'Cache') self.update_cmd = ['apt-get', 'upgrade', '-y'] def _refreshUpdateList(self): """ Update the list of packages to be updated in the system. """ - self._apt_cache.update() - self._apt_cache.upgrade() - self._pkgs = self._apt_cache.get_changes() + apt_cache = self._apt_cache() + apt_cache.update() + apt_cache.upgrade() + self._pkgs = apt_cache.get_changes() def getPackagesList(self): """ -- 1.8.5.3

1 0

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

17 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. ShaoHe Feng (3): make pyflakes happly 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 | 6 +++--- src/kimchi/model/storagepools.py | 2 +- src/kimchi/screenshot.py | 1 - src/kimchi/template.py | 1 - tests/test_model.py | 1 + tests/test_server.py | 1 - ui/pages/help/gen-index.py | 1 - 14 files changed, 25 insertions(+), 14 deletions(-) -- 1.8.4.2

5 9

[PATCH] [API Docs] Keep Document Consistent with Code Logic
by Hongliang Wang 14 Mar '14

14 Mar '14

is_mirror field is not allowed to update so remove the lines in API document. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- docs/API.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index fc39c65..c24af9e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -891,8 +891,6 @@ repository. * baseurl *(optional)*: URL to the repodata directory when "is_mirror" is false. Otherwise, it can be URL to the mirror system for YUM. Can be an http://, ftp:// or file:// URL. - * is_mirror *(optional)*: Set the given URI of baseurl as a mirror -list, instead of use baseurl in repository configuration. * url_args *(optional)*: Arguments to be passed to baseurl, like the list of APT repositories provided by the same baseurl. * gpgcheck *(optional)*: Indicates if a GPG signature check on the -- 1.8.1.4

3 3

[PATCH v2] Report debug report's file path instead of uri path.
by Mark Wu 14 Mar '14

14 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. --- docs/API.md | 3 ++- src/kimchi/control/debugreports.py | 1 + src/kimchi/model/debugreports.py | 6 ++++-- ui/js/src/kimchi.host.js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/API.md b/docs/API.md index b3b6c49..6f4f03a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -668,7 +668,8 @@ 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 + * file: The debug report's file path on kimchi host + * uri: The URI path to download this 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..d6ca620 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -38,6 +38,7 @@ class DebugReport(Resource): def data(self): return {'name': self.ident, 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..b144496 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -161,8 +161,10 @@ class DebugReportModel(object): ctime = os.stat(file_target).st_ctime 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, + file_path = os.path.join(path, file_target) + uri_path = os.path.join("/data/debugreports", file_target) + return {'file': file_path, + 'uri': uri_path, 'ctime': ctime} def delete(self, name): diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 7974054..0aaf2f0 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -87,7 +87,7 @@ kimchi.host_main = function() { } kimchi.downloadReport({ - file: report['file'] + file: report['uri'] }); } }], -- 1.8.4.2

6 7

[PATCH] Grid widget presently interprets displays null values as null strings
by Adam King 14 Mar '14

14 Mar '14

Update the fillBody function to translate null to '' for display purposes. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 2e3d0ed..e5892ff 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -167,7 +167,7 @@ kimchi.widget.Grid = function(params) { var rowNode = $('<tr></tr>').appendTo(tbody); $.each(fields, function(fi, field) { var fieldName = field['name']; - var value = row[fieldName]; + var value = (row[fieldName]==null) ? '' : row[fieldName]; $('<td><div class="cell-text-wrapper"' + (field['makeTitle'] === true ? ' title="' + value + '"' -- 1.8.1.4

2 2

[PATCH] mockmodel: Reset packages after updating system
by Aline Manera 14 Mar '14

14 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> After updating system any more packages should be listed or user will think the update failed. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/mockmodel.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index b70cc1b..743c7c6 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -1122,6 +1122,10 @@ class MockSoftwareUpdate(object): msgs.append("All packages updated") cb('\n'.join(msgs), True) + # After updating all packages any package should be listed to be + # updated, so reset self._packages + self._packages = {} + class MockRepositories(object): def __init__(self): -- 1.7.10.4

2 2

[PATCH v2 0/4] Host Repository Management Support
by Hongliang Wang 13 Mar '14

13 Mar '14

Add host repositories management in this patch set. Please apply the following patch first: * [UI] Grid Enhancement - "title" Attribute for Long Values Know issues: * Editing a repository will always fails because back-end responds an error: KCHAPI0004E: Parameters is_mirror are not allowed to be updated in repository v1 -> v2: 2a) Removed "Repository" in column names (Adam King's comment) 2b) Adjust column name sequence (Adam King's comment) 2c) Enabled is_mirror radio button in edit window (Adam King's comment) Hongliang Wang (4): Add i18n Strings for Repositories Management Add API Support for Repositories Management Add/Edit Repository Support Integrate Repositories Management into Host Tab po/POTFILES.in | 2 + ui/css/theme-default/host.css | 40 ++++++++++ ui/css/theme-default/repository-add.css | 39 ++++++++++ ui/css/theme-default/repository-edit.css | 69 +++++++++++++++++ ui/js/src/kimchi.api.js | 61 +++++++++++++++ ui/js/src/kimchi.host.js | 123 +++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_add_main.js | 84 +++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 85 +++++++++++++++++++++ ui/pages/i18n.html.tmpl | 18 +++++ ui/pages/repository-add.html.tmpl | 104 ++++++++++++++++++++++++++ ui/pages/repository-edit.html.tmpl | 121 ++++++++++++++++++++++++++++++ ui/pages/tabs/host.html.tmpl | 13 ++++ 12 files changed, 759 insertions(+) create mode 100644 ui/css/theme-default/repository-add.css create mode 100644 ui/css/theme-default/repository-edit.css create mode 100644 ui/js/src/kimchi.repository_add_main.js create mode 100644 ui/js/src/kimchi.repository_edit_main.js create mode 100644 ui/pages/repository-add.html.tmpl create mode 100644 ui/pages/repository-edit.html.tmpl -- 1.8.1.4

3 16

[PATCH v3 0/5] [UI] Host Repository Management Support
by Hongliang Wang 13 Mar '14

13 Mar '14

Add host repositories management in this patch set. v2 -> v3: 3a) Added enable/disable repository function in grid toolbar button (Adam King's comment) v1 -> v2: 2a) Removed "Repository" in column names (Adam King's comment) 2b) Adjust column name sequence (Adam King's comment) 2c) Enabled is_mirror radio button in edit window (Adam King's comment) Hongliang Wang (5): [UI] Repository Management - Add i18n Strings [UI] Repository Management - Add API Support [UI] Repository Management - Add Repository Support [UI] Repository Management - Edit Repository Support [UI] Repository Management - Integrate into Host Tab po/POTFILES.in | 2 + ui/css/theme-default/host.css | 40 ++++++++ ui/css/theme-default/repository-add.css | 39 +++++++ ui/css/theme-default/repository-edit.css | 69 +++++++++++++ ui/js/src/kimchi.api.js | 76 +++++++++++++- ui/js/src/kimchi.host.js | 170 +++++++++++++++++++++++++++++++ ui/js/src/kimchi.repository_add_main.js | 84 +++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 85 ++++++++++++++++ ui/pages/i18n.html.tmpl | 19 ++++ ui/pages/repository-add.html.tmpl | 104 +++++++++++++++++++ ui/pages/repository-edit.html.tmpl | 110 ++++++++++++++++++++ ui/pages/tabs/host.html.tmpl | 13 +++ 12 files changed, 810 insertions(+), 1 deletion(-) create mode 100644 ui/css/theme-default/repository-add.css create mode 100644 ui/css/theme-default/repository-edit.css create mode 100644 ui/js/src/kimchi.repository_add_main.js create mode 100644 ui/js/src/kimchi.repository_edit_main.js create mode 100644 ui/pages/repository-add.html.tmpl create mode 100644 ui/pages/repository-edit.html.tmpl -- 1.8.1.4

2 10

[PATCH v2] [UI] Grid Loading Mask - Some Elements are Missing
by Hongliang Wang 13 Mar '14

13 Mar '14

Some elements were lost and add them back here: 1) Show a message under the icon 2) Put the icon and text in the center both horizontally and vertically 3) Give the mask a opacity value 4) Hide the mask initially v1 -> v2: 2a) Rebased. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 13 +++++++------ ui/js/src/kimchi.grid.js | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 958bdb0..44ae614 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -214,27 +214,28 @@ } .grid-mask { + background: rgba(190, 190, 190, .9); bottom: 0; left: 0; position: absolute; right: 0; - top: 48px; + z-index: 5; } .grid-loading { bottom: 0; - height: 100%; + height: 68px; left: 0; margin: auto; + position: absolute; right: 0; text-align: center; top: 0; - width: 100%; + width: 49px; } .grid-loading-icon { background: url("../images/theme-default/kimchi-loading.gif") no-repeat left top; - height: 100%; - width: 100%; - background-position: center; + height: 48px; + width: 49px; } diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 2e3d0ed..7360b36 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -57,7 +57,9 @@ kimchi.widget.Grid = function(params) { '<div class="grid-mask hidden">', '<div class="grid-loading">', '<div class="grid-loading-icon"></div>', - '<div class="grid-loading-text"></div>', + '<div class="grid-loading-text">', + i18n['KCHGRD6001M'], + '</div>', '</div>', '</div>', '</div>' -- 1.8.1.4

2 1

[RFC][PATCH] Do not allow user deactivate/delete storage pool used by vms
by shaohef＠linux.vnet.ibm.com 13 Mar '14

13 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Make a integrity verification when user try to deactivate or delete a pool. If a volume of a pool is used by a vm, the pool should not be deactivated or deleted to avoid problems. It is no harmful to allow to deactivate/delete dir pool, for kimchi does not delete the pool path when delete this pool. But it is harmful for other type pools, such as logical or nfs pool. Royce has added a ref_cnt for volume, if the sum of ref_cnt in this pool larger than 0, means this pool is used by some vms. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 ++ src/kimchi/model/storagepools.py | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 1ae3889..7c8fbc7 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -144,6 +144,8 @@ messages = { "KCHPOOL0034E": _("Unable to deactivate pool %(name)s as it is associated with some templates"), "KCHPOOL0035E": _("Unable to delete pool %(name)s as it is associated with some templates"), "KCHPOOL0036E": _("A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool."), + "KCHPOOL0037E": _("Unable to deactivate pool %(name)s as it is used by some vms"), + "KCHPOOL0038E": _("Unable to delete pool %(name)s as it is used by some vms"), "KCHVOL0001E": _("Storage volume %(name)s already exists"), "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"), diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index fea19f6..247c374 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -179,6 +179,16 @@ class StoragePoolModel(object): else: raise + def _get_volumes_ref_cnt(self, name): + # in order to avoid nested import + from kimchi.model.storagevolumes import StorageVolumesModel + from kimchi.model.storagevolumes import StorageVolumeModel + kwargs = {"conn": self.conn, "objstore": self.objstore} + cnts = [StorageVolumeModel(**kwargs).lookup(name, volume)["ref_cnt"] + for volume in StorageVolumesModel(**kwargs).get_list(name)] + + return sum(cnts) + def _get_storagepool_vols_num(self, pool): try: if pool.isActive(): @@ -345,6 +355,9 @@ class StoragePoolModel(object): raise InvalidOperation('KCHPOOL0034E', {'name': name}) pool = self.get_storagepool(name, self.conn) + if pool.isActive() and self._get_volumes_ref_cnt(name) > 0: + raise InvalidOperation('KCHPOOL0037E', {'name': name}) + #FIXME: nfs workaround - do not try to deactivate a NFS pool # if the NFS server is not reachable. xml = pool.XMLDesc(0) @@ -374,6 +387,16 @@ class StoragePoolModel(object): if pool.isActive(): raise InvalidOperation("KCHPOOL0005E", {'name': name}) try: + try: + pool.create(0) + except Exception: + pass + else: + if self._get_volumes_ref_cnt(name) > 0: + pool.destroy() + raise InvalidOperation('KCHPOOL0038E', {'name': name}) + else: + pool.destroy() pool.undefine() except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0011E", -- 1.8.4.2

3 3

[PATCH 0/2] Do not allow user disable/delete a network used by VM or template
by Aline Manera 13 Mar '14

13 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): Do not allow user disable/delete a network used by VM or template UI: Disable stop/undefine buttons when network is in use docs/API.md | 2 ++ src/kimchi/control/networks.py | 1 + src/kimchi/i18n.py | 4 ++-- src/kimchi/mockmodel.py | 24 ++++++++++++++++++++++++ src/kimchi/model/networks.py | 31 +++++++++++++++++++++++++++---- tests/test_model.py | 3 +-- tests/test_rest.py | 6 +++--- ui/js/src/kimchi.network.js | 27 ++++++++++++++++++++------- ui/pages/tabs/network.html.tmpl | 2 +- 9 files changed, 81 insertions(+), 19 deletions(-) -- 1.7.10.4

3 7

[PATCH 0/2 V2] Do not allow user disable/delete a network used by VM or template
by Aline Manera 13 Mar '14

13 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> v1 -> V2: - Update test cases (by Royce) - Make function names uniform (by Ming) Aline Manera (2): Do not allow user disable/delete a network used by VM or template UI: Disable stop/undefine buttons when network is in use docs/API.md | 2 ++ src/kimchi/control/networks.py | 1 + src/kimchi/i18n.py | 4 ++-- src/kimchi/mockmodel.py | 24 ++++++++++++++++++++++++ src/kimchi/model/networks.py | 31 +++++++++++++++++++++++++++---- tests/test_model.py | 18 +++++++++++++++--- tests/test_rest.py | 12 ++++++++++-- ui/js/src/kimchi.network.js | 27 ++++++++++++++++++++------- ui/pages/tabs/network.html.tmpl | 2 +- 9 files changed, 102 insertions(+), 19 deletions(-) -- 1.7.10.4

2 4

[PATCH 0/2] Change cdrom default bus type to scsi
by lvroyce＠linux.vnet.ibm.com 13 Mar '14

13 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> tested: 1. sudo ./run_test.sh 2. create vm with a scsi cdrom successful install 3. add more than 4 cdrom success Royce Lv (2): Issue#338: Change the default cdrom bus to scsi Fix feature tests xml src/kimchi/featuretests.py | 6 +++--- src/kimchi/model/vmstorages.py | 2 +- src/kimchi/osinfo.py | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) -- 1.8.1.2

3 7

[RFC] Github #329: Kimchi must not run as root
by Daniel H Barboza 13 Mar '14

13 Mar '14

Information about the issue: https://github.com/kimchi-project/kimchi/issues/329 We had some ideas about it in the last weekly scrum: - creating an user 'kimchi' with a lot of privileges. It is the simplest of the solutions but implies in a lot of annoyances (different system paths between distros, libvirt does not work the same way in all distros). There is no tell about the amount of new bugs and issues that shall emerge from such change. - Separating the UI and the backend. This is my personal favourite but I believe it is also the hardest. We can implement this by separating frontend and backend as 2 separate cherrypy processes, the backend runs as root and the frontend runs as a regular user. The communication would be done using the REST API. The other approach would be the backend running as a regular python daemon, with root privileges, and kimchi would communicate with it using RPC. I believe the latter is more elegant and the former is easier to implement. Things to consider: - Distro support: Ubuntu, for example, behaves very different from Fedora as far as libvirt is concerned. The packaging model (apt-get instead of yum) differs in support as well. I think it's a fair guess that RHEL 6 and Suse will have different behavior as well. - VM visibility: in the first idea (different user) only the VMs created by this specific user would be visible to kimchi, unless we do something about it (tweaking libvirt configuration perhaps?). - User authentication. Right now the user authentication presented in kimchi exists simply to authenticate it as a regular user of the host. The owner of the process will be root, doesn't matter which user logs in (and I guess this is the critical security flaw we have). Do we need ro rethink the authentication model as well? Please provide your input and ideas! Daniel

4 5

Found two issues when playing with plugins
by Zhou Zheng Sheng 13 Mar '14

13 Mar '14

Hi, I tried to add plugin to kimchi and created a new tab in the web UI. However I found some problems in the front-end code. The first one is that it does not provide a way to load plugin specific i18n.html. The second one is that when I press F5 at my plugin tab page, it triggers error KCHAPI6001E "Invalid URL. Redireced to home page." I filed two issues in the github. Maybe anyone who are interested in front-end can take a look. https://github.com/kimchi-project/kimchi/issues/342 https://github.com/kimchi-project/kimchi/issues/343 -- Thanks and best regards! Zhou Zheng Sheng / 周征晟 E-mail: zhshzhou(a)linux.vnet.ibm.com Telephone: 86-10-82454397

3 5

[PATCH] Report debug report's file path instead of uri path.
by Mark Wu 13 Mar '14

13 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. --- docs/API.md | 3 ++- src/kimchi/control/debugreports.py | 1 + src/kimchi/model/debugreports.py | 6 ++++-- ui/js/src/kimchi.host.js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/API.md b/docs/API.md index b3b6c49..6f4f03a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -668,7 +668,8 @@ 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 + * file: The debug report's file path on kimchi host + * uri: The URI path to download this 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..d6ca620 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -38,6 +38,7 @@ class DebugReport(Resource): def data(self): return {'name': self.ident, 'file': self.info['file'], + 'uri': self.info['uri'], 'time': self.info['ctime']} diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..b144496 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -161,8 +161,10 @@ class DebugReportModel(object): ctime = os.stat(file_target).st_ctime 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, + file_path = os.path.join(path, file_target) + uri_path = os.path.join("/data/debugreports", file_target) + return {'file': file_path, + 'uri': uri_path, 'ctime': ctime} def delete(self, name): diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 7974054..0aaf2f0 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -87,7 +87,7 @@ kimchi.host_main = function() { } kimchi.downloadReport({ - file: report['file'] + file: report['uri'] }); } }], -- 1.8.4.2

1 1

[PATCH] Report debug report's file path instead of uri path.
by Mark Wu 13 Mar '14

13 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. --- docs/API.md | 2 +- src/kimchi/model/debugreports.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index b3b6c49..dd3b470 100644 --- a/docs/API.md +++ b/docs/API.md @@ -668,7 +668,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 + * file: The debug report's file path on kimchi host. * time: The time when the debug report is created * **DELETE**: Remove the Debug Report diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index c6e698b..3dca3ff 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -161,7 +161,7 @@ class DebugReportModel(object): ctime = os.stat(file_target).st_ctime 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) + file_target = os.path.join(path, file_target) return {'file': file_target, 'ctime': ctime} -- 1.8.4.2

2 2

[PATCH] Add Minimal UI Page for the Sample Plugin
by zhshzhou＠linux.vnet.ibm.com 13 Mar '14

13 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Add minimal UI just enough to re-produce issue 342 and 343. https://github.com/kimchi-project/kimchi/issues/342 https://github.com/kimchi-project/kimchi/issues/343 Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- plugins/sample/__init__.py | 3 ++- plugins/sample/sample.conf | 5 +++++ plugins/sample/ui/config/tab-ext.xml | 9 +++++---- plugins/sample/ui/pages/i18n.html.tmpl | 13 +++++++++++++ plugins/sample/ui/pages/tab.html.tmpl | 6 ++++++ 5 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 plugins/sample/ui/pages/i18n.html.tmpl create mode 100644 plugins/sample/ui/pages/tab.html.tmpl diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py index 3183898..2101aed 100644 --- a/plugins/sample/__init__.py +++ b/plugins/sample/__init__.py @@ -26,6 +26,7 @@ from cherrypy import expose from kimchi.config import PluginPaths from kimchi.control.base import Collection, Resource +from kimchi.root import Root from plugins.sample.i18n import messages from plugins.sample.model import Model @@ -33,7 +34,7 @@ from plugins.sample.model import Model model = Model() -class Drawings(Resource): +class Drawings(Root): def __init__(self): Resource.__init__(self, model) self.description = Description(model) diff --git a/plugins/sample/sample.conf b/plugins/sample/sample.conf index c4e80f7..78a9f4e 100644 --- a/plugins/sample/sample.conf +++ b/plugins/sample/sample.conf @@ -5,3 +5,8 @@ uri = "/plugins/sample" [/] tools.trailing_slash.on = False +tools.sessions.on = True +tools.sessions.name = 'kimchi' +tools.sessions.httponly = True +tools.sessions.locking = 'explicit' +tools.sessions.storage_type = 'ram' diff --git a/plugins/sample/ui/config/tab-ext.xml b/plugins/sample/ui/config/tab-ext.xml index 948fa07..b98c126 100644 --- a/plugins/sample/ui/config/tab-ext.xml +++ b/plugins/sample/ui/config/tab-ext.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> - \ No newline at end of file +</tabs-ext> diff --git a/plugins/sample/ui/pages/i18n.html.tmpl b/plugins/sample/ui/pages/i18n.html.tmpl new file mode 100644 index 0000000..04f32dd --- /dev/null +++ b/plugins/sample/ui/pages/i18n.html.tmpl @@ -0,0 +1,13 @@ +<!DOCTYPE html> +<html class="no-js" lang=$lang.lang[0]> +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <title>language</title> +</head> +<body> +<script> +i18n["SampleTab"] = "SampleTab"; +</script> +</body> +</html> diff --git a/plugins/sample/ui/pages/tab.html.tmpl b/plugins/sample/ui/pages/tab.html.tmpl new file mode 100644 index 0000000..49fc4ec --- /dev/null +++ b/plugins/sample/ui/pages/tab.html.tmpl @@ -0,0 +1,6 @@ +<!DOCTYPE html> +<html> +<body> +Hello, world +</body> +</html> -- 1.8.5.3

2 1

[PATCH v6 0/3] UI: Software Update Support
by Hongliang Wang 13 Mar '14

13 Mar '14

Added UI support for software updating. The Host Tab will initially list available updates to user if there are any; or we will disable "Update All" Button if no updates available. Please apply following patch first: * [PATCH] [UI] Grid Enhancement - Show Message when Loading Data v5 -> v6: 6a) Added a loading icon on top of grid when loading data (Adam King's comment) 6b) Removed row number column (Adam King's comment) v4 -> v5: 5a) Disable row selection in software update grid (Thanks to Royce's comment) v3 -> v4: 4a) Added the last update output (Thanks to Aline's comment) 4b) Disabled horizontal resize function of output textarea (Thanks to Aline's comment) 4c) Added "Update Progress" label to the output textarea (Thanks to Aline's comment) 4d) Added refreshing the software grid after updating is finished (Thanks to Aline's comment) 4e) Added software updates grid cleanup when host tab is unloaded v2 -> v3: 3a) Fixed "Update All" Button always being disabled issue (Thanks to Paulo and Aline's comment) 3b) Updated REST API calling according to back-end change 3c) Added in-progress message when system is being updated (Thanks to Aline's comment) v1 -> v2: 2a) Fixed "Update All" Button always being disabled issue (Thanks to Paulo Ricardo Paz Vital's comment) Hongliang Wang (3): Software Update - i18n Translation Strings Software Update - APIs in kimchi.api.js Software Update Support in Host Tab ui/css/theme-default/host.css | 29 ++++++++++++ ui/js/src/kimchi.api.js | 55 +++++++++++++++++++++- ui/js/src/kimchi.host.js | 104 ++++++++++++++++++++++++++++++++++++++---- ui/pages/i18n.html.tmpl | 10 ++++ ui/pages/tabs/host.html.tmpl | 17 +++++++ 5 files changed, 206 insertions(+), 9 deletions(-) -- 1.8.1.4

3 13

[PATCH] [UI] Grid Loading Mask - Some Elements are Missing
by Hongliang Wang 13 Mar '14

13 Mar '14

Some elements were lost and add them back here: 1) Show a message under the icon 2) Put the icon and text in the center both horizontally and vertically 3) Give the mask a opacity value 4) Hide the mask initially Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 3 +++ ui/js/src/kimchi.grid.js | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 761d32f..44ae614 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -214,10 +214,12 @@ } .grid-mask { + background: rgba(190, 190, 190, .9); bottom: 0; left: 0; position: absolute; right: 0; + z-index: 5; } .grid-loading { @@ -225,6 +227,7 @@ height: 68px; left: 0; margin: auto; + position: absolute; right: 0; text-align: center; top: 0; diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index c53e584..7360b36 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -54,10 +54,12 @@ kimchi.widget.Grid = function(params) { '<div class="grid-resizer hidden"></div>', '</div>', '<div class="grid-footer"></div>', - '<div class="grid-mask">', + '<div class="grid-mask hidden">', '<div class="grid-loading">', '<div class="grid-loading-icon"></div>', - '<div class="grid-loading-text"></div>', + '<div class="grid-loading-text">', + i18n['KCHGRD6001M'], + '</div>', '</div>', '</div>', '</div>' -- 1.8.1.4

1 0