- Kimchi-devel - oVirt List Archives

[PATCH 0/3] Improve error messages
by Crístian Viana 20 Mar '14

20 Mar '14

Crístian Viana (3): Do not show success messages Apply Kimchi standard error message Display the error code when displaying error msgs ui/css/theme-default/guest-cdrom-edit.css | 5 ----- ui/css/theme-default/guest-edit.css | 24 ------------------------ ui/css/theme-default/guest-storage-add.css | 5 ----- ui/css/theme-default/login-window.css | 9 --------- ui/css/theme-default/report-add.css | 4 ---- ui/js/src/kimchi.guest_cdrom_edit_main.js | 4 +--- ui/js/src/kimchi.guest_edit_main.js | 7 ------- ui/js/src/kimchi.guest_media_main.js | 3 --- ui/js/src/kimchi.guest_storage_add.main.js | 4 +--- ui/js/src/kimchi.login_window.js | 2 +- ui/js/src/kimchi.report_add_main.js | 6 ++---- ui/pages/guest-cdrom-edit.html.tmpl | 3 --- ui/pages/guest-edit.html.tmpl | 1 - ui/pages/guest-media.html.tmpl | 3 --- ui/pages/guest-storage-add.html.tmpl | 3 --- ui/pages/login-window.html.tmpl | 1 - ui/pages/report-add.html.tmpl | 1 - 17 files changed, 5 insertions(+), 80 deletions(-) -- 1.8.5.3

2 5

[PATCH] Doc: add work around to handle NFS root squash problem
by lvroyce＠linux.vnet.ibm.com 20 Mar '14

20 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: 1. make 2. nfs pool and vm creation Default NFS server export path is configured as root squash, mapping root user to nobody. This results: 1. Root user cannot step into mount point if export path does not allow other to read/execute. So create volume will fail. 2. Even with other permission open, owner/group of volume created by root is still nobody/nogrp, and qemu permission is denied on such img. This work around instruct user to enable squash to given libvirt user to address the above problems. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 5721878..17abe78 100644 --- a/docs/README.md +++ b/docs/README.md @@ -146,8 +146,15 @@ new template using the "+" button in the upper right corner. Known Issues ------------ -Kimchi is still experimental and should not be used in a production +1. Kimchi is still experimental and should not be used in a production environment. +2. When you are using NFS as storage pool, check the nfs export path permission +is configured as: + (1) export path need to be squashed as kvm gid and libvirt uid: + /my_export_path *(all_squash,anongid=<kvm-gid>, anonuid=<libvirt-uid>,rw,sync) + So that root user can create volume with right user/group. + (2) Chown of export path user as libvirt user, group as kvm group, + In order to make sure all mapped user can get into the mount point. Participating ------------- -- 1.8.1.2

3 5

[PATCH v2] Fix issue 348: NFS pool creation times out
by Christy Perez 20 Mar '14

20 Mar '14

Adding a 15 second timeout instead of two seconds. This makes kimchi more robust in the face of NFS issues such as the one described in Red Hat Bug 1023059. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/libvirtstoragepool.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/libvirtstoragepool.py b/src/kimchi/model/libvirtstoragepool.py index b8f3d42..47b239b 100644 --- a/src/kimchi/model/libvirtstoragepool.py +++ b/src/kimchi/model/libvirtstoragepool.py @@ -91,10 +91,9 @@ class NetfsPoolDef(StoragePoolDef): export_path, mnt_point] umount_cmd = ["umount", "-f", export_path] mounted = False - # 2 seconds looks like a reasonable time to wait for a refresh - # in the UI and enough time to verify that the NFS server - # is down. - cmd_timeout = 2 + # Due to an NFS bug (See Red Hat BZ 1023059), NFSv4 exports may take + # 10-15 seconds to mount the first time. + cmd_timeout = 15 with RollbackContext() as rollback: rollback.prependDefer(os.rmdir, mnt_point) -- 1.8.5.3

3 3

[PATCH] Fix issue 348: NFS pool creation times out
by Christy Perez 19 Mar '14

19 Mar '14

Adding a 15 second timeout instead of two seconds. This makes kimchi more robust in the face of NFS issues such as the one described in Red Hat Bug 1023059. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/libvirtstoragepool.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/libvirtstoragepool.py b/src/kimchi/model/libvirtstoragepool.py index b8f3d42..35666dc 100644 --- a/src/kimchi/model/libvirtstoragepool.py +++ b/src/kimchi/model/libvirtstoragepool.py @@ -91,10 +91,9 @@ class NetfsPoolDef(StoragePoolDef): export_path, mnt_point] umount_cmd = ["umount", "-f", export_path] mounted = False - # 2 seconds looks like a reasonable time to wait for a refresh - # in the UI and enough time to verify that the NFS server - # is down. - cmd_timeout = 2 + # Due to an NFS bug, NFSv4 exports may take 10-15 seconds to mount + # the first time. + cmd_timeout = 15 with RollbackContext() as rollback: rollback.prependDefer(os.rmdir, mnt_point) -- 1.8.5.3

1 1

[PATCH] Fix issue 348: NFS pool creation times out
by Christy Perez 19 Mar '14

19 Mar '14

Adding a 15 second timeout instead of two seconds. This makes kimchi more robust in the face of NFS issues such as this one. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/libvirtstoragepool.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/libvirtstoragepool.py b/src/kimchi/model/libvirtstoragepool.py index b8f3d42..35666dc 100644 --- a/src/kimchi/model/libvirtstoragepool.py +++ b/src/kimchi/model/libvirtstoragepool.py @@ -91,10 +91,9 @@ class NetfsPoolDef(StoragePoolDef): export_path, mnt_point] umount_cmd = ["umount", "-f", export_path] mounted = False - # 2 seconds looks like a reasonable time to wait for a refresh - # in the UI and enough time to verify that the NFS server - # is down. - cmd_timeout = 2 + # Due to an NFS bug, NFSv4 exports may take 10-15 seconds to mount + # the first time. + cmd_timeout = 15 with RollbackContext() as rollback: rollback.prependDefer(os.rmdir, mnt_point) -- 1.8.5.3

3 3

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

19 Mar '14

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

2 5

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

19 Mar '14

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

2 5

[PATCH] Controller: Improve Kimchi Specific Exception Reporting
by zhshzhou＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> The resource and collection class catches exception in the index method and translates to HTTP error code with error message. While this is good and friendly to the user, the exception handling code is somewhat ad-hoc. The first problem is that it does not catch and translate all the Kimchi exception. When new code or feature is added to Kimchi, it's possible that the new code raises an exception that is not expected before. In this case it fails to translate the error message, so the cherrypy framework translates it to HTTP code 500 with a vague message saying "The server encountered an internal error". This is not friendly to the user. In this patch it "except KimchiException" at the last of the except sequence, and translates it into HTTP error code 500 with specific error message, so that the user knows what's going on. The second problem is that the index method handles GET, POST, PUT and DELETE requests, and the error translating code for each type of request is duplicated. This is not necessary. So this patch merges the error handling code. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 76 +++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index d2d041e..320239b 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -26,6 +26,7 @@ from kimchi.control.utils import get_class_name, internal_redirect, model_fn from kimchi.control.utils import parse_request, validate_method from kimchi.control.utils import validate_params from kimchi.exception import InvalidOperation, InvalidParameter +from kimchi.exception import KimchiException from kimchi.exception import MissingParameter, NotFoundError, OperationFailed @@ -87,6 +88,8 @@ class Resource(object): raise cherrypy.HTTPError(500, e.message) except NotFoundError, e: raise cherrypy.HTTPError(404, e.message) + except KimchiException, e: + raise cherrypy.HTTPError(500, e.message) wrapper.__name__ = action_name wrapper.exposed = True @@ -116,31 +119,20 @@ class Resource(object): @cherrypy.expose def index(self): method = validate_method(('GET', 'DELETE', 'PUT')) - if method == 'GET': - try: - return self.get() - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except OperationFailed, e: - raise cherrypy.HTTPError(406, e.message) - elif method == 'DELETE': - try: - return self.delete() - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) - except InvalidParameter, e: - raise cherrypy.HTTPError(400, e.message) - elif method == 'PUT': - try: - return self.update() - except InvalidParameter, e: - raise cherrypy.HTTPError(400, e.message) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) + try: + return {'GET': self.get, + 'DELETE': self.delete, + 'PUT': self.update}[method]() + except InvalidOperation, e: + raise cherrypy.HTTPError(400, e.message) + except InvalidParameter, e: + raise cherrypy.HTTPError(400, e.message) + except NotFoundError, e: + raise cherrypy.HTTPError(404, e.message) + except OperationFailed, e: + raise cherrypy.HTTPError(500, e.message) + except KimchiException, e: + raise cherrypy.HTTPError(500, e.message) def update(self): try: @@ -269,29 +261,25 @@ class Collection(object): @cherrypy.expose def index(self, *args, **kwargs): method = validate_method(('GET', 'POST')) - if method == 'GET': - try: + try: + if method == 'GET': filter_params = cherrypy.request.params validate_params(filter_params, self, 'get_list') return self.get(filter_params) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) - - elif method == 'POST': - try: + elif method == 'POST': return self.create(parse_request(), *args) - except MissingParameter, e: - raise cherrypy.HTTPError(400, e.message) - except InvalidParameter, e: - raise cherrypy.HTTPError(400, e.message) - except OperationFailed, e: - raise cherrypy.HTTPError(500, e.message) - except InvalidOperation, e: - raise cherrypy.HTTPError(400, e.message) - except NotFoundError, e: - raise cherrypy.HTTPError(404, e.message) + except InvalidOperation, e: + raise cherrypy.HTTPError(400, e.message) + except InvalidParameter, e: + raise cherrypy.HTTPError(400, e.message) + except MissingParameter, e: + raise cherrypy.HTTPError(400, e.message) + except NotFoundError, e: + raise cherrypy.HTTPError(404, e.message) + except OperationFailed, e: + raise cherrypy.HTTPError(500, e.message) + except KimchiException, e: + raise cherrypy.HTTPError(500, e.message) class AsyncCollection(Collection): -- 1.8.5.3

4 4

[PATCH v2] VLAN: Do not allow bridge to be the trunk device
by zhshzhou＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> In Linux networking, a usual VLAN + bridge network setup is as the following. eth0 |-> eth0.10 -> br10 -> vnet101, vnet102, ... |-> eth0.20 -> br20 -> vnet201, vnet202, ... While the eth0 trunk and VLAN interfaces provide the isolation service, the bridges provide the switching inside the respective VLAN. It's not very useful to have a bridge device as the trunk because the VLAN interfaces on a trunk should be isolated. This patch contains changes to the back-end and front-end. The back-end checks if the front-end submits an invalid setup to use a bridge as the VLAN trunk device and raises exception. Before this patch, if the user creates a bridged network over an existing bridge with VLAN tag set. The back-end just ignores the VLAN and creates an ordinary bridged network. After this patch, the back-end raises an exception with an explanation in this case. The front-end also checks the currently selected interface type. If the selected interface is a bridge, it disables the vlan check box, otherwise it enables the vlan check box. V2 Add front-end code to disable vlan check box if the selected interface is a bridge. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 2 ++ ui/js/src/kimchi.network.js | 11 +++++++++++ 3 files changed, 14 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 589c8cb..b463bd1 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -182,6 +182,7 @@ messages = { "KCHNET0016E": _("Specify name and type to create a Network"), "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines and/or templates linked to this network."), "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines and/or templates linked to this network."), + "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 27abd54..7872a73 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -151,6 +151,8 @@ class NetworksModel(object): raise MissingParameter("KCHNET0004E", {'name': params['name']}) if netinfo.is_bridge(iface): + if 'vlan_id' in params: + raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7c4bc77..2467425 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -215,10 +215,21 @@ kimchi.initNetworkDialog = function() { kimchi.openNetworkDialog = function(okCallback) { kimchi.getInterfaces(function(result) { var options = ""; + var nics = {}; for (var i = 0; i < result.length; i++) { options += "<option value=" + result[i].name + ">" + result[i].name + "</option>"; + nics[result[i].name] = result[i]; } $("#networkInterface").append(options); + onChange = function() { + if (nics[$("#networkInterface").val()].type === "bridge") { + $("#enableVlan").prop("disabled", true); + } else { + $("#enableVlan").prop("disabled", false); + } + }; + $("#networkInterface").on("change", onChange); + onChange(); kimchi.setDefaultNetworkType(result.length!==0); }); $("#networkConfig").dialog({ -- 1.8.5.3

1 0

[PATCH] VLAN: Do not allow bridge to be the trunk device
by zhshzhou＠linux.vnet.ibm.com 19 Mar '14

19 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> In Linux networking, a usual VLAN + bridge network setup is as the following. eth0 |-> eth0.10 -> br10 -> vnet101, vnet102, ... |-> eth0.20 -> br20 -> vnet201, vnet202, ... While the eth0 trunk and VLAN interfaces provide the isolation service, the bridges provide the switching inside the respective VLAN. It's not very useful to have a bridge device as the trunk because the VLAN interfaces on a trunk should be isolated. This patch checks if the front-end submits an invalid setup to use a bridge as the VLAN trunk device and raises exception. Before this patch, if the user creates a bridged network over an existing bridge with VLAN tag set. The back-end just ignores the VLAN and creates an ordinary bridged network. After this patch, the back-end raises an exception with an explanation in this case, so the user knows what's going on and can re-try with correct parameters. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 589c8cb..b463bd1 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -182,6 +182,7 @@ messages = { "KCHNET0016E": _("Specify name and type to create a Network"), "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines and/or templates linked to this network."), "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines and/or templates linked to this network."), + "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0242156..531f614 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -151,6 +151,8 @@ class NetworksModel(object): raise MissingParameter("KCHNET0004E", {'name': params['name']}) if netinfo.is_bridge(iface): + if 'vlan_id' in params: + raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: -- 1.8.5.3

3 3