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

[PATCH] bug fix: encode the args in KimchiException when is is unicode.
by shaohef＠linux.vnet.ibm.com 13 Mar '14

13 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> I create a pool with name "kīмсhīPool" When libvirt errors with this pool, it will cause the UnicodeDecodeError. File "/home/shhfeng/work/workdir/kimchi/src/kimchi/model/storagepools.py", line 401, in delete {'name': name, 'err': e.get_error_message()}) File "/home/shhfeng/work/workdir/kimchi/src/kimchi/exception.py", line 37, in __init__ msg = _messages.get(code, code) % args UnicodeDecodeError: 'ascii' codec can't decode byte 0xc4 in position 49: ordinal not in range(128) Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/exception.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 74134be..87982ea 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -32,6 +32,9 @@ class KimchiException(Exception): if cherrypy.request.app: msg = self._get_translation(args) else: + for key, value in args.iteritems(): + if isinstance(value, unicode): + args[key] = value.encode('utf-8') msg = _messages.get(code, code) % args pattern = "%s: %s" % (code, msg) -- 1.8.4.2

2 1

[PATCH] [UI] Grid Enhancement - Show Message when Loading Data
by Hongliang Wang 13 Mar '14

13 Mar '14

Sometimes when we draw a grid, the data is not ready and it's a time-consuming task for back-end, so the user will expect that the grid is drawn there, and a "loading" message is on top of the grid while loading data. In this patch, we make this enhancement. Meanwhile, we introduce a "loading" icon which is made based-on Kimchi logo. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/grid.css | 24 +++++++++++++++++++++++ ui/images/theme-default/kimchi-loading.gif | Bin 0 -> 6181 bytes ui/js/src/kimchi.grid.js | 30 ++++++++++++++++++++++++++++- ui/pages/i18n.html.tmpl | 2 ++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 ui/images/theme-default/kimchi-loading.gif diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index 9f8f98e..761d32f 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -212,3 +212,27 @@ width: 0; z-index: 4; } + +.grid-mask { + bottom: 0; + left: 0; + position: absolute; + right: 0; +} + +.grid-loading { + bottom: 0; + height: 68px; + left: 0; + margin: auto; + right: 0; + text-align: center; + top: 0; + width: 49px; +} + +.grid-loading-icon { + background: url("../images/theme-default/kimchi-loading.gif") no-repeat left top; + height: 48px; + width: 49px; +} diff --git a/ui/images/theme-default/kimchi-loading.gif b/ui/images/theme-default/kimchi-loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..af92bfdc0a44170c71fb7406d2c6bc359e176e91 GIT binary patch literal 6181 zcmeI0c{r4N|A3z{gBeT4jC~z5gQ1aa$lffLu_jAVWErAt6_w;Y86)e+5+c-OtdVR< z+N>elB$Y}<C`(;O>OF@RekRrHoVu>xd%b_1_j=EN^WSsL^S$r;`Fy@s)|Li_KH7j5 z@M;Ah0u&DbX3ZyR$WO82v3KPY-7IJj3Lv#b2&O_rYZ1xqygQErl4eLbA0V89l+l+$ zC4wXZc|rkYyKF%EG)O1}loSEP6aX^1C<07<Hyt<&-)NBpq=g|-1{mcy&}l%|5YY1C z(bJdHFqP5Ny~?8?uB~$lsMv~D-=<*S1;|@qEZ_uVbDSKn86a)|x5G&bn!?TlmlX76 zVfvnK@*&0G3z*GVqNcLC-o{Hn?Q=jCVc<3apsGPll1Ah_fpg*{FhI6`3ur>NM12NC z!FC`ooX;l!6|j-;3BXzE+CnXyWv!r}0Zn^-r7mDd!*okFN?VrXgd~MH5sbYE;wt7E zt$e*o6q_cYPKLTM%rfmhQWxT|)4^27#S||~-4|>m6|B1taPf^a6xXxbhI0}!vNqJ* ziXzzK)NTEQwy_VJskvDi2a|PxKmgc&1#mwPcm+tfoL6vVDElA)&&!4`fq;MHGK!+^ z5s*Z&R|^!84dG|niUPFuv-+1Myy^m6NF*O^xbHO}lwq{{=vm_$D;fz1>Ot)3M;sFb zBA8|&idoiKOFB-F{ev<={q2@JfQTo+Ka$Xgju-{y7wnP-j;Cx4tE#uSQSL5p9(D+b z%_T)EH0;6%MU689?VEjN$cg-x@kn-%At7C|!yo&8+a7S{C4tNe<G4;+`V~Kh2as3c zn6eYdzw*d862+Dr3X|DTDR|fOsX`vRe1G-*2;{>E{LP~_{d<Qbi*C4{Q}#bY*_!oW z{xE(r8vkn)W-8*uKf@9`VrfFv9GR-ydvaQTjS-!pt6X8ae_#mOHKNqp#P(gp{WDHu z=$B#O`ZJ?j62B)2-%q#rkc9h<sbbTLdY-l`u;S6tvaX$NDuK7;0&c2vPL9my5F&3X z?rlDN=q7%gIWd=S;@W&Wp|byZ#uT~j`OaQS`sKKnxn-m5V><@j-<5gg-;RnM3SxD| zpBQ+ScmF{4NJ9Pah1Z>@GoQ?!dr@5c@^a<)tM=*km6a8x6+s6J7iS8|(L!gF78nEo zfYK5Kh5%Lo{OWIjs|f&g1Xf^j)EZVR1Bz7l=&m{6o&d+#6i{o6I#Z-{_l<Vfvb)ky zlw>*Uy5gQwIOhu<J#{6$r?qHz3asl(`|}OLXGeSL%LdO883OV)!`{T7J*4x`523_K z!%^MyHNNdad<Y?GOGi-`1Ih<aA8Vnfrr~&HfSNI$L}3)Z_*0^{Ujho}7(AkN&o@4U zv<GSdLT?*PhG8K~Z)uheBrC-|Zk+M1oYI0ei+^;J+fwm6%0e!d7q#c$b`7UqOvF-i za91AG-4Iny8BO*(+;U@AMz!Hhk*61UN8v*`x8h`%r?Z=UHaVoqTb;GLS~u03s~hyJ z?`r+4K^7%N!M?d+=3cpT<?eo?gFpRe%YWT}CYXt8r9)a3Zy=CZZBiUm*p%<(3+z!; z0y_NV@JuW<Jb<n@OU-P6ij>~tt&~Ez?j1t=*TA;Bn?E@m`jj3e`@z()@AYGPv*^m{ zE=T3b>YSA)?>(GYq@fk-Gk%@}b5nOzbhY={?~H1;ILLEZtxe^amdU{fzwgHv?y9su z+~H_=>c*{=6@U*n76Xw89HT>3%EyQx(9Zz*AAgPK|KHbmRu$muh;hP4km*N2cg>~! zqt9EARhcc4a4)%q9`$q6Z+YR6?EU1pv-9`kFgH=O7wRXo?wSkY<F(r0r-9pD>chi< zMR;lbMGNVO4r;EZo)fJ|v(9@lN%_p!&?6&#70RS~RSl1zQO!*KfRV$87q&Xn?=haH zD<{-S{r*0*Z|u_!xnvP~nhPFod$?SDv^*HWeo)Moh;q?>iZ-M_7V`;r$*9;N!5GiL z+)9|pO3vcxvl?xvOOp3>JiuoYl#57>09TBA8^dQ~;?<@&_a4FcTlaTqPIWU7aI8%& z2c{xn&Ooxvbx+1CtUG3JxUkM5$k%YOW3f}|T-8F7f)_w?gsDzW!$<}#s1Et^7_ft( zqTYC-W_QHZWQ;%IZd<MrQ>#N6Y_ZfPdYrYu-28mxov31^BQ4-`ot*oGq(6uLlBiRY zB%l!%1wOe2x8$p;=lKDhl5x(h2(}60bHE(aFyfS||12_m&~9!tkIAmAX%oOti^W;U zHMmU7mTr6}S2Acc$DB>k>|xy-B&Ck<^jFqayNXb17k3I9e<V^jn9R?E$Lp<lA^#1^ zXBm1lC5pCNoJ<S7Um7=Yo0+G*gXI?2FcmgPs~{iZA@B*25m<wC)FOMw@R7FoH)!7J zR1yMdp2*?Qyf-=Qx*~e&cGY$jhFo%Ao^zQX`Ux$;x;@AKVMXlM%&OeHp6ElXuJjhC z6sa%U?<{8iTJHIzUL(k|=1$T4#L_axeBV+1pofq7W5cM+`3`+r0sV%MB+%JNdPKXV zRG|=tWdND-p(;b0+jd9^o4IjR#B31VDB6q`=XjrAxFVg`S|=&tpoiprnY}_00@?!x zG<!2XHC-6yzO<yPQX2fdgUQ>mNJpcTZc(bNMa_XMbm?{9ZCa7tt$rfxl47b_OLT|* z#{3Z_KJfrnL%iDE?pNtDfsO2!WFwZ3jp6(2YMgbz#&Cg+{R*r@;Sa#J1{f|9KKub# zm)Wntvepqh*}O*Vr8QzNfA}M@n2_o^rp(MLv82~T9aM^dM(-N2XbruqtHhT7lvulb zX7hSt+4DEnfc-SL4%jx~OI%<BJywAo$%7ltx3s7A;IH5v|Fe(1pArNrA&r(I5@W&q z`Wt=;WD$w<(>w~%(7hZWhF6jp4EVH;fkB`RTC5m48N$ae#*s^8eVuTK^I#5G%C2gx zHM>gyDQ<%Achu=-*5im+G?dULplJKTEbn7n;zKh6k_ugz=wg<~Le-%$t+vJO$8xal z<ln6kHcGnq>3Ld;m%});6sqOFokYu!81(clcB4ulLj7t@`n^G$V5!P^Ay|aHxO}7e zqoM(pxU%5Wie$fFwM>+I(Wp_N|6U91<|4lX4xXqy`8$<6(n3S`ZjjvMyWFuqgQ2qU zY+$@eo3^J<94Da^GPC=$+Xcr$AQi+&hrl*q;qNJ$k3YXVsn!0PEPx7=GH-*R6Imn? z@Kl>MeI=N}B=ikuCXwXCw7cXEMbN1yq?UD=gb_b>uNv=t#{_I9K9*la4bdT}J<?Ea zOLCP$+bEyH7ulTzr`Fk~J;L7;BDvyq{4%H;%%N)dJ+yv3M?RerC0Bv>ma2UXfm~md zuo?6Sq{^x<w9++Sf}0V0qz(+Yb5tU^zNpP=adP|o*ve<PzOW9CxsCnV7yUDC-d}y$ zANAFjWs92gh2Mk$1&M%+%2tKpd>00Pc~zLWrF5CT#tA%SO&B}l@50oJ!6&)Gy!<9i zqtXwB4_z(%$3F-&Ik&#>gtfw7U-PB=YvDhA_l1Jw7CyYIPR`?3Zs8YJ3(pkL&^)$U zc-tjkT|N1a=#<tUeGxe{H(J2Fx89eD-yXaREaL|L&6+QYUkd-^z$-Uy;XPM{39MWb z=0&>I?tfF5FUy4q6x7y{0@*@vM6qJ5Kq6+|%tazG1}ud0X2I#LAYP2@FIq<dMv}P6 z!38&;qS%C7L3>NLaaz({Rq8qTqeuKWGA~FgGRgeVU?$c!)6AOOQ_(60D(zDb#3QyB z+cL%8?W_S#$KB5C)<Yy|kT%*#G&_s;<UYN294x3{7wOHVc@<`M4cQ>HFIPI8H+dqi z%jv`{Bv42y4olsSQd%sm@wr9?MbXkbAfjl(d-(O#T*98qI?|Jlegg$Yo^Y6gitsLd z&oY4r<rwQBv`H@H9Xh_hsXEqGDCq)WZ-!1Q`|z^sU}KeZt9nY~5k<R1m$$(WstZMm zpK-=E7v@S|Ied~O^=6cJDAn6LLZ|PS7x1hErEJJ_vbT>^qBkj@fU`z1YD(IPi`u7z zqd$vdd$5vsL<^mRinTdv9R?Fjy(OvQJ}lEjvcUO-37KR3wgWjqn!%&3P$6Qie2&Sv z3pVDhV@g&Trs?q+=n_Czbo0ev-vlX_f&+JDO3lOb$ot|R4dn9Ad>KW;zmFo}qVPyA zs8QcWk$l9TK_#u0UF?r#CwwdWm#`zbpk{Y>d@cLMHBz(xRd!wOEW!@1stZ0dy-I59 z98m{YEqgn+?2=1Gc)i-yvX}ly>L7IvpU-SsPby~q+B<+dij1x=dkgOqZrQ2ava|NC zf!c+Ylz{(Rv&dhc)7)PE=P=pE6fxFjmT)LWCDr|+U4`(5Q}G)4)y}oB1$6wy#_Cb9 z)tlME5O>|N6=+6LVgF;j$uJ}B%8)m52ek_0w@D_L*!}jV;?S}Xa{#|9e2(?7SUNH} zS2y6nLdmB0iDTCy-%gfo_nQ?z7|WexkApAz*bpEB#kc8i;N@VM(k#lLzp5OhUH(=U zX3&Bdf$JozM!Ug<9bypu21px-InqDt?Fk83p;j!3&^=}qKQ+dFA(;?ecSkiU8U!IJ z7ogaxka2(kKf>bKU@&Dj{AG2ST3cN_zN{`n#gl?opXhgVpGDIK&7-Tx{rTJP@D!(b zWs$6M!99*D>J6+JVS{Cl$=>{7x0w|DmS236RGQ#%oua86Ut7J$krVx<n2X>5orLN( zfsHjRXSl=xj#Ga{)&MxmY_6)kLKA%x%W&AjujeaBD8I08hpABK!63cYuPG?*IIuOg z`=r?4(EJEZ`F{+J2wiLRt*zn0C#x^3&OlttT@*u6GKaA>^k2(NZOP*I&l)mch)_iC zO??(Kv2~xD++C<fqYFEA^RrQ;?3c65vKat-U>b>(lI)hwO#gLf7x?$t{U|)AL@gjF zRDMa#cc8$%H^GDJ`N)-XTW{U`{BiN!-1EU(Yu7g3=0D&2umAbZ>n~Burke5gMC8WZ VeND9!UFjIxpWWs~tzJ(W{~z1)DdhkF literal 0 HcmV?d00001 diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 20cacc5..b6f6afb 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -54,6 +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-loading">', + '<div class="grid-loading-icon"></div>', + '<div class="grid-loading-text"></div>', + '</div>', + '</div>', '</div>' ]; @@ -150,6 +156,9 @@ kimchi.widget.Grid = function(params) { var toolbarHeight = toolbarNode && $(toolbarNode).height() || 0; gridContentNode.css('top', (captionHeight + toolbarHeight) + 'px'); + var maskNode = $('.grid-mask', gridNode); + maskNode.css('top', (captionHeight + toolbarHeight) + 'px'); + var fillBody = function(container, fields, data) { var tbody = ($('tbody', container).length && $('tbody', container)) || $('<tbody></tbody>').appendTo(container); @@ -263,7 +272,6 @@ kimchi.widget.Grid = function(params) { setBodyListeners(); }; - this.setData(params['data']); this.getSelected = function() { return selectedIndex >= 0 ? this.data[selectedIndex] @@ -374,4 +382,24 @@ kimchi.widget.Grid = function(params) { $('body').off('mousemove', positionResizer); $('body').off('mouseup', endResizing); }; + + var data = params['data']; + if(!data) { + return; + } + + if($.isArray(data)) { + this.setData(data); + return; + } + + if($.isFunction(data)) { + var self = this; + var loadData = data; + maskNode.removeClass('hidden'); + loadData(function(data) { + self.setData(data); + maskNode.addClass('hidden'); + }); + } }; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index ba3a407..1a3a6d2 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -59,6 +59,8 @@ var i18n = { 'KCHAPI6005M': "$_("Create")", 'KCHAPI6006M': "$_("Warning")", + 'KCHGRD6001M': "$_("Loading...")", + 'KCHTMPL6001W': "$_("No iso found")", 'KCHTMPL6002E': "$_("This is not a valid ISO file.")", -- 1.8.1.4

2 1

[PATCH 0/4] Fixes on update and repo management features
by Aline Manera 13 Mar '14

13 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (4): bug fix: Identify update tool based on available system tools bug fix: Identify repository management tool based on available system tools Expose repo_mngt_tool to /config/capabilities Start up Kimchi even if no repo management tool was identified docs/API.md | 2 ++ src/kimchi/i18n.py | 2 +- src/kimchi/mockmodel.py | 4 +++- src/kimchi/model/config.py | 11 ++++++++++- src/kimchi/model/host.py | 31 +++++++++++++++++++++++++++++-- src/kimchi/repositories.py | 27 +++++++++++---------------- src/kimchi/swupdate.py | 33 ++++++++++++++++----------------- tests/test_rest.py | 2 ++ 8 files changed, 74 insertions(+), 38 deletions(-) -- 1.7.10.4

3 13

[PATCH] Correct the Repositories parameter name of is_mirror
by Adam King 13 Mar '14

13 Mar '14

As suggested by Paulo, the current implementation of the Repository API incorrectly looks for a mirrors parameter, when it should look for is_mirror. Correcting the impl. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- src/kimchi/control/host.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index 4fd6b51..edcc0ad 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -113,7 +113,7 @@ class Repositories(Collection): class Repository(Resource): def __init__(self, model, id): super(Repository, self).__init__(model, id) - self.update_params = ["repo_id", "repo_name", "baseurl", "mirrors", + self.update_params = ["repo_id", "repo_name", "baseurl", "is_mirror", "url_args", "gpgcheck", "gpgkey"] self.uri_fmt = "/host/repositories/%s" self.enable = self.generate_action_handler('enable') -- 1.8.1.4

2 1

[PATCH] Added help for host and network tab. Edited help for guests, storage, and templates tab. Signed-off-by: Kersten Richter <kersten@us.ibm.com>
by Kersten Richter 12 Mar '14

12 Mar '14

--- ui/pages/help/guests.dita | 146 +++++++++++++++++++++++----------- ui/pages/help/host.dita | 51 ++++++++++++ ui/pages/help/network.dita | 68 ++++++++++++++++ ui/pages/help/storage.dita | 135 +++++++++++++++++++++----------- ui/pages/help/templates.dita | 179 ++++++++++++++++++++++++++++-------------- 5 files changed, 428 insertions(+), 151 deletions(-) create mode 100644 ui/pages/help/host.dita create mode 100644 ui/pages/help/network.dita diff --git a/ui/pages/help/guests.dita b/ui/pages/help/guests.dita index cc6294c..bae98bb 100644 --- a/ui/pages/help/guests.dita +++ b/ui/pages/help/guests.dita @@ -1,47 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?Pub Sty _display FontColor="red"?> -<?Pub Inc?> -<cshelp id="kimhvirtm" xml:lang="en-us"> - <title>Virtual machines</title> - <shortdesc>The Virtual machines page lists the defined KVM virtual -machines.</shortdesc> - <csprolog> - <csmetadata> - <cswindowtitle>Title of window or panel associated with this help; -for review output only.</cswindowtitle> - <cswidgetlabel>Name of field or control associated with this help; -for review output only</cswidgetlabel> - </csmetadata> - </csprolog> - <csbody> - <p>For each virtual machine, the following information is displayed:<dl><dlentry><dt>Name</dt><dd>Name of the virtual machine.</dd></dlentry><dlentry><dt>CPU</dt><dd>Percentage of processor utilization in the virtual machine.</dd></dlentry><dlentry><dt>Network I/O</dt><dd>Network input/output transmission rate in KB per seconds.</dd></dlentry><dlentry><dt>Disk I/O</dt><dd> Disk input/output transmission rate in KB per seconds.</dd></dlentry><dlentry><dt>Console</dt><dd>Current state of guest operating system console.</dd></dlentry></dl></p> - <p>The following actions icons are displayed for each virtual machine:<dl><dlentry><dt>Reload</dt><dd>Click to reload the displayed data. </dd></dlentry><dlentry><dt>Power</dt><dd>Click to power on the virtual machine. If the icon is red, the -power is off; if the icon is green, the power is on.</dd></dlentry></dl> </p> - <p>The following actions can be selected for each virtual machine:<ul><li>Select <uicontrol>VNC</uicontrol> to connect to the remote console -for the virtual machine.</li><li>Select <uicontrol>Delete</uicontrol> to delete the virtual machine.</li></ul>To create a virtual machine, click the <uicontrol>plus (+)</uicontrol> icon -in the upper right of the page.</p> - </csbody> - <cshelp id="kimhvirtmcrt" xml:lang="en-us"> - <title>Create virtual machine</title> - <shortdesc>Create a virtual machine using an existing template.</shortdesc> - <csprolog> - <csmetadata> - <cswindowtitle>Title of window or panel associated with this help; -for review output only.</cswindowtitle> - <cswidgetlabel>Name of field or control associated with this help; -for review output only</cswidgetlabel> - </csmetadata> - </csprolog> - <csbody> - <p> - <ol> - <li>Type the name to be used to identify the virtual machine.</li> - <li>Click to select a template.</li> - <li>Click <uicontrol>Create</uicontrol>.</li> - </ol> - </p> - </csbody> - </cshelp> - <?Pub Caret -1?> -</cshelp> -<?Pub *0000002746?> +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" + "..\dtd\cshelp.dtd"> +<?Pub Sty _display FontColor="red"?> +<?Pub Inc?> + +<cshelp id="kimhvirtm" xml:lang="en-us"> +<title>Guests</title> +<shortdesc>The <wintitle>Guests</wintitle> page lists the defined +KVM virtual machines.</shortdesc> +<csbody> +<p>For each guest, the following information is displayed:<dl><dlentry> +<dt>Name</dt> +<dd>Name of the virtual machine.</dd> +</dlentry><dlentry> +<dt>CPU</dt> +<dd>Percentage of processor utilization in the virtual machine.</dd> +</dlentry><dlentry> +<dt>Network I/O</dt> +<dd>Network input/output transmission rate in KB per seconds.</dd> +</dlentry><dlentry> +<dt>Disk I/O</dt> +<dd> Disk input/output transmission rate in KB per seconds.</dd> +</dlentry><dlentry> +<dt>Livetile</dt> +<dd rev="rev1">State of guest operating system console, or an icon +that represents the <tm tmtype="tm" trademark="Linux">Linux</tm> distribution +if the guest is not active.</dd> +</dlentry></dl></p> +<p>The following actions icons are displayed for each guest:<dl> +<dlentry> +<dt rev="rev1">Reset</dt> +<dd rev="rev1">Click to reset the guest. </dd> +</dlentry><dlentry> +<dt><tm tmclass="IGNORE" tmtype="reg" trademark="Power">Power</tm> (Start +or Stop)</dt> +<dd>Click to power on or power off the guest. If the icon is red, +the power is off; if the icon is green, the power is on.</dd> +</dlentry></dl> </p> +<p>The following actions can be selected for each guest:<ul> +<li>Select <uicontrol>VNC</uicontrol> to connect to the remote console +for the guest operating system.</li> +<li>Select <uicontrol>Edit</uicontrol> to edit the properties of an +existing guest. Guests can be edited only while stopped.</li> +<li>Select <uicontrol>Delete</uicontrol> to delete the guest.</li> +</ul>To create a guest, or virtual machine, click the <uicontrol>plus +(+)</uicontrol> icon in the upper right of the page.</p> +</csbody> +<cshelp id="kimhvirtmcrt" xml:lang="en-us"> +<title>Create virtual machine</title> +<shortdesc>Create a virtual machine by using an existing template.</shortdesc> +<csbody> +<p> <ol> +<li>Type the name to be used to identify the virtual machine.</li> +<li rev="rev1">Select a template. <ul> +<li>If templates exist, select from displayed templates.</li> +<li>If no templates exist, click <uicontrol>Create a template</uicontrol> to +create a template.</li> +</ul></li> +<li>Click <uicontrol>Create</uicontrol>.</li> +</ol> </p> +</csbody> +</cshelp> +<cshelp id="kimhvirtmedit" xml:lang="en-us"> +<title>Edit guest</title> +<shortdesc rev="rev1">Edit the properties of an existing virtual machine. +Guests can be edited only while stopped.</shortdesc> +<csprolog><csmetadata> +<cswindowtitle>Title of window or panel associated with this help; +for review output only.</cswindowtitle> +<cswidgetlabel>Name of field or control associated with this help; +for review output only</cswidgetlabel> +</csmetadata></csprolog> +<csbody> +<p>For each guest, the following information is displayed:<dl><dlentry> +<dt>Name</dt> +<dd>Name of the virtual machine.</dd> +</dlentry><dlentry> +<dt>CPUs</dt> +<dd>Number of processors.</dd> +</dlentry><dlentry> +<dt>Memory</dt> +<dd>Amount of memory in MB.</dd> +</dlentry><dlentry> +<dt>Icon</dt> +<dd rev="rev2"> Graphic image representing the Linux distribution +to be displayed in place of current status (Livetile) when the guest +is not active.</dd> +</dlentry></dl></p> +<p> Fields that are not disabled can be edited. After you edit a field, +click <uicontrol>Save</uicontrol>. </p> +</csbody> +</cshelp><?Pub Caret -1?> +<?tm 1391540919 3?> +</cshelp> +<?Pub *0000003805?> diff --git a/ui/pages/help/host.dita b/ui/pages/help/host.dita new file mode 100644 index 0000000..d961edc --- /dev/null +++ b/ui/pages/help/host.dita @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" + "..\dtd\cshelp.dtd"> +<?Pub Sty _display FontColor="red"?> +<?Pub Inc?> + +<cshelp id="kimhhost" xml:lang="en-us"> +<title>Host</title> +<shortdesc rev="rev1">The <wintitle>Host</wintitle> page shows information +about the host system, and allows you to shut down, restart, and connect +to the host.</shortdesc> +<csbody> +<p>You can perform the following actions on the host:<ul> +<li>Select <uicontrol>Shut down</uicontrol> to shut down the host +system.</li> +<li>Select <uicontrol>Restart</uicontrol> to restart the host system.</li> +<li rev="rev1">Select <uicontrol>Connect</uicontrol> to open a VNC +connection to the host system, if it is not already connected.</li> +</ul></p> +<p>Click the following sections to display information about the host:<dl> +<dlentry> +<dt>Basic information</dt> +<dd>This section displays the host operating system distribution, +version, and code name, as well as the processor type and amount of +memory in GB.</dd> +</dlentry><dlentry> +<dt>System statistics</dt> +<dd rev="rev1">This section displays graphs to show statistics for +CPU, memory, disk I/O, and network I/O for the host. Select <uicontrol>Collecting +data after leaving this page</uicontrol> to continue collecting data +when the host tab is out of view.</dd> +</dlentry><dlentry> +<dt>Debug reports</dt> +<dd rev="rev1">This section displays debug reports, including name +and file path. You can select from options to generate a new report, +or rename, remove, or download an existing report.<p>The debug report +is generated using the <cmdname>sosreport</cmdname> command. It is +available for Red Hat Enterprise <tm tmtype="tm" trademark="Linux">Linux</tm>, +Fedora, and Ubuntu distributions. The command generates a .tar file +that contains configuration and diagnostic information, such as the +running kernel version, loaded modules, and system and service configuration +files. The command also runs external programs to collect further +information and stores this output in the resulting archive.</p> </dd> +</dlentry></dl></p> +</csbody><?Pub Caret -2?> +<?tm 1392659967 1?> +</cshelp> +<?Pub *0000002392?> diff --git a/ui/pages/help/network.dita b/ui/pages/help/network.dita new file mode 100644 index 0000000..4846d5b --- /dev/null +++ b/ui/pages/help/network.dita @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" + "..\dtd\cshelp.dtd"> +<?Pub Sty _display FontColor="red"?> +<?Pub Inc?> + +<cshelp id="kimhnetw" xml:lang="en-us"> +<title>Network</title> +<shortdesc>The <wintitle>Network</wintitle> page displays information +about the network connection.</shortdesc> +<csbody> +<p><dl><dlentry> +<dt>Network Name</dt> +<dd>Name of the network, or <uicontrol>default</uicontrol>.</dd> +</dlentry><dlentry> +<dt>State</dt> +<dd>State of the network, active (green) or inactive (red). </dd> +</dlentry><dlentry> +<dt>Network type</dt> +<dd>Network type, for example, <uicontrol>NAT</uicontrol> (network +address translation).</dd> +</dlentry><dlentry> +<dt>Interface</dt> +<dd>Network interface, for example, <uicontrol>virbr0</uicontrol> (default).</dd> +</dlentry><dlentry> +<dt>Address space</dt> +<dd>IP address.</dd> +</dlentry></dl></p> +<p>The following actions can be selected:<ul> +<li rev="rev1">Select <uicontrol>Start</uicontrol> to begin the network +connection.</li> +<li>Select <uicontrol>Stop</uicontrol> to end the network connection.</li> +<li>Select <uicontrol>Delete</uicontrol> to delete the connection +information.</li> +</ul>To create a network, click the <uicontrol>plus (+)</uicontrol> icon +in the upper right of the display.</p> +</csbody> +<cshelp id="kimhnetwcrt" xml:lang="en-us"> +<title>Create a network</title> +<shortdesc>Create a network.</shortdesc> +<csbody> +<p> <ol> +<li>Type the name of the network.</li> +<li>Click to select the network type. <dl rev="rev1"><dlentry> +<dt><uicontrol>Isolated</uicontrol></dt> +<dd>Isolated mode. Guests cannot send or receive communication to +or from external systems.</dd> +</dlentry><dlentry> +<dt><uicontrol>NAT</uicontrol></dt> +<dd>Network Address Translation mode. Communication from guests to +external systems uses the host IP address. External systems cannot +initiate communication to guests.</dd> +</dlentry><dlentry> +<dt><uicontrol>Bridged</uicontrol></dt> +<dd>Bridged mode. Guests can communicate with external systems and +be contacted by external systems as if they were physical systems +on the network. For bridged mode, you must specify additional destination +and VLAN information.</dd> +</dlentry></dl><?Pub Caret 224?></li> +<li>Click <uicontrol>Create</uicontrol>.</li> +</ol> </p> +</csbody> +</cshelp> +</cshelp> +<?Pub *0000002571?> diff --git a/ui/pages/help/storage.dita b/ui/pages/help/storage.dita index f9ae93e..9ad0ea4 100644 --- a/ui/pages/help/storage.dita +++ b/ui/pages/help/storage.dita @@ -1,45 +1,90 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="dita.xsl" type="text/xsl" ?> -<?Pub Sty _display FontColor="red"?> -<?Pub Inc?> -<cshelp id="kimhstor" xml:lang="en-us"> - <title>Storage</title> - <shortdesc>The Storage page lists the available storage pools, including the default storage pool.</shortdesc> - <csprolog> - <csmetadata> - <cswindowtitle>Title of window or panel associated with this help; for review output only.</cswindowtitle> - <cswidgetlabel>Name of field or control associated with this help; for review output only</cswidgetlabel> - </csmetadata> - </csprolog> - <csbody> - <p>For each storage pool, the following information is displayed:<dl><dlentry><dt>Name</dt><dd>Name of the storage pool and percentage used.</dd></dlentry><dlentry><dt>State</dt><dd>State of the storage pool, active (green) or inactive (red). </dd></dlentry><dlentry><dt>Location</dt><dd>File path to the location of the storage pool.</dd></dlentry><dlentry><dt>Type</dt><dd><uicontrol>dir</uicontrol> for directory.</dd></dlentry><dlentry><dt>Capacity</dt><dd>Amount of space in the storage pool.</dd></dlentry><dlentry><dt>Allocated</dt><dd>Amount of space already allocated in the storage pool.</dd></dlentry></dl></p> - <p>The following actions can be selected for each storage pool:<ul><li>Select <uicontrol>Activate</uicontrol> to activate the storage -pool so that it can be used.</li><li>Select <uicontrol>Undefine</uicontrol> to remove an inactive storage -pool.</li></ul></p> - <p>To display storage volume details for a storage pool, click the -arrow on the right side of the storage pool row. Details include -the following:<dl><dlentry><dt>Type</dt><dd>The type of storage pool, for example, dir or disk.</dd></dlentry><dlentry><dt>Format</dt><dd>The format, varying dependent on the type.</dd></dlentry><dlentry><dt>Capacity</dt><dd>Size of the storage volume.</dd></dlentry><dlentry><dt>Allocated</dt><dd>Amount of space already allocated in the storage pool.</dd></dlentry></dl>To define a storage pool, click the <uicontrol>plus -(+)</uicontrol> icon in the upper right of the display.</p> - </csbody> - <cshelp id="kimhdefstor" xml:lang="en-us"> - <title>Define a storage pool</title> - <shortdesc> Define a storage pool.</shortdesc> - <csprolog> - <csmetadata> - <cswindowtitle>Title of window or panel associated with this help; for review output only.</cswindowtitle> - <cswidgetlabel>Name of field or control associated with this help; for review output only</cswidgetlabel> - </csmetadata> - </csprolog> - <csbody> - <p> - <ol> - <li>Type the name to be used to identify the storage pool.</li> - <li>Type the file path to the storage pool.</li> - <li>Click <uicontrol>Create</uicontrol>.</li> - </ol> - </p> - </csbody> - </cshelp> - <?Pub Caret -1?> -</cshelp> -<?Pub *0000003013?> +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" + "..\dtd\cshelp.dtd"> +<?Pub Sty _display FontColor="red"?> +<?Pub Inc?> + +<cshelp id="kimhstor" xml:lang="en-us"> +<title>Storage</title> +<shortdesc>The <wintitle>Storage</wintitle> page lists the available +storage pools, including the default storage pool.</shortdesc> +<csbody> +<p>For each storage pool, the following information is displayed:<dl> +<dlentry> +<dt>Name</dt> +<dd>Name of the storage pool and percentage used.</dd> +</dlentry><dlentry> +<dt>State</dt> +<dd>State of the storage pool, active (green) or inactive (red). </dd> +</dlentry><dlentry> +<dt>Location</dt> +<dd>File path to the location of the storage pool.</dd> +</dlentry><dlentry> +<dt>Type</dt> +<dd>Type of storage pool, for example, <uicontrol>dir</uicontrol>.</dd> +</dlentry><dlentry> +<dt>Capacity</dt> +<dd>Amount of space in the storage pool.</dd> +</dlentry><dlentry> +<dt>Allocated</dt> +<dd>Amount of space that is already allocated in the storage pool.</dd> +</dlentry></dl></p> +<p>The following actions can be selected for each storage pool:<ul> +<li>Select <uicontrol>Activate</uicontrol> to activate the storage +pool so that it can be used.</li> +<li>Select <uicontrol>Deactivate</uicontrol> to deactivate an active +storage pool.</li> +<li>Select <uicontrol>Undefine</uicontrol> to remove an inactive storage +pool.</li> +</ul></p> +<p>To display storage volume details for a storage pool, click the +arrow on the right side of the storage pool row. Details include +the following:<dl><dlentry> +<dt>Type</dt> +<dd>The type of volume, for example, <uicontrol>file</uicontrol>.</dd> +</dlentry><dlentry> +<dt>Format</dt> +<dd>The format, varying dependent on the type.</dd> +</dlentry><dlentry> +<dt>Capacity</dt> +<dd>Size of the storage volume.</dd> +</dlentry><dlentry> +<dt>Allocation</dt> +<dd>Amount of space that is already allocated in the storage pool.</dd> +</dlentry></dl><?Pub Caret -2?>To define a storage pool, click the <uicontrol>plus +(+)</uicontrol> icon in the upper right of the display.</p> +</csbody> +<cshelp id="kimhdefstor" xml:lang="en-us"> +<title>Define a storage pool</title> +<shortdesc> Define a storage pool.</shortdesc> +<csbody> +<p> <ol> +<li>In the <uicontrol>Storage pool name</uicontrol> field, type the +name to be used to identify the storage pool.</li> +<li>In the <uicontrol>Storage pool type</uicontrol> list, select the +type: <dl rev="rev1"><dlentry> +<dt><uicontrol>DIR</uicontrol></dt> +<dd>Specifies a directory pool. When selecting <uicontrol>DIR</uicontrol>, +type the <uicontrol>Storage path</uicontrol> (file path to the storage +pool).</dd> +</dlentry><dlentry> +<dt><uicontrol>NFS</uicontrol></dt> +<dd>Specifies a network filesystem pool. When selecting <uicontrol>NFS</uicontrol>, +type the <uicontrol>NFS server IP</uicontrol> address and <uicontrol>NFS +path</uicontrol> (path of the exported directory).</dd> +</dlentry><dlentry> +<dt><uicontrol>iSCSI</uicontrol></dt> +<dd>Specifies a pool based on a target allocated on an iSCSI server. +When selecting <uicontrol>iSCSI</uicontrol>, type the <uicontrol>iSCSI +server</uicontrol> IP address and <uicontrol>Target</uicontrol> on +the iSCSI server. You can optionally select to add iSCSI authentication.</dd> +</dlentry></dl></li> +<li>Click <uicontrol>Create</uicontrol>.</li> +</ol> </p> +</csbody> +</cshelp> +</cshelp> +<?Pub *0000003580?> diff --git a/ui/pages/help/templates.dita b/ui/pages/help/templates.dita index 0a9bcff..5048fc8 100644 --- a/ui/pages/help/templates.dita +++ b/ui/pages/help/templates.dita @@ -1,59 +1,120 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?Pub Sty _display FontColor="red"?> -<?Pub Inc?> -<cshelp id="kimhtempl" xml:lang="en-us"> - <title>Templates</title> - <shortdesc>The Templates page shows the defined virtual machine templates -that can be used to create KVM virtual machines.</shortdesc> - <csprolog> - <csmetadata> - <cswindowtitle>Title of window or panel associated with this help; -for review output only.</cswindowtitle> - <cswidgetlabel>Name of field or control associated with this help; -for review output only</cswidgetlabel> - </csmetadata> - </csprolog> - <csbody> - <p>For each template, the following information is displayed:<dl><dlentry><dt>OS</dt><dd>Name of the operating system or distribution.</dd></dlentry><dlentry><dt>Version</dt><dd>Version of the operating system or distribution.</dd></dlentry><dlentry><dt>CPU</dt><dd>Number of processors defined for the template.</dd></dlentry><dlentry><dt>Memory</dt><dd>Amount of random access memory to be allocated, in MB.</dd></dlentry></dl></p> - <p>The following actions can be selected for each template:<ul><li>Select <uicontrol>Edit</uicontrol> to edit the template.</li><li>Select <uicontrol>Delete</uicontrol> to delete the template.</li></ul>To add a template, click the <uicontrol>plus (+)</uicontrol> icon -in the upper right of the display.</p> - </csbody> - <cshelp id="kimhedittempl" xml:lang="en-us"> - <title>Edit template</title> - <shortdesc>Edit an existing template.</shortdesc> - <csprolog> - <csmetadata> - <cswindowtitle>Title of window or panel associated with this help; -for review output only.</cswindowtitle> - <cswidgetlabel>Name of field or control associated with this help; -for review output only</cswidgetlabel> - </csmetadata> - </csprolog> - <csbody> - <p><ol><li>Edit the following information for the template:<dl><dlentry><dt>Name</dt><dd>Name of the template.</dd></dlentry><dlentry><dt>CPU</dt><dd>Number of processors defined for the template.</dd></dlentry><dlentry><dt>Memory</dt><dd>Memory to be allocated to the virtual machine.</dd></dlentry></dl></li><li>Click <uicontrol>Save</uicontrol>.</li></ol>The following information is displayed but cannot be edited:<dl><dlentry><dt>Vendor</dt><dd>The name of the company that created the operating system or distribution -that the template is configured to use.</dd></dlentry><dlentry><dt>Version</dt><dd>The version of the operating system or distribution that the template -is configured to use.</dd></dlentry></dl></p> - </csbody> - </cshelp> - <?Pub Caret -1?> - <cshelp id="kimhaddtempl"> - <title>Add template</title> - <shortdesc>Add a template from source media.</shortdesc> - <csbody> - <p>Select the location from the following options:<ol><li>Select the location of the source media from the following options:<dl><dlentry><dt>Local ISO image</dt><dd>Select to scan storage pools for installation ISO images available -on the system.</dd></dlentry><dlentry><dt>Remote ISO image</dt><dd>Select to specify a remote location for an installation ISO image.</dd></dlentry></dl></li><li>Click <uicontrol>Create</uicontrol>.</li></ol></p> - </csbody> - </cshelp> - <cshelp id="kimhaddloct"> - <title>Add template - local ISO image</title> - <shortdesc>Add a template from a local ISO image.</shortdesc> - <csbody> - <p>The ISO images available on the system are displayed.<dl><dlentry><dt>OS</dt><dd>Name of the operating system or distribution.</dd></dlentry><dlentry><dt>Version</dt><dd>Version of the operating system or distribution.</dd></dlentry><dlentry><dt>Size</dt><dd>Size of the ISO image.</dd></dlentry></dl></p> - <p>To create a template from an ISO image, complete the following -steps:<ol><li>Choose from the following options:<ul><li>Select an ISO image from which to create a template.</li><li>Select the <uicontrol>All</uicontrol> check box to create a template -from each listed ISO image.</li><li>Select the <uicontrol>I want to use a specific file</uicontrol> check -box to specify a path to the ISO image.</li></ul></li><li>Click <uicontrol>Create</uicontrol>.</li></ol></p> - </csbody> - </cshelp> -</cshelp> -<?Pub *0000004376?> +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" + "..\dtd\cshelp.dtd"> +<?Pub Sty _display FontColor="red"?> +<?Pub Inc?> + +<cshelp id="kimhtempl" xml:lang="en-us"> +<title>Templates</title> +<shortdesc>The <wintitle>Templates</wintitle> page shows the defined +virtual machine templates that can be used to create KVM guests.</shortdesc> +<csbody> +<p>For each template, the following information is displayed:<dl> +<dlentry> +<dt>OS</dt> +<dd>Name of the operating system or distribution.</dd> +</dlentry><dlentry> +<dt>Version</dt> +<dd>Version of the operating system or distribution.</dd> +</dlentry><dlentry> +<dt>CPUs</dt> +<dd>Number of processors that are defined for the template.</dd> +</dlentry><dlentry> +<dt>Memory</dt> +<dd>Amount of random access memory to be allocated, in MB.</dd> +</dlentry></dl></p> +<p>The following actions can be selected for each template:<ul> +<li>Select <uicontrol>Edit</uicontrol> to edit the template.</li> +<li>Select <uicontrol>Delete</uicontrol> to delete the template.</li> +</ul>To add a template, click the <uicontrol>plus (+)</uicontrol> icon +in the upper right of the display.</p> +</csbody> +<cshelp id="kimhedittempl" xml:lang="en-us"> +<title>Edit template</title> +<shortdesc>Edit an existing template.</shortdesc> +<csbody> +<p>For each template, the following information is displayed: <dl> +<dlentry> +<dt>Name</dt> +<dd>Name of the template.</dd> +</dlentry><dlentry> +<dt>Vendor</dt> +<dd>The name of the company that created the operating system or distribution +that the template is configured to use.</dd> +</dlentry><dlentry> +<dt>Version</dt> +<dd>The version of the operating system or distribution that the template +is configured to use.</dd> +</dlentry><dlentry> +<dt>CPU number</dt> +<dd>Number of processors that are defined for the template.</dd> +</dlentry><dlentry> +<dt>Memory</dt> +<dd>Amount of memory in MB to be allocated to the virtual machine.</dd> +</dlentry><dlentry> +<dt>Disk</dt> +<dd rev="rev1">Disk size in GB.</dd> +</dlentry><dlentry> +<dt>CDROM</dt> +<dd>File path to the location of the template.</dd> +</dlentry><dlentry> +<dt>Storage pool</dt> +<dd>Specific storage pool or the default storage pool.</dd> +</dlentry><dlentry> +<dt>Network</dt> +<dd rev="rev1">Default network.</dd> +</dlentry></dl><?Pub Caret 427?> Fields that are not disabled can +be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </p> +</csbody> +</cshelp> +<cshelp id="kimhaddtempl"> +<title>Add template</title> +<shortdesc>Add a template from source media.</shortdesc> +<csbody> +<p>Select the location of the source media from the following options:<dl> +<dlentry> +<dt>Local ISO image</dt> +<dd>Select to scan storage pools for installation ISO images available +on the system.</dd> +</dlentry><dlentry> +<dt>Remote ISO image</dt> +<dd>Select to specify a remote location for an installation ISO image.</dd> +</dlentry></dl></p> +</csbody> +</cshelp> +<cshelp id="kimhaddloct"> +<title>Add template - local ISO image</title> +<shortdesc>Add a template from a local ISO image.</shortdesc> +<csbody> +<p>The ISO images available on the system are displayed.<dl><dlentry> +<dt>OS</dt> +<dd>Name of the operating system or distribution.</dd> +</dlentry><dlentry> +<dt>Version</dt> +<dd>Version of the operating system or distribution.</dd> +</dlentry><dlentry> +<dt>Size</dt> +<dd>Size of the ISO image.</dd> +</dlentry></dl></p> +<p>To create a template from an ISO image, choose from the following +options:<ul> +<li>Select an ISO image from which to create a template, then click <uicontrol>Create +Templates from Selected ISO</uicontrol>.</li> +<li>Select <uicontrol>All</uicontrol> to create a template from each + listed ISO image, then click <uicontrol>Create Templates from Selected +ISO</uicontrol>.</li> +<li rev="rev1">If the ISO image that you want to use does not appear +in the scan results, you can select from the following options:<ul> +<li>Select <uicontrol>I want to use a specific ISO file</uicontrol> to +specify a path to the ISO image.</li> +<li>Click <uicontrol>Search more ISOs</uicontrol> to search for more +ISO images.</li> +</ul></li> +</ul></p> +</csbody> +</cshelp> +</cshelp> +<?Pub *0000004366?> -- 1.7.1

2 2

[PATCH] Commit changes to templates and storage.dita files
by Kersten Richter 12 Mar '14

12 Mar '14

Added info for new storage options and some minor corrections to templates.dita Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/storage.dita | 10 +++++++--- ui/pages/help/templates.dita | 10 ++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ui/pages/help/storage.dita b/ui/pages/help/storage.dita index 9ad0ea4..97ee0cc 100644 --- a/ui/pages/help/storage.dita +++ b/ui/pages/help/storage.dita @@ -54,7 +54,7 @@ the following:<dl><dlentry> </dlentry><dlentry> <dt>Allocation</dt> <dd>Amount of space that is already allocated in the storage pool.</dd> -</dlentry></dl><?Pub Caret -2?>To define a storage pool, click the <uicontrol>plus +</dlentry></dl>To define a storage pool, click the <uicontrol>plus (+)</uicontrol> icon in the upper right of the display.</p> </csbody> <cshelp id="kimhdefstor" xml:lang="en-us"> @@ -81,10 +81,14 @@ path</uicontrol> (path of the exported directory).</dd> When selecting <uicontrol>iSCSI</uicontrol>, type the <uicontrol>iSCSI server</uicontrol> IP address and <uicontrol>Target</uicontrol> on the iSCSI server. You can optionally select to add iSCSI authentication.</dd> -</dlentry></dl></li> +</dlentry><dlentry> +<dt><uicontrol>Logical</uicontrol></dt> +<dd>Specifies a logical volume storage pool. Select the location to +the device in <uicontrol>Device path</uicontrol>.</dd> +</dlentry></dl><?Pub Caret 591?></li> <li>Click <uicontrol>Create</uicontrol>.</li> </ol> </p> </csbody> </cshelp> </cshelp> -<?Pub *0000003580?> +<?Pub *0000003764?> diff --git a/ui/pages/help/templates.dita b/ui/pages/help/templates.dita index 5048fc8..d0122ec 100644 --- a/ui/pages/help/templates.dita +++ b/ui/pages/help/templates.dita @@ -59,14 +59,16 @@ is configured to use.</dd> <dd rev="rev1">Disk size in GB.</dd> </dlentry><dlentry> <dt>CDROM</dt> -<dd>File path to the location of the template.</dd> +<dd>File path to the location of the ISO file used to install the +KVM guest.</dd> </dlentry><dlentry> <dt>Storage pool</dt> <dd>Specific storage pool or the default storage pool.</dd> </dlentry><dlentry> <dt>Network</dt> -<dd rev="rev1">Default network.</dd> -</dlentry></dl><?Pub Caret 427?> Fields that are not disabled can +<dd rev="rev1">Default network interfaces available to the KVM guest. +You can select multiple networks.</dd> +</dlentry></dl><?Pub Caret 681?> Fields that are not disabled can be edited. After you edit a field, click <uicontrol>Save</uicontrol>. </p> </csbody> </cshelp> @@ -117,4 +119,4 @@ ISO images.</li> </csbody> </cshelp> </cshelp> -<?Pub *0000004366?> +<?Pub *0000004468?> -- 1.7.1

3 2

[PATCH] Added a style sheet to make the html look pretty
by Kersten Richter 12 Mar '14

12 Mar '14

Style sheet is called kimchi.css. Not sure how the xsl works so wasn't sure how to get it included in the build. Can someone please take a look? This line needs to be in the header: <link rel="stylesheet" type="text/css" href="kimchi.css" /> I looked around the open source site but didn't see anything promising. let me know if I can do anything to help or if this is a pipe dream. Thanks! Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/kimchi.css | 123 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) create mode 100644 ui/pages/help/kimchi.css diff --git a/ui/pages/help/kimchi.css b/ui/pages/help/kimchi.css new file mode 100644 index 0000000..99d69a7 --- /dev/null +++ b/ui/pages/help/kimchi.css @@ -0,0 +1,123 @@ +BODY { + background: #FFFFFF; + margin-bottom: 1em; + margin-left: .5em; + } +bold { font-weight: bold; } +boldItalic { font-weight: bold; font-style: italic; } +italic { font-style: italic; } +underlined { text-decoration: underline; } +uicontrol { font-weight: bold; } +filepath { font-family: monospace, monospace; }.option { font-family: monospace, monospace; } +cmdname { font-weight: bold; font-family: monospace, monospace; } +.defparmname { font-weight: bold; text-decoration: underline; font-family: monospace, monospace; } +.kwd { font-weight: bold; } +.defkwd { font-weight: bold; text-decoration: underline; } +var { font-style : italic;} +strongwintitle { font-weight : bold; } +parmname { font-weight: bold; font-family: monospace, monospace; white-space: nowrap; } +code { font-family: monospace, monospace; } +pre { font-family: monospace, monospace; } +CITE { font-style: italic; } +EM { font-style: italic; } +STRONG { font-weight: bold; } +VAR { font-style: italic; } +dt { font-weight: bold; } + +/*********************************************************** + * Basic fonts + ***********************************************************/ +body, +td, +th, +caption { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; +} +} +pre, code { + font-family: MS Courier New, Courier, monospace; +} + +h1, h2, h3 { + font-size: 12pt; + font-weight: bold; + color: #336699; +} +h4 { + font-size: 10pt; + font-weight: bold; + color: #336699; +} + + +/*********************************************************** + * Basic indents, padding, and margin + ***********************************************************/ +body { + color: black; + background-color: white; + margin: 0; + padding-top: 0.2em; + padding-left: 0.6em; + padding-right: 0.2em; + padding-bottom: 1em; +} +h1, +h2, +h3, +h4, +h5, +h6 { + padding: 0; + margin-top: 1em; + margin-bottom: 0.75em; + margin-left: 0; + margin-right: 0; +} + +address, +dl, +li, +p { + padding: 0; + margin-top: 0.75em; + margin-bottom: 0.75em; + margin-left: 0; + margin-right: 0; + line-height: 125%; +} +td dl { + margin-left: 2em; +} +pre { + padding: 0; + margin-top: 0.75em; + margin-bottom: 0.75em; + margin-left: 2em; + margin-right: 0; +} +ol, +ul { + padding: 0; + margin-top: 0.75em; + margin-bottom: 0.75em; + margin-left: 2.00em; + margin-right: 0; +} + +dd { + margin-left: 3.00em; + margin-top: 0.75em; + margin-bottom: 0.75em; +} +dt { + margin-left: 1.00em; + margin-top: 0.75em; +} + + + + + + -- 1.7.1

3 2

[PATCH] Changed xsl file to include stylesheet
by Kersten Richter 12 Mar '14

12 Mar '14

I added a line to the dita-help.xsl file in order to get the stylesheet included Signed-off-by: Kersten Richter <kersten(a)us.ibm.com> --- ui/pages/help/dita-help.xsl | 49 ++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ui/pages/help/dita-help.xsl b/ui/pages/help/dita-help.xsl index 18f9496..0954c39 100644 --- a/ui/pages/help/dita-help.xsl +++ b/ui/pages/help/dita-help.xsl @@ -1,24 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns="http://www.w3.org/1999/xhtml"> - <xsl:output method="xml" indent="yes" encoding="UTF-8" /> - - <xsl:template match="/"> - <html> - <head> - <title><xsl:value-of select="/cshelp/title" /></title> - <link rel="shortcut icon" href="../images/logo.ico" /> - </head> - <body> - <xsl:apply-templates select="//cshelp" /> - </body> - </html> - </xsl:template> - - <xsl:template match="cshelp"> - <h1><xsl:value-of select="title" /></h1> - <p class="shortdesc"><xsl:value-of select="shortdesc" /></p> - <p class="csbody"><xsl:copy-of select="csbody/node()" /></p> - </xsl:template> -</xsl:stylesheet> +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml"> + <xsl:output method="xml" indent="yes" encoding="UTF-8" /> + + <xsl:template match="/"> + <html> + <head> + <title><xsl:value-of select="/cshelp/title" /></title> + <link rel="shortcut icon" href="../images/logo.ico" /> +<link rel="stylesheet" type="text/css" href="kimchi.css" /> + </head> + <body> + <xsl:apply-templates select="//cshelp" /> + </body> + </html> + </xsl:template> + + <xsl:template match="cshelp"> + <h1><xsl:value-of select="title" /></h1> + <p class="shortdesc"><xsl:value-of select="shortdesc" /></p> + <p class="csbody"><xsl:copy-of select="csbody/node()" /></p> + </xsl:template> +</xsl:stylesheet> -- 1.7.1

2 1

[PATCH] [UI] Grid Enhancement - "title" Attribute for Long Values
by Hongliang Wang 12 Mar '14

12 Mar '14

Allow programmer to specify whether to add a "title" attribute to a column if he/she is aware that the column may have very long value. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 20cacc5..215d6ea 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -158,9 +158,13 @@ kimchi.widget.Grid = function(params) { var rowNode = $('<tr></tr>').appendTo(tbody); $.each(fields, function(fi, field) { var fieldName = field['name']; - $('<td><div class="cell-text-wrapper">' + - row[fieldName] + - '</div></td>').appendTo(rowNode); + var value = row[fieldName]; + $('<td><div class="cell-text-wrapper"' + + (field['makeTitle'] === true + ? ' title="' + value + '"' + : '' + ) + '>' + value + '</div></td>' + ).appendTo(rowNode); }); }); }; -- 1.8.1.4

2 2

[PATCH] ISO Scan: Use volume set id instead of volume id for some wrong images.
by Mark Wu 12 Mar '14

12 Mar '14

Some RHEL ISO images store the infomation of volume id in the location of volume set id mistakenly. But it's better to support those ISO images since they're already public available. For details, please see: isoinfo -d -i rhel-server-6.5-ppc64-dvd.iso CD-ROM is in ISO 9660 format System id: PPC Volume id: RED_HAT Volume set id: RHEL_6.5 ppc64 Publisher id: Data preparer id: Application id: RHEL_6.5 ppc64 Copyright File id: Abstract File id: Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 Volume size is: 1634718 Joliet with UCS level 3 found Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 8d423ad..b7315e0 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -235,7 +235,16 @@ class IsoImage(object): raise IsoFormatError("KCHISO0006E", {'filename': self.path}) if vd_ident != 'CD001' or vd_ver != 1: raise IsoFormatError("KCHISO0007E", {'filename': self.path}) - self.volume_id = vol_id + if vol_id.strip() == 'RED_HAT': + # Some RHEL ISO images store the infomation of volume id in the + # location of volume set id mistakenly. + self.volume_id = self._get_volume_set_id(data) + else: + self.volume_id = vol_id + + def _get_volume_set_id(self, data): + # The index is picked from ISO-9660 specification. + return data[190: 318] def _get_iso_data(self, offset, size): if self.remote: -- 1.8.4.2

4 3

[PATCH V3 0/3] Issue #302
by shaohef＠linux.vnet.ibm.com 12 Mar '14

12 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3: use lower() to avoid errors with upper/lower case V1 -> V2 re-create the default network if ip conflict let 'create' attr of networks model to create the default network ShaoHe Feng (3): move _default_network_check from top model to networks model add a new function to get an available network address Issue #302: let 'create' attr of networks model to create default network src/kimchi/model/model.py | 35 -------------------------- src/kimchi/model/networks.py | 59 ++++++++++++++++++++++++++++++++++++++------ src/kimchi/network.py | 7 ++++-- 3 files changed, 57 insertions(+), 44 deletions(-) -- 1.8.4.2

3 6

[PATCH] Update guest action menu
by Adam King 11 Mar '14

11 Mar '14

Add menu choices equivalent to the button operations. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/pages/guest.html.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index a9737a5..252a303 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -55,9 +55,12 @@ <div name="actionmenu" class="btn dropdown popable vm-action" style="width: 70px"> <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> - <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Console")</span></button> + <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> <button class="button-big shutoff-disabled" name="vm-media"><span class="text">$_("Manage Media")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit Guest")</span></button> + <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> + <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> + <button class="button-big shutoff-hidden" name="vm-stop"><span class="text">$_("Stop")</span></button> <a class="button-big red " name="vm-delete">$_("Delete")</a> </div> </div> -- 1.8.1.4

4 4

[PATCH V2 0/3] Issue #302
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 re-create the default network if ip conflict let 'create' attr of networks model to create the default network ShaoHe Feng (3): move _default_network_check from top model to networks model add a new function to get an available network address Issue #302: let 'create' attr of networks model to create default network src/kimchi/model/model.py | 35 -------------------------- src/kimchi/model/networks.py | 58 ++++++++++++++++++++++++++++++++++++++------ src/kimchi/network.py | 7 ++++-- 3 files changed, 56 insertions(+), 44 deletions(-) -- 1.8.4.2

2 4

[PATCH] Pass ajaxError information on to original requester on ajaxError event
by Adam King 11 Mar '14

11 Mar '14

The previous implementation of the ajaxError event did not pass along all the available information to the original caller. Corrected with this patch. Display a message if the error is requestRejected. Updated guest vms processing to use the additional information. Corrected the error handler to show the JSON response reason when available. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 6 ++++-- ui/js/src/kimchi.main.js | 8 ++++++-- ui/pages/i18n.html.tmpl | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index bbd8d3d..bdd5a69 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -165,8 +165,10 @@ kimchi.listVmsAuto = function() { } kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); - }, function(err) { - kimchi.message.error(err.responseJSON.reason); + }, function(errorResponse, textStatus, errorThrown) { + if(errorResponse.responseJSON && errorResponse.responseJSON.reason) { + kimchi.message.error(errorResponse.responseJSON.reason); + } kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); }); }; diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 8d12525..aac7e28 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -164,8 +164,12 @@ kimchi.main = function() { }); return; } - - ajaxSettings['originalError'] && ajaxSettings['originalError'](jqXHR); + else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText)) { + kimchi.message.error(i18n['KCHAPI6007E'].replace("%1", jqXHR.state())); + } + if(ajaxSettings['originalError']) { + ajaxSettings['originalError'](jqXHR, jqXHR.statusText, errorThrown); + } }); kimchi.user.showUser(true); diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index bf8a0d7..ba3a407 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -50,6 +50,7 @@ var i18n = { 'KCHAPI6004E': "$_("This is not a valid URL.")", 'KCHAPI6005E': "$_("No such data available.")", 'KCHAPI6006E': "$_("options needed.")", + 'KCHAPI6007E': "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")", 'KCHAPI6001M': "$_("Delete Confirmation")", 'KCHAPI6002M': "$_("OK")", -- 1.8.1.4

2 2

[PATCH] Issue 292 Logical Storage Pool Returning "extended" Partitions as Possible Pool
by zhshzhou＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Extended partition is a container of logical partitions. Kimchi should skip extended partition regardless of it contains logical partitions or not. This patch uses pyparted to check if a partition is a extended partition and skip if it is. Signed-off-by: Zhou Zheng Sheng <zhshzhou(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 | 6 +++--- src/kimchi/disks.py | 19 +++++++++++++++++-- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1b03fc7..c2b2a40 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -15,6 +15,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-libxml2, qemu-kvm, python-pam, + python-parted, python-psutil (>= 0.6.0), python-ethtool, sosreport, diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 149c3a7..bf80104 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -20,6 +20,7 @@ Requires: m2crypto Requires: python-imaging Requires: libxml2-python Requires: PyPAM +Requires: pyparted Requires: python-psutil >= 0.6.0 Requires: python-jsonschema >= 1.3.0 Requires: python-ethtool diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index beddada..cba0899 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -16,6 +16,7 @@ Requires: python-imaging Requires: python-M2Crypto Requires: python-libxml2 Requires: python-pam +Requires: python-parted Requires: python-psutil >= 0.6.0 Requires: python-jsonschema >= 1.3.0 Requires: python-ethtool diff --git a/docs/README.md b/docs/README.md index 5721878..4be0e53 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,7 +53,7 @@ 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 + iscsi-initiator-utils libxslt pyparted # 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 +75,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 + open-iscsi lvm2 xsltproc python-parted Packages version requirement: python-jsonschema >= 1.3.0 @@ -89,7 +89,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 + libxslt-tools python-xml python-parted Packages version requirement: python-psutil >= 0.6.0 diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 8389922..cada869 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -20,6 +20,9 @@ import re import subprocess +from parted import Device as PDevice +from parted import Disk as PDisk + from kimchi.exception import OperationFailed from kimchi.utils import kimchi_log @@ -78,6 +81,17 @@ def _is_dev_leaf(devNodePath): return childrenCount == 0 +def _is_dev_extended_partition(devType, devNodePath): + if devType != 'part': + return False + diskPath = devNodePath.rstrip('0123456789') + device = PDevice(diskPath) + disk = PDisk(device) + if disk.getExtendedPartition().path == devNodePath: + return True + return False + + def _parse_lsblk_output(output, keys): # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, SIZE, MOUNTPOINT, etc @@ -122,12 +136,13 @@ def get_partitions_names(): # Only list unmounted and unformated and leaf and (partition or disk) # leaf means a partition, a disk has no partition, or a disk not held # by any multipath device. Physical volume belongs to no volume group - # is also listed. + # is also listed. Extended partitions should not be listed. if not (dev['type'] in ['part', 'disk'] and dev['fstype'] in ['', 'LVM2_member'] and dev['mountpoint'] == "" and _get_vgname(devNodePath) == "" and - _is_dev_leaf(devNodePath)): + _is_dev_leaf(devNodePath) and + not _is_dev_extended_partition(dev['type'], devNodePath)): continue names.add(name) -- 1.8.5.3

6 6

[PATCH] bug fix: remove the hard code of disk_path
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Usually the path of default pool is under /var/lib/libvirt/images/ But that not means it always is. So remove this hard code. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- tests/test_model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_model.py b/tests/test_model.py index d661247..75cfc45 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -241,7 +241,8 @@ class ModelTests(unittest.TestCase): rollback.prependDefer(inst.vm_delete, 'test-vm-1') vm_info = inst.vm_lookup(params['name']) - disk_path = '/var/lib/libvirt/images/%s-0.img' % vm_info['uuid'] + disk_path = '%s/%s-0.img' % ( + inst.storagepool_lookup('default')['path'], vm_info['uuid']) self.assertTrue(os.access(disk_path, os.F_OK)) self.assertFalse(os.access(disk_path, os.F_OK)) -- 1.8.4.2

5 4

[PATCH] add a method to probe the permission as qemu user
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> now I want to improve the template integrity verification. I need to check the 'qemu' user can open an iso files. This patch is used to 'qemu' user has permission to open a file. Test this patch: $ mkdir -p a/b/c $ touch a/b/c/f $ chmod o-x a/b/c $ sudo PYTHONPATH=src python -c ' from kimchi.utils import probe_file_permission_as_user print probe_file_permission_as_user("a/b/c/f", "qemu")' It will return False change another user, it may return True Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/utils.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index d4ab1a1..baee936 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -22,8 +22,11 @@ # import cherrypy +import grp +from multiprocessing import Process, Queue import os import psutil +import pwd import re import subprocess import urllib2 @@ -234,3 +237,24 @@ def run_setfacl_set_attr(path, attr="r", user=""): set_user = ["setfacl", "--modify", "user:%s:%s" % (user, attr), path] out, error, ret = run_command(set_user) return ret == 0 + + +def probe_file_permission_as_user(file, user): + def probe_permission(q, file, user): + uid = pwd.getpwnam(user).pw_uid + gid = pwd.getpwnam(user).pw_gid + gids = [g.gr_gid for g in grp.getgrall() if user in g.gr_mem] + os.setgid(gid) + os.setgroups(gids) + os.setuid(uid) + try: + with open(file) as f: + q.put(True) + except Exception as e: + q.put(False) + + queue = Queue() + p = Process(target=probe_permission, args=(queue, file, user)) + p.start() + p.join() + return queue.get() -- 1.8.4.2

3 5

[RFC][PATCH V4 0/4] Issue #322
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4 update test case V2 -> V3 sort the import. V1 -> V2 use debug to log the open exception trace stack. It is complex to check the permission for qemu user. There are too many access controlling mechanisms in Linux, such as ACL, traditional ugo+-rwx, SELinux and AppArmor. It's not possible to enumerate and check every access mechanisms if it allows QEMU to access a file. So now I'm simply trying to access the file with qemu user and see if it's OK It is simple and avoid handling corner case. Also I can try to start a simple guest with the given iso. ShaoHe Feng (4): add a method to probe the permission as qemu user qemu user tests: probe the username of qemu process started by libvirt Don't allow templates to be created with ISOs that won't be usable. probe iso permission: update test case Makefile.am | 1 + src/kimchi/i18n.py | 5 ++++ src/kimchi/kvmusertests.py | 64 +++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 13 ++++++++- src/kimchi/utils.py | 26 ++++++++++++++++++ tests/test_model.py | 38 ++++++++++++++++--------- 6 files changed, 133 insertions(+), 14 deletions(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

3 7

[PATCH 0/3] Issue #302
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> let 'create' attr of networks model to create the default network ShaoHe Feng (3): move _default_network_check from top model to networks model add a new function to get an available network address Issue #302: let 'create' attr of networks model to create default network src/kimchi/model/model.py | 35 --------------------------------- src/kimchi/model/networks.py | 46 +++++++++++++++++++++++++++++++++++++------- src/kimchi/network.py | 7 +++++-- 3 files changed, 44 insertions(+), 44 deletions(-) -- 1.8.4.2

3 12

[PATCH 0/4] [UI] Host Repositories Management Support
by Hongliang Wang 11 Mar '14

11 Mar '14

Add host repositories management in this patch set. Hongliang Wang (4): [UI] Add i18n Strings for Repositories Management [UI] Add API Support for Repositories Management [UI] Add/Edit Repository Support [UI] Integrate Repositories Management into Host Tab po/POTFILES.in | 2 + ui/css/theme-default/host.css | 44 +++++++++++ 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 | 126 +++++++++++++++++++++++++++++++ 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, 766 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

4 13

[RFC] UI: Support Selecting SCSI Volume when Creating a VM
by Hongliang Wang 11 Mar '14

11 Mar '14

Hi all, Royce talked this topic with me today that the UI part is missing for SCSI volume selecting when creating a VM. In the current design, VM is created through a template and no extra options are available at VM creation: template defines which pool and disk size, and Kimchi will create a volume in the pool with specified disk size for the VM. Though SCSI volumes are read-only and we can't create anything in SCSI pool, we need allow user to select a volume in SCSI pool. So my initial suggestion to the VM creation UI looks like: /// --- Create VM Window --- /// 1. Virtual Machine Name The name used to identify the virtual machine. If omitted, a name will be chosen based on the template used. [ Text box here to enter VM name ] 2. Template Please choose a template. [ Templates list here to be selected ] 3. Volumes (this part will be only available when SCSI pool is selected in Step 2) [ Volumes list in SCSI pool to be selected ] /// Create /// Does this make sense? If so, I'll send out patches for it.

4 4

[PATCH v4 0/5] [UI] CDROM Management in a VM
by Hongliang Wang 10 Mar '14

10 Mar '14

Allow user to manipulate CDROM(s) in a VM: 1) Attach one or more CDROM(s); 2) Replace a CDROM with another ISO file path; 3) Detach a CDROM from a VM. Tested on Chrome. Please apply the following patch first: * [UI] Window Widget Enhancement - Allow onClose Listener v3 -> v4: 4a) Re-organized UI layout based on Adam King's slides: * Promoted media management for VM as a separate action * Restricted to only CDROM replacement for a running VM 4b) Removed listeners to avoid duplicate functions v2 -> v3: 3a) Keep the edit window silver instead of white (Aline's comment) 3b) Added information after CDROM manipulations to avoid confusion (Aline & Adam King's comment) v1 -> v2: 2a) Separate one patch into 4 small ones to make it easier to review (Thanks to Ramon Medeiros's comment) 2b) Updated API calling to list CDROM (Thanks to Aline's comment) 2c) Separated VM updating window into 2 parts: general and storage (Thanks to Aline's comment) 2d) Enhanced UI to allow user trigger replace CDROM window by clicking ISO file path text box 2e) Changed uneditable fields from readonly to disabled 2f) Removed authors infomation (Thanks to Aline's comment) Hongliang Wang (5): [UI] kimchi.message - Enhancement [UI] Add CDROM-related APIs [UI] Add i18n Variables for CDROM-related Function [UI] Add/Edit CDROM Support [UI] Attach/Replace/Detach a CDROM to/in/from a VM ui/css/theme-default/guest-cdrom-edit.css | 62 +++++++++++ ui/css/theme-default/guest-edit.css | 144 ++++++++++++++++++++++--- ui/css/theme-default/guest-media.css | 42 ++++++++ ui/css/theme-default/guest-storage-add.css | 70 ++++++++++++ ui/images/theme-default/guest-icon-sprite.png | Bin 0 -> 6748 bytes ui/js/src/kimchi.api.js | 74 +++++++++++++ ui/js/src/kimchi.guest_cdrom_edit_main.js | 87 +++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 105 ++++++++++++++++-- ui/js/src/kimchi.guest_main.js | 20 +++- ui/js/src/kimchi.guest_media_main.js | 59 ++++++++++ ui/js/src/kimchi.guest_storage_add.main.js | 85 +++++++++++++++ ui/js/src/kimchi.message.js | 27 ++--- ui/pages/guest-cdrom-edit.html.tmpl | 73 +++++++++++++ ui/pages/guest-edit.html.tmpl | 150 ++++++++++++++++---------- ui/pages/guest-media.html.tmpl | 60 +++++++++++ ui/pages/guest-storage-add.html.tmpl | 80 ++++++++++++++ ui/pages/guest.html.tmpl | 1 + ui/pages/i18n.html.tmpl | 11 ++ 18 files changed, 1063 insertions(+), 87 deletions(-) create mode 100644 ui/css/theme-default/guest-cdrom-edit.css create mode 100644 ui/css/theme-default/guest-media.css create mode 100644 ui/css/theme-default/guest-storage-add.css create mode 100644 ui/images/theme-default/guest-icon-sprite.png create mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js create mode 100644 ui/js/src/kimchi.guest_media_main.js create mode 100644 ui/js/src/kimchi.guest_storage_add.main.js create mode 100644 ui/pages/guest-cdrom-edit.html.tmpl create mode 100644 ui/pages/guest-media.html.tmpl create mode 100644 ui/pages/guest-storage-add.html.tmpl -- 1.8.1.4

3 15

[PATCH] [UI] Adjust CSS for Window
by Hongliang Wang 10 Mar '14

10 Mar '14

It's tightly limited to use the style rules. Make it looser. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/window.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index 09a9840..af8db86 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -49,7 +49,7 @@ max-height: 100%; } -.window>header { +.window header { position: absolute; left: 0; right: 0; @@ -99,12 +99,12 @@ cursor: pointer; } -.window>header>.close:HOVER { +.window header>.close:HOVER { border: 2px solid #444; color: #444; } -.window>header>.title { +.window header>.title { font-size: 18px; height: 48px; line-height: 48px; -- 1.8.1.4

2 1

[PATCH 0/3] Issue 294 The auto logout leaves action menu on page
by Adam King 10 Mar '14

10 Mar '14

When the user session ends, content that should no longer be visible to the unauthenticated user is left in the DOM. The issue as written notes that the guest action menu is displayed above the login window, leading to a buggy user experience. Information about the users guests, storage pools, networks, etc may also be left visible in the browser. Adam King (3): Fix formatting of the requestJSON function Issue 294 The auto logout leaves action menu on page - add classes Issue 294 The auto logout leaves action menu on page - update JS ui/js/src/kimchi.api.js | 2 +- ui/js/src/kimchi.login_window.js | 3 +++ ui/js/src/kimchi.main.js | 2 ++ ui/js/src/kimchi.network.js | 2 +- ui/js/src/kimchi.window.js | 2 +- ui/pages/kimchi-ui.html.tmpl | 2 +- ui/pages/tabs/guests.html.tmpl | 2 +- ui/pages/tabs/host.html.tmpl | 2 +- ui/pages/tabs/network.html.tmpl | 4 ++-- ui/pages/tabs/storage.html.tmpl | 2 +- ui/pages/tabs/templates.html.tmpl | 2 +- 11 files changed, 15 insertions(+), 10 deletions(-) -- 1.8.1.4

3 5

[RFC][PATCH V3 0/3] Issue #322
by shaohef＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V2 sort the import. V1 -> V2 use debug to log the open exception trace stack. It is complex to check the permission for qemu user. There are too many access controlling mechanisms in Linux, such as ACL, traditional ugo+-rwx, SELinux and AppArmor. It's not possible to enumerate and check every access mechanisms if it allows QEMU to access a file. So now I'm simply trying to access the file with qemu user and see if it's OK It is simple and avoid handling corner case. Also I can try to start a simple guest with the given iso. ShaoHe Feng (3): add a method to probe the permission as qemu user qemu user tests: probe the username of qemu process started by libvirt Don't allow templates to be created with ISOs that won't be usable. Makefile.am | 1 + src/kimchi/i18n.py | 5 ++++ src/kimchi/kvmusertests.py | 64 +++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 13 ++++++++- src/kimchi/utils.py | 26 ++++++++++++++++++ 5 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

3 5

[PATCH V3 0/2] bug fix: add an icon distros list.
by shaohef＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 rebase to master V1 -> V2 get this icon distros dinamically clean pep8 for osinfo.py ShaoHe Feng (2): bug fix: add an icon distros list. pep8 clean for osinfo.py Makefile.am | 1 + src/kimchi/osinfo.py | 43 +++++++++++++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 14 deletions(-) -- 1.8.4.2

2 3

[PATCH V2 1/2] bug fix: add an icon distros list.
by shaohef＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Now I create template with rhel iso, but when I create a VM from this template, the template info displays differently with other templates. That's because icon-rhel is missing for it is RED HAT trademark. But this make us uncomfortable. If the icon is missing we should display the default icon Now there are only 7 icons, include the default icon icon-vm. $ ls ui/images/*.png ui/images/icon-centos.png ui/images/icon-gentoo.png ui/images/icon-debian.png ui/images/icon-opensuse.png ui/images/icon-fedora.png ui/images/icon-ubuntu.png ui/images/icon-vm.png Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 106cc0e..905c63a 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -18,12 +18,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import copy +import glob import os from distutils.version import LooseVersion +from kimchi.config import paths + + SUPPORTED_ARCHS = {'x86': ('i386', 'x86_64'), 'power': ('ppc', 'ppc64')} @@ -55,6 +59,8 @@ modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, 'power': {'rhel': '7.0', 'fedora': '19'}} +icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' + % paths.ui_dir, 'icon-*.png')] isolinks = { 'debian': { @@ -100,15 +106,18 @@ def lookup(distro, version): arch = _get_arch() if distro in modern_version_bases[arch]: - params['icon'] = 'images/icon-%s.png' % distro if LooseVersion(version) >= LooseVersion( modern_version_bases[arch][distro]): params.update(template_specs[arch]['modern']) else: params.update(template_specs[arch]['old']) else: - params['icon'] = 'images/icon-vm.png' params['os_distro'] = params['os_version'] = "unknown" params.update(template_specs[arch]['old']) + if distro in icon_available_distros: + params['icon'] = 'images/icon-%s.png' % distro + else: + params['icon'] = 'images/icon-vm.png' + return params -- 1.8.4.2

3 6

[PATCHv2] Allocate enough space for logical volume
by lvroyce＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When creating storage volume, allocation is specified with 0 because previous format is qcow2. As we use raw format in logcial pool now, we need to specify allocation in xml. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index d3bd52e..f227ee6 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -211,10 +211,11 @@ class VMTemplate(object): 'format': fmt, 'path': '%s/%s' % (storage_path, volume)} + info['allocation'] = 0 if fmt == 'qcow2' else info['capacity'] info['xml'] = """ <volume> <name>%(name)s</name> - <allocation>0</allocation> + <allocation unit="G">%(allocation)s</allocation> <capacity unit="G">%(capacity)s</capacity> <target> <format type='%(format)s'/> -- 1.8.1.2

4 3

[PATCH 0/2] Fix help Makefile
by Crístian Viana 10 Mar '14

10 Mar '14

Tested on Fedora 20. Crístian Viana (2): fix: Build new DITA pages when running "make" Build help index page only once ui/pages/help/Makefile.am | 6 ++++-- ui/pages/help/gen-index.py | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) -- 1.8.5.3

2 4

[PATCH] bug fix: add an icon distros list.
by shaohef＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Now I create template with rhel iso, but when I create a VM from this template, the template info displays differently with other templates. That's because icon-rhel is missing for it is RED HAT trademark. But this make us uncomfortable. If the icon is missing we should display the default icon Now there are only 7 icons, include the default icon icon-vm. $ ls ui/images/*.png ui/images/icon-centos.png ui/images/icon-gentoo.png ui/images/icon-debian.png ui/images/icon-opensuse.png ui/images/icon-fedora.png ui/images/icon-ubuntu.png ui/images/icon-vm.png Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 106cc0e..2eac63e 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -55,6 +55,8 @@ modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, 'power': {'rhel': '7.0', 'fedora': '19'}} +icon_available_distros = ['debian', 'centos', 'fedora', + 'gentoo', 'opensuse', 'ubuntu'] isolinks = { 'debian': { @@ -100,15 +102,18 @@ def lookup(distro, version): arch = _get_arch() if distro in modern_version_bases[arch]: - params['icon'] = 'images/icon-%s.png' % distro if LooseVersion(version) >= LooseVersion( modern_version_bases[arch][distro]): params.update(template_specs[arch]['modern']) else: params.update(template_specs[arch]['old']) else: - params['icon'] = 'images/icon-vm.png' params['os_distro'] = params['os_version'] = "unknown" params.update(template_specs[arch]['old']) + if distro in icon_available_distros: + params['icon'] = 'images/icon-%s.png' % distro + else + params['icon'] = 'images/icon-vm.png' + return params -- 1.8.4.2

3 2

[PATCHv7 0/7] Support storage volume ref_cnt
by lvroyce＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> tested: 1. sudo make check 2. from UI: list storage volumes and unrefered volume ref_cnt is 0, ref_cnt for refered ones are 1. Available volumes will be tracked by volume reference count. Add this field to storage volume, so that storage volume/pool action validation can rely on it. Royce Lv (7): Export list vms functionality Fix vm disk path when it does not have source element Add volume ref_cnt: update api.md Add volume ref_cnt: Update controller and json schema Add volume ref_cnt: Add model and mockmodel implementation Add volume ref_cnt: Update test Multiple pep8 fixes docs/API.md | 3 +++ src/kimchi/API.json | 25 +++++++++++++++++++++++++ src/kimchi/control/storagevolumes.py | 1 + src/kimchi/i18n.py | 4 ++++ src/kimchi/mockmodel.py | 10 +++++++--- src/kimchi/model/debugreports.py | 2 +- src/kimchi/model/storagevolumes.py | 30 ++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 2 +- src/kimchi/model/vms.py | 6 +++++- src/kimchi/model/vmstorages.py | 23 +++++++++++++---------- tests/test_model.py | 4 ++++ tests/test_rest.py | 2 ++ 12 files changed, 96 insertions(+), 16 deletions(-) -- 1.8.1.2

3 15

[RFC][PATCH V2 0/3] Issue #322
by shaohef＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 use debug to log the open exception trace stack. It is complex to check the permission for qemu user. There are too many access controlling mechanisms in Linux, such as ACL, traditional ugo+-rwx, SELinux and AppArmor. It's not possible to enumerate and check every access mechanisms if it allows QEMU to access a file. So now I'm simply trying to access the file with qemu user and see if it's OK It is simple and avoid handling corner case. Also I can try to start a simple guest with the given iso. ShaoHe Feng (3): add a method to probe the permission as qemu user qemu user tests: probe the username of qemu process started by libvirt Don't allow templates to be created with ISOs that won't be usable. Makefile.am | 1 + src/kimchi/i18n.py | 5 ++++ src/kimchi/kvmusertests.py | 62 +++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 13 ++++++++- src/kimchi/utils.py | 26 ++++++++++++++++++ 5 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

2 5

[PATCH] Do not show a success msg when creating a template
by Crístian Viana 10 Mar '14

10 Mar '14

Tested on Fedora 20. Crístian Viana (1): Do not show a success msg when creating a template ui/js/src/kimchi.template_add_main.js | 1 - 1 file changed, 1 deletion(-) -- 1.8.5.3

3 5

[PATCH] [UI] Window Widget Enhancement - Allow onClose Listener
by Hongliang Wang 10 Mar '14

10 Mar '14

Sometimes we want to trigger some action when window is being closed. For example, we register some listeners in one window, and we want to unregister them after this window is closed, in this case we can take advantage of this feature. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.window.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.window.js b/ui/js/src/kimchi.window.js index b32ab60..c2af63e 100644 --- a/ui/js/src/kimchi.window.js +++ b/ui/js/src/kimchi.window.js @@ -17,6 +17,7 @@ */ kimchi.window = (function() { var _windows = []; + var _listeners = {}; var open = function(settings) { var settings = jQuery.type(settings) === 'object' ? settings : { url: settings @@ -29,6 +30,7 @@ kimchi.window = (function() { } _windows.push(windowID); + _listeners[windowID] = settings['close']; var windowNode = $('<div></div>', { id: windowID, 'class': settings['class'] ? settings['class'] + ' bgmask' : 'bgmask' @@ -37,9 +39,6 @@ kimchi.window = (function() { $(windowNode).css(settings['style'] || ''); $(windowNode).appendTo('body').on('click', '.window .close', function() { - if (settings.close) { - settings.close(); - } kimchi.window.close(); }); @@ -52,7 +51,14 @@ kimchi.window = (function() { }; var close = function() { - $('#' + _windows.pop()).fadeOut(100, function() { + var windowID = _windows.pop(); + if(_listeners[windowID]) { + _listeners[windowID](); + _listeners[windowID] = null; + } + delete _listeners[windowID]; + + $('#' + windowID).fadeOut(100, function() { $(this).remove(); }); }; -- 1.8.1.4

2 2

[PATCH] Bug fix: Kimchi could not start guest with iscsi lun assigned as disk
by Rodrigo Trujillo 10 Mar '14

10 Mar '14

There is an error in Kimchi when you try to start a guest created based on a template that is using an iscsi storage pool. A lun should be used as disk, but the iscsi case was not being expected and kimchi assigned an .img file to the guest, raising error in the starting. This patch fixed this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index f380170..9825159 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -24,6 +24,7 @@ import urlparse from kimchi import osinfo +from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidParameter, IsoFormatError from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri @@ -271,7 +272,7 @@ class VMTemplate(object): # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) - if self._get_storage_type() == 'scsi': + if self._get_storage_type() in READONLY_POOL_TYPE: params['disks'] = self._get_scsi_disks_xml(kwargs.get('volumes')) else: params['disks'] = self._get_disks_xml(vm_uuid) -- 1.8.5.3

2 2

[PATCH] Rebuild .po files when running "make"
by Crístian Viana 10 Mar '14

10 Mar '14

Tested on Fedora 20. Crístian Viana (1): Rebuild .po files when running "make" po/Makefile.in.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.5.3

3 5

[PATCH] bug fix: setup disks to use cache=none to support live migration.
by Paulo Vital 10 Mar '14

10 Mar '14

When executing a virsh live migration of a VM created by Kimchi, the migration stops due to miss configuration "cache=none" on disk's performance parameters. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index e2d78a4..89b5e72 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -152,7 +152,7 @@ class VMTemplate(object): params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus']} ret += """ <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> + <driver name='qemu' type='qcow2' cache='none'/> <source file='%(src)s' /> <target dev='%(dev)s' bus='%(bus)s' /> </disk> @@ -182,7 +182,7 @@ class VMTemplate(object): # Passthrough configuration disk_xml = """ <disk type='volume' device='lun'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='raw' cache='none'/> <source dev='%(src)s'/> <target dev='%(dev)s' bus='scsi'/> </disk>""" -- 1.8.3.1

7 8

[RFC PATCH 0/3] Issue #322
by shaohef＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> It is complex to check the permission for qemu user. x bit for seach, group, user, selinux and so on. So now I try to open the iso with qemu user. It is simple and avoid handling corner case. Also I can try to start a simple guest with the given iso. ShaoHe Feng (3): add a method to probe the permission as qemu user qemu user tests: probe the username of qemu process started by libvirt Don't allow templates to be created with ISOs that won't be usable. Makefile.am | 1 + src/kimchi/i18n.py | 5 ++++ src/kimchi/kvmusertests.py | 62 +++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 11 +++++++- src/kimchi/utils.py | 26 ++++++++++++++++++ 5 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

2 5

Re: [Kimchi-devel] [PATCH] Don't allow templates to be created with ISOs that won't be usable.
by Sheldon 10 Mar '14

10 Mar '14

On 03/08/2014 04:20 AM, Christy Perez wrote: > Sorry this took me a while to get back to you. Answers below. > > Do you want to pick this back up in the overall kimchi thread? > > > On Thu, 2014-03-06 at 13:29 +0800, Sheldon wrote: >> On 03/04/2014 06:38 AM, Christy Perez wrote: >>> On Wed, 2014-02-26 at 20:26 +0800, Sheldon wrote: >>>> On 02/25/2014 08:23 AM, Christy Perez wrote: >>>>> qemu can't use an ISO if 'other' can't execute all the directories >>>>> containing the file. Return an error explaning this, and suggest >>>>> the way to fix it. >>>>> >>>>> Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> >>>>> --- >>>>> po/en_US.po | 6 ++++++ >>>>> src/kimchi/exception.py | 4 ++++ >>>>> src/kimchi/i18n.py | 2 ++ >>>>> src/kimchi/utils.py | 9 +++++++++ >>>>> src/kimchi/vmtemplate.py | 7 +++++-- >>>>> 5 files changed, 26 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/po/en_US.po b/po/en_US.po >>>>> index ca1fe86..38af64c 100644 >>>>> --- a/po/en_US.po >>>>> +++ b/po/en_US.po >>>>> @@ -674,6 +674,12 @@ msgid "Bad format while reading volume descriptor in ISO %(filename)s" >>>>> msgstr "" >>>>> >>>>> #, python-format >>>>> +msgid "The hypervisor doesn't have permission to use this ISO %(filename)s. \ >>>>> + Consider moving it under /var/lib/libvirt, or \ >>>>> + (not recommended) 'chmod -R o+x 'path_to_iso'." >>>>> +msgstr "" >>>>> + >>>>> +#, python-format >>>>> msgid "Virtual machine %(name)s already exists" >>>>> msgstr "" >>>>> >>>>> diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py >>>>> index 2d974a8..263bd0c 100644 >>>>> --- a/src/kimchi/exception.py >>>>> +++ b/src/kimchi/exception.py >>>>> @@ -75,6 +75,10 @@ class InvalidParameter(KimchiException): >>>>> pass >>>>> >>>>> >>>>> +class InvalidPermission(KimchiException): >>>>> + pass >>>>> + >>>>> + >>>>> class InvalidOperation(KimchiException): >>>>> pass >>>>> >>>>> diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py >>>>> index fea0184..05b347c 100644 >>>>> --- a/src/kimchi/i18n.py >>>>> +++ b/src/kimchi/i18n.py >>>>> @@ -57,6 +57,8 @@ messages = { >>>>> "KCHISO0005E": _("Invalid El Torito boot indicator in ISO %(filename)s"), >>>>> "KCHISO0006E": _("Unexpected volume type for primary volume in ISO %(filename)s"), >>>>> "KCHISO0007E": _("Bad format while reading volume descriptor in ISO %(filename)s"), >>>>> + "KCHISO0008E": _("The hypervisor doesn't have permission to use this ISO %(filename)s. \ >>>>> + Consider moving it under /var/lib/libvirt, or (not recommended) 'chmod -R o+x 'path_to_iso'." ), >>>>> >>>>> "KCHVM0001E": _("Virtual machine %(name)s already exists"), >>>>> "KCHVM0002E": _("Virtual machine %(name)s does not exist"), >>>>> diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py >>>>> index 6be1c04..c325be3 100644 >>>>> --- a/src/kimchi/utils.py >>>>> +++ b/src/kimchi/utils.py >>>>> @@ -27,6 +27,7 @@ import psutil >>>>> import re >>>>> import subprocess >>>>> import urllib2 >>>>> +import stat >>>>> from threading import Timer >>>>> >>>>> from cherrypy.lib.reprconf import Parser >>>>> @@ -234,3 +235,11 @@ def run_setfacl_set_attr(path, attr="r", user=""): >>>>> set_user = ["setfacl", "--modify", "user:%s:%s" % (user, attr), path] >>>>> out, error, ret = run_command(set_user) >>>>> return ret == 0 >>>>> + >>>>> +def check_iso_path_perm(path): >>>>> + """ >>>>> + libvirt requires that all parent dirs have o+x >>>>> + """ >>>>> + if path == '/': return True >>>>> + return os.stat(path).st_mode & stat.S_IXOTH and \ >>>>> + check_iso_path_perm(os.path.dirname(path)) >>>> just test other's permission is not enough. >>>> 1. when the path user is qemu. why we need S_IXOTH? >>> That's what the libvirt doc says, and what I've found is needed: " The >>> directories containing disk images must either have their ownership set >>> to match the user/group configured for QEMU, or their UNIX file >>> permissions must have the 'execute/search' bit enabled for 'others'. " >>> Source: http://libvirt.org/drvqemu.html >> so that's means the disk images without S_IXOTH, qemu still can have >> search permissions right? > Yep. > The images themselves won't have S_IXOTH. qemu will own them, though: > > [root@kop4 kimchi-ginger-pkvm]# ls -lah /var/lib | grep libvirt > drwxr-xr-x. 9 root root 4.0K Feb 19 11:16 libvirt > [root@kop4 kimchi-ginger-pkvm]# ls -lah /var/lib/libvirt | grep images > drwx--x--x. 2 root root 4.0K Mar 7 06:22 images > [root@kop4 kimchi-ginger-pkvm]# ls -lah /var/lib/libvirt/images/ > total 2.9G > drwx--x--x. 2 root root 4.0K Mar 7 06:22 . > drwxr-xr-x. 9 root root 4.0K Feb 19 11:16 .. > -rw-------. 1 qemu qemu 193K Mar 7 06:22 > 2f7130eb-539c-4401-82eb-cccd18708f56-0.img > -r--r--r--. 1 qemu qemu 2.9G Mar 7 06:20 > RHEL-7.0-20140226.0-Server-ppc64-dvd1.iso > >> o+x is sufficient but not necessary condition? > o+x is necessary. >>>> 2. as you said "libvirt requires that all parent dirs have o+x" >>>> you has adding 'X' to the ACL for each directory to try it. >>>> I wander have check your ACL enable? >>> I don't think the ACL will be enough. It looks like it has to have o+x >>> for all parent paths. And yes, my ACLs were enabled on my filesystem. >> That's strangely. but the docs http://libvirt.org/drvqemu.html >> says: >> it simple to set o+x, means this is the only way. > Yes, I think so. it is strange from what I test, it seems o+x is not necessary but sufficient. I really want to know why o+x is necessary and why it is the only way to check the permission. I have try 5 test case with kimchi. 1. There's a iso on my laptop, with o+x permission $ ls /home/shhfeng/iso/RHEL6.4-20130123.0-Server-x86_64-DVD1.iso /home/shhfeng/iso/RHEL6.4-20130123.0-Server-x86_64-DVD1.iso $ ls /home/shhfeng/ -l |grep iso drwxrwxrwx. 4 shhfeng shhfeng 4096 Oct 3 00:22 iso I can create a vm and start is successfully. 2. Now I remove x permission $ sudo chmod o-x /home/shhfeng/iso $ ls /home/shhfeng/ -l |grep iso drwxrwxrw-. 4 shhfeng shhfeng 4096 Oct 3 00:22 iso I failed to start it for permission. 3. I change the own of this iso, still without x permission. $ sudo chown qemu:qemu /home/shhfeng/iso $ ls /home/shhfeng/ -l |grep iso drwxrwxrw-. 4 qemu qemu 4096 Oct 3 00:22 iso Now I can start it successfully. 4. just set the qemu user as search permission. $ sudo chown shhfeng:shhfeng /home/shhfeng/iso/ $ ls -l /home/shhfeng/ |grep iso drwxrwxrw-. 4 shhfeng shhfeng 4096 Oct 3 00:22 iso $ setfacl -m u:qemu:x /home/shhfeng/iso $ getfacl /home/shhfeng/iso getfacl: Removing leading '/' from absolute path names # file: home/shhfeng/iso # owner: shhfeng # group: shhfeng user::rwx user:qemu:--x group::rwx mask::rwx other::rw- Now I can also start it successfully. 5. remove qemu user as search permission, add set the 'kvm' group to the path, qemu is in "kvm" group $ setfacl -x u:qemu /home/shhfeng/iso $ groups qemu qemu : qemu kvm $ sudo chown shhfeng:kvm /home/shhfeng/iso/ Now I can also start it successfully. only case 2, the kimchi deny to start vm for permission. I write a python script checkperm.py It is the same result of libvirt run qemu. you can have a try. If others do like like checkperm.py, I think we can probe the permission by let libvirt to start the guest with the iso. $ sudo python checkperm.py /home/shhfeng/iso/RHEL6.4-20130123.0-Server-x86_64-DVD1.iso # checkperm.py 1 from multiprocessing import Process, Queue 2 import sys 3 import grp 4 import os 5 import pwd 6 7 8 def probe_file_permission_as_user(file, user): 9 def probe_permission(q, file, user): 10 uid = pwd.getpwnam(user).pw_uid 11 gid = pwd.getpwnam(user).pw_gid 12 gids = [g.gr_gid for g in grp.getgrall() if user in g.gr_mem] 13 os.setgid(gid) 14 os.setgroups(gids) 15 os.setuid(uid) 16 try: 17 with open(file): 18 q.put(True) 19 except Exception: 20 q.put(False) 21 22 queue = Queue() 23 p = Process(target=probe_permission, args=(queue, file, user)) 24 p.start() 25 p.join() 26 return queue.get() 27 28 if __name__ == '__main__': 29 print probe_file_permission_as_user(sys.argv[1], 'qemu') >> """ >> The simplest option is the latter one, of just enabling the >> 'execute/search' bit. For any directory to be used for storing disk >> images, this can be achieved by running the following command on the >> directory itself, and any parent directories >> >> chmod o+x /path/to/directory >> >> In particular note that if using the "system" instance and attempting to >> store disk images in a user home directory, the default permissions on >> $HOME are typically too restrictive to allow access. >> """ >> >> >>>> 3. have you check add qemu in all the paths group? >>>> and open set g+x? >>>> >>>> >>>> can you try my patch, seen it can works? >>>> add a method to probe the permission as qemu user >>> I don't see how the patch listed there will apply. Maybe github >>> reformats it strangely when you paste it in? >>> >>> Even so, as I pasted from the libvirt doc, I don't think that will be >>> enough to make libvirt happy. >> save as, and git apply. but I think it will not successfully, for the >> upstream changes so quickly. >> Yes, we should make libvirt and kimchi user happy? > I think it's a security leak to allow someone to put a file in one > directory, and then we give o+x to every parent of it. If I put an ISO > at /home/christy/example.iso and kimchi changed recursively all parents > to o+x, it would give all users the ability to see what's in /home/. >>>>> diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py >>>>> index af07ee3..76ac772 100644 >>>>> --- a/src/kimchi/vmtemplate.py >>>>> +++ b/src/kimchi/vmtemplate.py >>>>> @@ -29,9 +29,9 @@ import urlparse >>>>> >>>>> from kimchi import isoinfo >>>>> from kimchi import osinfo >>>>> -from kimchi.exception import InvalidParameter, IsoFormatError >>>>> +from kimchi.exception import InvalidParameter, IsoFormatError, InvalidPermission >>>>> from kimchi.isoinfo import IsoImage >>>>> - >>>>> +from kimchi.utils import check_iso_path_perm >>>>> >>>>> QEMU_NAMESPACE = "xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'" >>>>> >>>>> @@ -55,6 +55,9 @@ class VMTemplate(object): >>>>> iso_distro = iso_version = 'unknown' >>>>> iso = args.get('cdrom', '') >>>>> >>>>> + if iso.startswith('/') and \ >>>>> + not check_iso_path_perm(os.path.dirname(iso)): >>>>> + raise InvalidPermission("KCHISO0008E", {'filename': iso}) >>>>> if scan and len(iso) > 0: >>>>> iso_distro, iso_version = self.get_iso_info(iso) >>>>> if not iso.startswith('/'): >>> Regards, >>> >>> - Christy >>> >> > Regards, > > - Christy > -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 1

[PATCHv2 0/2] Make vms model singleton
by lvroyce＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Everytime when when VMsModel.get_list() need to be called one more background task to collect vm status is started. Fix this by making vms model singleton. Royce Lv (2): Make vms model to be a singleton Hack test_model to support vm model singleton src/kimchi/model/vms.py | 3 +++ tests/test_model.py | 2 ++ 2 files changed, 5 insertions(+) -- 1.8.1.2

5 10

[PATCH] [UI] Window - Correct Footer Height
by Hongliang Wang 07 Mar '14

07 Mar '14

The footer height is 56 pixel, though window content only leaves 48 pixel for it by: margin: 48px 0; Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/window.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index 09a9840..7e057fd 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -77,7 +77,7 @@ top: 0; bottom: 0; overflow: auto; - margin: 48px 0; + margin: 48px 0 56px; } .window .close { -- 1.8.1.4

4 3

[PATCHv1 0/2] fix create vm on logical pool
by lvroyce＠linux.vnet.ibm.com 07 Mar '14

07 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> VG path is create under 'dev' and logical volume's format should be raw, to avoid qcow2 write exceed problem. Royce Lv (2): Fix storage volume format on logical pool for vm logical pool: Fix logical pool target path src/kimchi/model/libvirtstoragepool.py | 2 +- src/kimchi/vmtemplate.py | 8 +++++--- tests/test_storagepool.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) -- 1.8.1.2

2 4

[PATCH] Use a pool of threads to valid all remote ISOs in parallel
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> That way we can reduce processing time in 8s. Without threads the requests takes 15s to complete: GET http://localhost:8000/config/distros 200 OK 10.64s And with the pool of threads it takes 2s: GET http://localhost:8000/config/distros 200 OK 2.01s Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/config.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/kimchi/model/config.py b/src/kimchi/model/config.py index d44ef90..3580ad3 100644 --- a/src/kimchi/model/config.py +++ b/src/kimchi/model/config.py @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +from multiprocessing.pool import ThreadPool + import cherrypy from kimchi.basemodel import Singleton @@ -91,12 +93,16 @@ class DistrosModel(object): self.distros = distroloader.get() def get_list(self): - res = [] - # only return distro with valid URL - for distro, data in self.distros.iteritems(): - url = data['path'] - if check_url_path(url): - res.append(distro) + def validate_distro(distro): + if check_url_path(distro['path']): + return distro['name'] + + n_processes = len(self.distros.keys()) + pool = ThreadPool(processes=n_processes) + map_res = pool.map_async(validate_distro, self.distros.values()) + pool.close() + pool.join() + res = list(set(map_res.get()) - set([None])) return sorted(res) -- 1.7.10.4

2 3

[PATCH] bug fix: "sudo: sorry, you must have a tty to run sudo".
by Paulo Vital 07 Mar '14

07 Mar '14

The authorization code executes some sudo commands in backend to check if the user used to login in Kimchi has permission to execute privileged commands. By default, sudo needs a TTY to be executed and when Kimchi is executed as a service by systemd (systemctl start kimchid.service), it runs disconnected from any TTY, and sudo returns an error and the message: "sudo: sorry, you must have a tty to run sudo". This patch sets in Kimchi service file for systemd the /dev/tty11 as default TTY to execute the service. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- contrib/kimchid.service.fedora | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/kimchid.service.fedora b/contrib/kimchid.service.fedora index 7abe49b..5f274fb 100644 --- a/contrib/kimchid.service.fedora +++ b/contrib/kimchid.service.fedora @@ -8,6 +8,9 @@ Type=simple ExecStart=/usr/bin/kimchid ExecStop=/bin/kill -TERM $MAINPID EnvironmentFile=/etc/kimchi/kimchi.conf +StandardInput=tty +StandardOutput=tty +TTYPath=/dev/tty11 [Install] WantedBy=multi-user.target -- 1.8.3.1

2 2

[PATCH 0/3] Fix issue #301
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (3): issue #301: Only list remote ISOs with valid URL issue #301: Add a loading message while listing default remote ISOs Update distros JSON files to always point to a valid URL po/en_US.po | 8 +++++++- po/kimchi.pot | 8 +++++++- po/pt_BR.po | 8 +++++++- po/zh_CN.po | 8 +++++++- src/distros.d/debian.json | 4 ++-- src/distros.d/gentoo.json | 6 +++--- src/kimchi/model/config.py | 10 ++++++++-- ui/js/src/kimchi.template_add_main.js | 4 ++++ ui/pages/template-add.html.tmpl | 12 +++++++++++- 9 files changed, 56 insertions(+), 12 deletions(-) -- 1.7.10.4

3 8

[PATCH] Increase memory size for vm template on ppc platform
by Mark Wu 07 Mar '14

07 Mar '14

The minimum memory size required by graphics installer is 1280. So to allow user install vm in graphics, this patch increases it to 1280. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index a50daae..106cc0e 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -42,11 +42,12 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', sound_model= 'ich6')}, 'power': {'old': dict(common_spec, disk_bus='scsi', nic_model='spapr-vlan', cdrom_bus='scsi', - kbd_bus='usb', mouse_bus='usb'), + kbd_bus='usb', mouse_bus='usb', + memory=1280), 'modern': dict(common_spec, disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', - mouse_bus='usb')}} + mouse_bus='usb', memory=1280)}} modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', -- 1.8.4.2

2 1

[PATCH 1/3] Fix issue #339: Enable backend to handle not persistent pools
by Rodrigo Trujillo 07 Mar '14

07 Mar '14

This patch changes the error message when storage pool is not found and adds the isPersistent checkings, in order to return correctly from deactivate function. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/control/storagepools.py | 3 ++- src/kimchi/model/storagepools.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/kimchi/control/storagepools.py b/src/kimchi/control/storagepools.py index 62f9525..b75bca0 100644 --- a/src/kimchi/control/storagepools.py +++ b/src/kimchi/control/storagepools.py @@ -90,7 +90,8 @@ class StoragePool(Resource): 'source': self.info['source'], 'type': self.info['type'], 'nr_volumes': self.info['nr_volumes'], - 'autostart': self.info['autostart']} + 'autostart': self.info['autostart'], + 'persistent': self.info['persistent']} val = self.info.get('task_id') if val: diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index fe70fa1..fea19f6 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -175,7 +175,7 @@ class StoragePoolModel(object): return conn.storagePoolLookupByName(name.encode("utf-8")) except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_NO_STORAGE_POOL: - raise NotFoundError("KCHTMPL0002E", {'name': name}) + raise NotFoundError("KCHPOOL0002E", {'name': name}) else: raise @@ -229,6 +229,7 @@ class StoragePoolModel(object): pool = self.get_storagepool(name, self.conn) info = pool.info() autostart = True if pool.autostart() else False + persistent = True if pool.isPersistent() else False xml = pool.XMLDesc(0) path = xmlutils.xpath_get_text(xml, "/pool/target/path")[0] pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] @@ -254,7 +255,8 @@ class StoragePoolModel(object): 'capacity': info[1], 'allocated': info[2], 'available': info[3], - 'nr_volumes': nr_volumes} + 'nr_volumes': nr_volumes, + 'persistent': persistent} if not pool.isPersistent(): # Deal with deep scan generated pool @@ -354,10 +356,15 @@ class StoragePoolModel(object): {'name': name, 'server': source['addr']}) return try: + persistent = pool.isPersistent() pool.destroy() except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0010E", {'name': name, 'err': e.get_error_message()}) + # If pool was not persistent, then it was erased by destroy() and + # must return nothing here, to trigger _redirect() and avoid errors + if not persistent: + return "" def delete(self, name): if self._pool_used_by_template(name): -- 1.8.5.3

3 6

[PATCH] Fix rollback order
by Rodrigo Trujillo 07 Mar '14

07 Mar '14

This patch changes the order of two rollback calls, avoiding the chance of tests left a test file or a test vm in the system. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_model.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f849039..1fa40fa 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -179,10 +179,10 @@ class ModelTests(unittest.TestCase): iso_path = '/tmp/existent.iso' iso_path2 = '/tmp/existent2.iso' open(iso_path, 'w').close() - open(iso_path2, 'w').close() - wrong_iso_path = '/nonexistent.iso' rollback.prependDefer(os.remove, iso_path) + open(iso_path2, 'w').close() rollback.prependDefer(os.remove, iso_path2) + wrong_iso_path = '/nonexistent.iso' # Create a cdrom cdrom_args = {"type": "cdrom", @@ -546,9 +546,9 @@ class ModelTests(unittest.TestCase): params_1 = {'name': 'kimchi-vm1', 'template': '/templates/test'} params_2 = {'name': 'kimchi-vm2', 'template': '/templates/test'} inst.vms_create(params_1) - inst.vms_create(params_2) rollback.prependDefer(self._rollback_wrapper, inst.vm_delete, 'kimchi-vm1') + inst.vms_create(params_2) rollback.prependDefer(self._rollback_wrapper, inst.vm_delete, 'kimchi-vm2') -- 1.8.5.3

3 2

[PATCH] bug fix: Set default flags for virDomain.state() function
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Some libvirt versions do not set the default value for flags, so we need to explicity set it. libvirt.virDomain.state = state(self, flags) unbound libvirt.virDomain method Otherwise, the following error will be raised [06/Mar/2014:23:40:05] HTTP Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/cherrypy/_cprequest.py", line 656, in respond response.body = self.handler() File "/usr/lib/python2.7/dist-packages/cherrypy/lib/encoding.py", line 188, in __call__ self.body = self.oldhandler(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/cherrypy/_cpdispatch.py", line 34, in __call__ return self.callable(*self.args, **self.kwargs) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 71, in wrapper ident = fn(*model_args) File "/home/alinefm/kimchi/src/kimchi/model/networks.py", line 214, in deactivate if self._get_vms_attach_to_a_network(name, "running"): File "/home/alinefm/kimchi/src/kimchi/model/networks.py", line 199, in _get_vms_attach_to_a_network state == dom.state()[0]): File "/home/alinefm/kimchi/src/kimchi/model/libvirtconnection.py", line 62, in wrapper ret = f(*args, **kwargs) TypeError: state() takes exactly 2 arguments (1 given) Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/networks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index f032875..0d6ccec 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -196,7 +196,7 @@ class NetworkModel(object): for dom in conn.listAllDomains(0): networks = self._vm_get_networks(dom) if network in networks and (state is None or - state == dom.state()[0]): + state == dom.state(0)[0]): vms.append(dom.name()) return vms -- 1.7.10.4

4 4

[PATCH] Issue #222: add python-xml to suse require list
by shaohef＠linux.vnet.ibm.com 07 Mar '14

07 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> check on suse xml.etree module is from python-xml on suse. need to add python-xml to require list This is different from fedora distro. xml.etree module is from python standlib python-libs on fedora issue: https://github.com/kimchi-project/kimchi/issues/222 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- contrib/kimchi.spec.suse.in | 1 + docs/README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 99b4fea..beddada 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -21,6 +21,7 @@ Requires: python-jsonschema >= 1.3.0 Requires: python-ethtool Requires: python-ipaddr Requires: python-lxml +Requires: python-xml Requires: nfs-client Requires: open-iscsi BuildRequires: libxslt-tools diff --git a/docs/README.md b/docs/README.md index fcf53c5..5721878 100644 --- a/docs/README.md +++ b/docs/README.md @@ -89,7 +89,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 + libxslt-tools python-xml Packages version requirement: python-psutil >= 0.6.0 -- 1.8.4.2

2 1

[PATCH v2] storage volume: fix xml parsing of logical volume format type
by zhshzhou＠linux.vnet.ibm.com 07 Mar '14

07 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Not all types of libvirt storage volume provide format information. Particularly, the volume in logical pool doesn't have format information in the dumped XML description. StorageVolumeModel.lookup assumes there is a format tag, but for logical pool volumes it does not exist. So an exception is raised when it lookup a logical volume. To trigger this problem, firstly create a guest using a logical pool. Then click the logical pool from the "storage" tab, and it would fail to list the volumes. This patch catches the exception when parsing the format tag, and returns an 'raw' for the format attribute if there is no available format information in the XML. v2 Return 'raw' instead of return empty string, because the only supported volume format of a logical pool is 'raw'. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 442ff89..6811e15 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -113,7 +113,14 @@ class StorageVolumeModel(object): path = vol.path() info = vol.info() xml = vol.XMLDesc(0) - fmt = xmlutils.xpath_get_text(xml, "/volume/target/format/@type")[0] + try: + fmt = xmlutils.xpath_get_text( + xml, "/volume/target/format/@type")[0] + except IndexError: + # Not all types of libvirt storage can provide volume format + # infomation. When there is no format information, we assume + # it's 'raw'. + fmt = 'raw' res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], allocation=info[2], -- 1.8.5.3

5 6

[PATCH] issue #330: Make sure exception argument is a string to convert it to unicode
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The unicode() operation is only available for strings. So make sure the exception argument is a string before converting it to unicode. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/exception.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 71a4d11..74134be 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -51,7 +51,7 @@ class KimchiException(Exception): for key, value in args.iteritems(): if not isinstance(value, unicode): - args[key] = unicode(value, 'utf-8') + args[key] = unicode(str(value), 'utf-8') return unicode(translation.gettext(text), 'utf-8') % args -- 1.7.10.4

2 2

[PATCH] issue #312: Check volume group exists while creating a logical pool
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> When creating a logical storage pool, a volume group is created with the same name. And when deleting the storage pool the volume group keeps on the system. Which is the correct behavior as the storage pool is only a concept and deleting it should not affect the file system. To avoid problems while creating a pool with an existent volume group name, verify if a volume group exists with the given pool name and if so, warn the user about it. Also convert an error message parameter to string instead of virStoragePool instance and update the po files as new messages were added. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- po/en_US.po | 12 +++++++++++- po/kimchi.pot | 12 +++++++++++- po/pt_BR.po | 12 +++++++++++- po/zh_CN.po | 12 +++++++++++- src/kimchi/i18n.py | 2 +- src/kimchi/model/storagepools.py | 19 ++++++++++++++++++- 6 files changed, 63 insertions(+), 6 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index d9df56d..23881da 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -985,6 +985,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1037,6 +1043,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/po/kimchi.pot b/po/kimchi.pot index df89712..06236d2 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -972,6 +972,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1024,6 +1030,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index f00edd8..06db056 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-0300\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n" @@ -1000,6 +1000,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1052,6 +1058,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 366c6bf..38a3c6c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-03 17:18-0300\n" +"POT-Creation-Date: 2014-03-05 17:45-0300\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -990,6 +990,12 @@ msgid "Unable to delete pool %(name)s as it is associated with some templates" msgstr "" #, python-format +msgid "" +"A volume group named '%(name)s' already exists. Please, choose another name " +"to create the logical pool." +msgstr "" + +#, python-format msgid "Storage volume %(name)s already exists" msgstr "" @@ -1042,6 +1048,10 @@ msgid "Unable to resize storage volume %(name)s. Details: %(err)s" msgstr "" #, python-format +msgid "Storage type %(type)s does not support volume create and delete" +msgstr "" + +#, python-format msgid "Interface %(name)s does not exist" msgstr "" diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 36785e6..cbfcf5d 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -138,7 +138,7 @@ messages = { "KCHPOOL0033E": _("Unable to deactivate NFS storage pool %(name)s. NFS server %(server)s is unreachable."), "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."), "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 8edf62e..3ae62cf 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -71,6 +71,22 @@ class StoragePoolsModel(object): if name == ISO_POOL_NAME: raise InvalidOperation("KCHPOOL0031E") + # The user may want to create a logical pool with the same name + # used before but a volume group will already exist with this name + # So check the volume group does not exist to create the pool + if params['type'] == 'logical': + vgdisplay_cmd = ['vgdisplay', name] + output, error, returncode = run_command(vgdisplay_cmd) + # From vgdisplay error codes: + # 1 error reading VGDA + # 2 volume group doesn't exist + # 3 not all physical volumes of volume group online + # 4 volume group not found + # 5 no volume groups found at all + # 6 error reading VGDA from lvmtab + if returncode not in [2, 4, 5]: + raise InvalidOperation("KCHPOOL0036E", {'name': name}) + if params['type'] == 'kimchi-iso': task_id = self._do_deep_scan(params) @@ -172,7 +188,8 @@ class StoragePoolModel(object): return 0 except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0008E", - {'name': pool, 'err': e.get_error_message()}) + {'name': pool.name(), + 'err': e.get_error_message()}) def _get_storage_source(self, pool_type, pool_xml): source = {} -- 1.7.10.4

3 4

[PATCH] issue #330: Properly log the error message when login fails
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> The error message and all its parameters must be string. So convert error code to string in order to accomplish it. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index af3b610..b16f2db 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -107,7 +107,7 @@ def authenticate(username, password, service="passwd"): try: auth.authenticate() except PAM.error, (resp, code): - msg_args = {'userid': username, 'code': code} + msg_args = {'userid': username, 'code': str(code)} raise OperationFailed("KCHAUTH0001E", msg_args) return True -- 1.7.10.4

5 16

[PATCH] Refreshing an inactive pool causes exception
by Shu Ming 06 Mar '14

06 Mar '14

When an update request to extend a inactive storagepool is finished sucessfully, an exception will be raised complaining the pool is inactive. The exception response to the clinet is quite misleading for a successful request. --- src/kimchi/model/storagepools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 8edf62e..b666209 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -272,7 +272,8 @@ class StoragePoolModel(object): 'err': error}) # refreshing pool state pool = self.get_storagepool(pool_name, self.conn) - pool.refresh(0) + if pool.isActive(): + pool.refresh(0) def update(self, name, params): pool = self.get_storagepool(name, self.conn) -- 1.8.1.4

3 2

[PATCH V3 0/3] Support ppc64 isos in Templates
by Rodrigo Trujillo 06 Mar '14

06 Mar '14

V3: - Modify test cases V2: - Sort UI list of remote distros - Change names of Fedora distros - Allow ISOs of similar architectures but with different names to be displayed, like (amd64 and x86_64) V1: If Kimchi server is running in a PPC machine, the guests should be PPC. Currently, when user tries to create a template, only x86 isos are showed to user. This patch filters the ISOs, and also, adds ARCH to UI. -- 1.8.5.3

3 5

[PATCH V2 0/2] Support ppc64 isos in Templates
by Rodrigo Trujillo 06 Mar '14

06 Mar '14

V2: - Sort UI list of remote distros - Change names of Fedora distros - Allow ISOs of similar architectures but with different names to be displayed, like (amd64 and x86_64) V1: If Kimchi server is running in a PPC machine, the guests should be PPC. Currently, when user tries to create a template, only x86 isos are showed to user. This patch filters the ISOs, and also, adds ARCH to UI. Rodrigo Trujillo (2): Support ppc64 isos in Templates: Add arch and urls to distro jsons Support ppc64 isos in Templates: Filter remote isos and change UI src/distros.d/debian.json | 1 + src/distros.d/fedora.json | 30 +++++++++++++++++++++++++++--- src/distros.d/gentoo.json | 1 + src/distros.d/opensuse.json | 1 + src/distros.d/ubuntu.json | 2 ++ src/kimchi/distroloader.py | 10 +++++++++- src/kimchi/model/config.py | 2 +- ui/pages/template-add.html.tmpl | 8 ++++++-- 8 files changed, 48 insertions(+), 7 deletions(-) -- 1.8.5.3

1 3

[PATCH V3 0/3] let session expire when request access periodically
by shaohef＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 raise 401 http error when expire. Set the timeout of sessions 10 minutes explicitly. V1 -> V2 Address ming's comment, raise 403 http error when expire. Send UI patch. UI still need to improve as Adam king said. Hong Liang will improve it. ShaoHe Feng (3): add timeout for sessions auth enhancement: expire the session when the request access periodically UI: set kimchi robot header for some request. src/kimchi/auth.py | 13 +++++++++++++ src/kimchi/config.py.in | 4 ++++ ui/js/src/kimchi.api.js | 2 ++ 3 files changed, 19 insertions(+) -- 1.8.4.2

4 7

[PATCH V3 0/4] et session expire when request access periodically
by shaohef＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4 updage test case V2 -> V3 raise 401 http error when expire. Set the timeout of sessions 10 minutes explicitly. V1 -> V2 Address ming's comment, raise 403 http error when expire. Send UI patch. UI still need to improve as Adam king said. Hong Liang will improve it. ShaoHe Feng (4): add timeout for sessions auth enhancement: expire the session when the request access periodically UI: set kimchi robot header for some request. session expire: update test case src/kimchi/auth.py | 13 +++++++++++++ src/kimchi/config.py.in | 4 ++++ tests/test_config.py.in | 2 ++ ui/js/src/kimchi.api.js | 2 ++ 4 files changed, 21 insertions(+) -- 1.8.4.2

4 11

[PATCH 0/2] Support ppc64 isos in Templates
by Rodrigo Trujillo 06 Mar '14

06 Mar '14

If Kimchi server is running in a PPC machine, the guests should be PPC. Currently, when user tries to create a template, only x86 isos are showed to user. This patch filters the ISOs, and also, adds ARCH to UI. Rodrigo Trujillo (2): Support ppc64 isos in Templates: Add arch and urls to distro jsons Support ppc64 isos in Templates: Filter remote isos and change UI src/distros.d/debian.json | 1 + src/distros.d/fedora.json | 24 ++++++++++++++++++++++++ src/distros.d/gentoo.json | 1 + src/distros.d/opensuse.json | 1 + src/distros.d/ubuntu.json | 2 ++ src/kimchi/distroloader.py | 3 ++- ui/pages/template-add.html.tmpl | 3 +++ 7 files changed, 34 insertions(+), 1 deletion(-) -- 1.8.5.3

4 7

[PATCH] Issue #337: add CentOS support to yum repositories list
by shaohef＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> CentOS use yum to manage repositories Issue: https://github.com/kimchi-project/kimchi/issues/337 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 2e70008..bb6ca1a 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -24,7 +24,7 @@ from kimchi.basemodel import Singleton from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter -YUM_DISTROS = ['fedora', 'opensuse ', 'suse linux enterprise server '] +YUM_DISTROS = ['fedora', 'opensuse ', 'suse linux enterprise server ', 'centos'] APT_DISTROS = ['debian', 'ubuntu'] -- 1.8.4.2

1 0

[PATCH] storage volume: fix xml parsing of logical volume format type
by zhshzhou＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Not all types of libvirt storage volume provide format information. Particularly, the volume in logical pool doesn't have format information in the dumped XML description. StorageVolumeModel.lookup assumes there is a format tag, but for logical pool volumes it does not exist. So an exception is raised when it lookup a logical volume. To trigger this problem, firstly create a guest using a logical pool. Then click the logical pool from the "storage" tab, and it would fail to list the volumes. This patch catches the exception when parsing the format tag, and returns an empty string for the format attribute if there is no available format information in the XML. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 442ff89..6d0e884 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -113,7 +113,13 @@ class StorageVolumeModel(object): path = vol.path() info = vol.info() xml = vol.XMLDesc(0) - fmt = xmlutils.xpath_get_text(xml, "/volume/target/format/@type")[0] + try: + fmt = xmlutils.xpath_get_text( + xml, "/volume/target/format/@type")[0] + except IndexError: + # Not all types of libvirt storage can provide volume format + # infomation. + fmt = '' res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], allocation=info[2], -- 1.8.5.3

4 4

[PATCHv5 0/6] Add volume reference count
by lvroyce＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: 1. sudo make check 2. from UI: list storage volumes and unrefered volume ref_cnt is 0, ref_cnt for refered ones are 1. Available volumes will be tracked by volume reference count. Add this field to storage volume, so that storage volume/pool action validation can rely on it. Royce Lv (6): Fix vm disk path when it does not have source element Add volume ref_cnt: update api.md Add volume ref_cnt: Update controller and json schema Add volume ref_cnt: Add model and mockmodel implementation Add volume ref_cnt: Update test Multiple pep8 fixes docs/API.md | 3 +++ src/kimchi/API.json | 25 +++++++++++++++++++++++++ src/kimchi/control/storagevolumes.py | 1 + src/kimchi/i18n.py | 4 ++++ src/kimchi/mockmodel.py | 10 +++++++--- src/kimchi/model/debugreports.py | 2 +- src/kimchi/model/storagevolumes.py | 30 ++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 2 +- src/kimchi/model/vmstorages.py | 23 +++++++++++++---------- tests/test_model.py | 4 ++++ tests/test_rest.py | 2 ++ 11 files changed, 91 insertions(+), 15 deletions(-) -- 1.8.1.2

3 8

[PATCH] issue #312: Rename LVM while deleting logical storage pool
by Aline Manera 06 Mar '14

06 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> When creating a Logical storage pool, a LVM is created with the same name. And when deleting the storage pool the LVM keeps on the system. Which is the correct behavior as the storage pool is only a concept and deleting it should not affect the file system. But it prevents the user to create a new logical pool with a name used before which is odd. So when deleting a logical pool, rename the LVM to a single name to allow user create a logical pool with any name. Also convert an error message parameter to string instead of virStoragePool instance. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/storagepools.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 76ab2d6..dd3c9a2 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import time + import libvirt from kimchi import xmlutils @@ -172,7 +174,8 @@ class StoragePoolModel(object): return 0 except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0008E", - {'name': pool, 'err': e.get_error_message()}) + {'name': pool.name(), + 'err': e.get_error_message()}) def _get_storage_source(self, pool_type, pool_xml): source = {} @@ -348,7 +351,17 @@ class StoragePoolModel(object): if pool.isActive(): raise InvalidOperation("KCHPOOL0005E", {'name': name}) try: + xml = pool.XMLDesc(0) + pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] pool.undefine() + # The user may want to create a logical pool with the same name + # used before but a LVM will already exist with this name + # So rename the former LVM to avoid future conflicts + if pool_type == 'logical': + lvm_name = "%s-%s" % (name, str(int(time.time()*1000))) + vgrename_cmd = ["vgrename", name, lvm_name] + run_command(vgrename_cmd) + except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0011E", {'name': name, 'err': e.get_error_message()}) -- 1.7.10.4

3 5

[PATCH V2] Issue #333
by shaohef＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 improve commit message. ShaoHe Feng (1): Issue #333: do not encode error.html when the cherrpy version less than '3.2.5' src/kimchi/root.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 1.8.4.2

4 4

[RFC] upgrade CherryPy version.
by Sheldon 05 Mar '14

05 Mar '14

Now there's a issue: https://github.com/kimchi-project/kimchi/issues/333 The reason of this issue is because high level cherrpy version make some change about set_response. The high level cherrpy encode the unicode error message by itself. So the kimchi do not encode the unicode error message any more. It is right, the cherrpy should encode the unicode error message. Now we can require the cherrypy version to solve this problem. we can also check the cherrypy version in kimchi code as follow in order to avoid to require the cherrypy version. like: if cherrypy.__version__ << 3.2.5: return res else: return res.encode("utf-8") -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

4 7

[PATCH 0/2] Make vms model singleton
by lvroyce＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When using get_list function of vms model, Background Task will run multiple times because of started in vm init function. Fix this by making vms model singleton. Royce Lv (2): Make vm model to be a singleton Hack test_model to support vm model singleton src/kimchi/model/vms.py | 3 +++ tests/test_model.py | 2 ++ 2 files changed, 5 insertions(+) -- 1.8.1.2

5 8

[PATCH] bug fix: Allow extend a logical pool
by Aline Manera 05 Mar '14

05 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> While trying to extend a logical pool I got the following error message: "/dev/vdb is not a valid disk/partition. Could not add it to the pool my-logical-pool" But the same partition "/dev/vdb" is listed on GET /host/partitions. Then I realized the "blkid" is not the correct command to check a partition exists for raw disks. >From blkid man page: It can determine the type of content (e.g. filesystem or swap) that a block device holds, and also attributes (tokens, NAME=value pairs) from the content metadata (e.g. LABEL or UUID fields). Which is not useful for a raw disk. >From lsblk man page: lsblk lists information about all or the specified block devices. So use "lsblk" command instead of "blkid" to verify the disk exists in the system. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/storagepools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 76ab2d6..d012ca9 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -254,7 +254,7 @@ class StoragePoolModel(object): def _update_lvm_disks(self, pool_name, disks): # check if all the disks/partitions exists in the host for disk in disks: - blkid_cmd = ['blkid', disk] + blkid_cmd = ['lsblk', disk] output, error, returncode = run_command(blkid_cmd) if returncode != 0: kimchi_log.error('%s is not a valid disk/partition. Could not ' @@ -281,6 +281,7 @@ class StoragePoolModel(object): pool.setAutostart(1) else: pool.setAutostart(0) + if 'disks' in params: # check if pool is type 'logical' xml = pool.XMLDesc(0) -- 1.7.10.4

2 3

[PATCH v2 0/4] [UI] CDROM Management in a VM
by Hongliang Wang 05 Mar '14

05 Mar '14

Allow user to manipulate CDROM(s) in a VM: 1) Attach one or more CDROM(s); 2) Replace a CDROM with another ISO file path; 3) Detach a CDROM from a VM. Tested on Chrome. Please apply the following patch first: * [UI] Window - Correct Footer Height v1 -> v2: 2a) Separate one patch into 4 small ones to make it easier to review (Thanks to Ramon Medeiros's comment) 2b) Updated API calling to list CDROM (Thanks to Aline's comment) 2c) Separated VM updating window into 2 parts: general and storage (Thanks to Aline's comment) 2d) Enhanced UI to allow user trigger replace CDROM window by clicking ISO file path text box 2e) Changed uneditable fields from readonly to disabled 2f) Removed authors infomation (Thanks to Aline's comment) Hongliang Wang (4): [UI] Add CDROM-related APIs [UI] Add i18n Variables for CDROM-related Function [UI] Add/Edit CDROM Support [UI] Attach/Replace/Detach a CDROM to/in/from a VM ui/css/theme-default/guest-cdrom-add.css | 62 +++++++++++ ui/css/theme-default/guest-cdrom-edit.css | 62 +++++++++++ ui/css/theme-default/guest-edit.css | 108 +++++++++++++++--- ui/images/theme-default/guest-icon-sprite.png | Bin 0 -> 6748 bytes ui/js/src/kimchi.api.js | 74 +++++++++++++ ui/js/src/kimchi.guest_cdrom_add_main.js | 79 +++++++++++++ ui/js/src/kimchi.guest_cdrom_edit_main.js | 87 +++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 75 ++++++++++++- ui/pages/guest-cdrom-add.html.tmpl | 73 ++++++++++++ ui/pages/guest-cdrom-edit.html.tmpl | 73 ++++++++++++ ui/pages/guest-edit.html.tmpl | 153 +++++++++++++++++--------- ui/pages/i18n.html.tmpl | 5 + 12 files changed, 778 insertions(+), 73 deletions(-) create mode 100644 ui/css/theme-default/guest-cdrom-add.css create mode 100644 ui/css/theme-default/guest-cdrom-edit.css create mode 100644 ui/images/theme-default/guest-icon-sprite.png create mode 100644 ui/js/src/kimchi.guest_cdrom_add_main.js create mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js create mode 100644 ui/pages/guest-cdrom-add.html.tmpl create mode 100644 ui/pages/guest-cdrom-edit.html.tmpl -- 1.8.1.4

4 17

[PATCH v5] UI: Software Update Support
by Hongliang Wang 05 Mar '14

05 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 Widget - Enable/Disable Row Selection 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) Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 29 ++++++++++++++ ui/js/src/kimchi.api.js | 53 ++++++++++++++++++++++++++ ui/js/src/kimchi.host.js | 89 +++++++++++++++++++++++++++++++++++++++++++ ui/pages/i18n.html.tmpl | 10 +++++ ui/pages/tabs/host.html.tmpl | 17 +++++++++ 5 files changed, 198 insertions(+) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 470ed1b..0f8b941 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -224,3 +224,32 @@ width: 300px; } /* End of Debug Report */ + +/* Software Updates */ +.host-panel #software-updates-grid { + border-color: #ddd; + height: 300px; + width: 850px; +} + +.software-update-id { + width: 30px; +} + +.software-update-name, +.software-update-repos { + width: 220px; +} + +.software-update-version, +.software-update-arch { + width: 190px; +} + +.host-panel #software-updates-progress-textarea { + border: 1px solid #ddd; + height: 100px; + resize: vertical; + width: 846px; +} +/* End of Software Updates */ diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index fdd9cfc..beaf314 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -727,5 +727,58 @@ var kimchi = { success : suc, error : err }); + }, + + listSoftwareUpdates : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/packagesupdate', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend: true, + success : suc, + error : err + }); + }, + + updateSoftwares : function(suc, err, progress) { + var taskID = -1; + var onResponse = function(data) { + taskID = data['id']; + trackTask(); + }; + + var trackTask = function() { + kimchi.getTask(taskID, onTaskResponse, err); + }; + + var onTaskResponse = function(result) { + var taskStatus = result['status']; + switch(taskStatus) { + case 'running': + progress && progress(result); + setTimeout(function() { + trackTask(); + }, 200); + break; + case 'finished': + suc(result); + break; + case 'failed': + err(result); + break; + default: + break; + } + }; + + kimchi.requestJSON({ + url : kimchi.url + 'host/swupdate', + type : "POST", + contentType : "application/json", + dataType : "json", + success : onResponse, + error : err + }); } }; diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index 7974054..e146a75 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -133,6 +133,88 @@ kimchi.host_main = function() { }); }; + var softwareUpdatesGridID = 'software-updates-grid'; + var softwareUpdatesGrid = null; + var progressAreaID = 'software-updates-progress-textarea'; + var reloadProgressArea = function(result) { + var progressArea = $('#' + progressAreaID)[0]; + $(progressArea).text(result['message']); + var scrollTop = $(progressArea).prop('scrollHeight'); + $(progressArea).prop('scrollTop', scrollTop); + }; + + var initSoftwareUpdatesGrid = function(softwareUpdates) { + softwareUpdatesGrid = new kimchi.widget.Grid({ + container: 'software-updates-grid-container', + id: softwareUpdatesGridID, + title: i18n['KCHUPD6001M'], + rowSelection: 'disabled', + toolbarButtons: [{ + id: softwareUpdatesGridID + '-update-button', + label: i18n['KCHUPD6006M'], + disabled: true, + onClick: function(event) { + var updateButton = $(this); + var progressArea = $('#' + progressAreaID)[0]; + $('#software-updates-progress-container').removeClass('hidden'); + $(progressArea).text(''); + !kimchi.isElementInViewport(progressArea) && + progressArea.scrollIntoView(); + $(updateButton).text(i18n['KCHUPD6007M']).prop('disabled', true); + + kimchi.updateSoftwares(function(result) { + reloadProgressArea(result); + $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); + kimchi.topic('kimchi/softwareUpdated').publish({ + result: result + }); + }, function() {}, reloadProgressArea); + } + }], + frozenFields: [{ + name: 'id', + label: ' ', + 'class': 'software-update-id' + }], + fields: [{ + name: 'package_name', + label: i18n['KCHUPD6002M'], + 'class': 'software-update-name' + }, { + name: 'version', + label: i18n['KCHUPD6003M'], + 'class': 'software-update-version' + }, { + name: 'arch', + label: i18n['KCHUPD6004M'], + 'class': 'software-update-arch' + }, { + name: 'repository', + label: i18n['KCHUPD6005M'], + 'class': 'software-update-repos' + }], + data: softwareUpdates + }); + }; + + var listSoftwareUpdates = function() { + kimchi.listSoftwareUpdates(function(softwareUpdates) { + $.each(softwareUpdates, function(i, item) { + softwareUpdates[i]['id'] = i + 1; + }); + + if(softwareUpdatesGrid) { + softwareUpdatesGrid.setData(softwareUpdates); + } + else { + initSoftwareUpdatesGrid(softwareUpdates); + } + + var updateButton = $('#' + softwareUpdatesGridID + '-update-button'); + $(updateButton).prop('disabled', softwareUpdates.length === 0); + }); + }; + var shutdownButtonID = '#host-button-shutdown'; var restartButtonID = '#host-button-restart'; var shutdownHost = function(params) { @@ -191,6 +273,8 @@ kimchi.host_main = function() { kimchi.keepMonitoringHost = this['checked']; }); + listSoftwareUpdates(); + kimchi.getCapabilities(function(capabilities) { if(!capabilities['system_report_tool']) { return; @@ -204,6 +288,10 @@ kimchi.host_main = function() { listDebugReports(); }); + kimchi.topic('kimchi/softwareUpdated').subscribe(function() { + listSoftwareUpdates(); + }); + kimchi.getHost(function(data) { var htmlTmpl = $('#host-tmpl').html(); data['logo'] = data['logo'] || ''; @@ -469,5 +557,6 @@ kimchi.host_main = function() { delete kimchi.hostTimer; } reportGrid && reportGrid.destroy(); + softwareUpdatesGrid && softwareUpdatesGrid.destroy(); }); }; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 38f71d9..c96f804 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -89,6 +89,16 @@ var i18n = { 'KCHDR6010M': "$_("Download")", 'KCHDR6011M': "$_("Report name should contain only letters, digits and/or hyphen ('-').")", + + 'KCHUPD6001M': "$_("Software Updates")", + 'KCHUPD6002M': "$_("Package Name")", + 'KCHUPD6003M': "$_("Version")", + 'KCHUPD6004M': "$_("Architecture")", + 'KCHUPD6005M': "$_("Repository")", + 'KCHUPD6006M': "$_("Update All")", + 'KCHUPD6007M': "$_("Updating...")", + + 'KCHVM6001M': "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", 'KCHVM6002M': "$_("Delete Confirmation")", diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index 23b9853..f6ecd47 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -120,6 +120,23 @@ </div> </div> </div> + <div id="software-update-section" class="host-section"> + <h3 class="section-header" + aria-controls="content-software-update"> + $_("Software Updates") + </h3> + <div id="content-software-update" class="section-content"> + <div class="section-row"> + <div class="section-value"> + <div id="software-updates-grid-container"></div> + <div id="software-updates-progress-container" class="hidden"> + <label for="software-updates-progress-textarea">$_("Update Progress")</label> + <textarea id="software-updates-progress-textarea" readonly></textarea> + </div> + </div> + </div> + </div> + </div> <div id="debug-report-section" class="host-section hidden"> <h3 class="section-header" aria-controls="content-sys-reports"> -- 1.8.1.4

3 6

[PATCH v3 0/5] [UI] CDROM Management in a VM
by Hongliang Wang 05 Mar '14

05 Mar '14

Allow user to manipulate CDROM(s) in a VM: 1) Attach one or more CDROM(s); 2) Replace a CDROM with another ISO file path; 3) Detach a CDROM from a VM. Tested on Chrome. Please apply the following patch first: * [UI] Window - Correct Footer Height v2 -> v3: 3a) Keep the edit window silver instead of white (Aline's comment) 3b) Added information after CDROM manipulations to avoid confusion (Aline & Adam King's comment) v1 -> v2: 2a) Separate one patch into 4 small ones to make it easier to review (Thanks to Ramon Medeiros's comment) 2b) Updated API calling to list CDROM (Thanks to Aline's comment) 2c) Separated VM updating window into 2 parts: general and storage (Thanks to Aline's comment) 2d) Enhanced UI to allow user trigger replace CDROM window by clicking ISO file path text box 2e) Changed uneditable fields from readonly to disabled 2f) Removed authors infomation (Thanks to Aline's comment) Hongliang Wang (5): [UI] kimchi.message - Enhancement [UI] Add CDROM-related APIs [UI] Add i18n Variables for CDROM-related Function [UI] Add/Edit CDROM Support [UI] Attach/Replace/Detach a CDROM to/in/from a VM ui/css/theme-default/guest-cdrom-add.css | 62 +++++++++++ ui/css/theme-default/guest-cdrom-edit.css | 62 +++++++++++ ui/css/theme-default/guest-edit.css | 133 +++++++++++++++++++--- ui/images/theme-default/guest-icon-sprite.png | Bin 0 -> 6748 bytes ui/js/src/kimchi.api.js | 74 +++++++++++++ ui/js/src/kimchi.guest_cdrom_add_main.js | 79 +++++++++++++ ui/js/src/kimchi.guest_cdrom_edit_main.js | 88 +++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 86 +++++++++++++- ui/js/src/kimchi.message.js | 27 +++-- ui/pages/guest-cdrom-add.html.tmpl | 73 ++++++++++++ ui/pages/guest-cdrom-edit.html.tmpl | 73 ++++++++++++ ui/pages/guest-edit.html.tmpl | 154 +++++++++++++++++--------- ui/pages/i18n.html.tmpl | 11 ++ 13 files changed, 837 insertions(+), 85 deletions(-) create mode 100644 ui/css/theme-default/guest-cdrom-add.css create mode 100644 ui/css/theme-default/guest-cdrom-edit.css create mode 100644 ui/images/theme-default/guest-icon-sprite.png create mode 100644 ui/js/src/kimchi.guest_cdrom_add_main.js create mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js create mode 100644 ui/pages/guest-cdrom-add.html.tmpl create mode 100644 ui/pages/guest-cdrom-edit.html.tmpl -- 1.8.1.4

1 5

[PATCH V2 0/3] template integrity verification: verify storagepool
by shaohef＠linux.vnet.ibm.com 04 Mar '14

04 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 rebase. remove model test. For commit c4c093e does not allow to delete pool kimchi-test-pool as it is associated with some templates. Sometimes, user create a template, storagepool will change later. So users can not create a vm from this template successfully. It is necessary to check storagepool of a template. ShaoHe Feng (3): template integrity verification: verify storagepool, update API.md template integrity verification: verify storagepool in backend template integrity verification: update test case to verify storagepool docs/API.md | 1 + src/kimchi/mockmodel.py | 3 +++ src/kimchi/model/templates.py | 5 +++++ src/kimchi/vmtemplate.py | 11 ++++++++++- tests/test_rest.py | 15 ++++++++++++++- 5 files changed, 33 insertions(+), 2 deletions(-) -- 1.8.4.2

2 4

[PATCH 0/3] template integrity verification: verify storagepool
by shaohef＠linux.vnet.ibm.com 04 Mar '14

04 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Sometimes, user create a template, storagepool will change later. So users can not create a vm from this template successfully. It is necessary to check storagepool of a template. By the way storagepool, this verification does not depend on volume ref_cnt Storagepool delete depends on volume ref_cnt I make a mistake. So sorry. ShaoHe Feng (3): template integrity verification: verify storagepool, update API.md template integrity verification: verify storagepool in backend template integrity verification: update test case to verify storagepool docs/API.md | 1 + src/kimchi/mockmodel.py | 3 +++ src/kimchi/model/templates.py | 5 +++++ src/kimchi/vmtemplate.py | 10 ++++++++++ tests/test_model.py | 9 +++++++++ tests/test_rest.py | 13 +++++++++++++ 6 files changed, 41 insertions(+) -- 1.8.4.2

4 10

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

04 Mar '14

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

2 3

[PATCH] remove unused InvalidOperation instance
by shaohef＠linux.vnet.ibm.com 04 Mar '14

04 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Neither of these two removed InvalidOperation is used. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index f8ccea1..af3b610 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -197,13 +197,11 @@ def kimchiauth(admin_methods=None): debug("Entering kimchiauth...") if check_auth_session(): if not has_permission(admin_methods): - e = InvalidOperation('KCHAUTH0004E') raise cherrypy.HTTPError(403) return if check_auth_httpba(): if not has_permission(admin_methods): - e = InvalidOperation('KCHAUTH0004E') raise cherrypy.HTTPError(403) return -- 1.8.4.2

4 3