- Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Bug fix: Allow creating network with XML special characters
by Aline Manera 06 May '16

06 May '16

libvirt will take care of scaping any XML special character so Kimchi does not need to do anything related to that. For example: [alinefm@alinefm-TP440 kimchi]$ sudo virsh net-dumpxml '~!@#$%^&*()[]<>' <network> <name>~!@#$%^&*()[]<></name> <uuid>3f7fc0c9-1c82-4f61-8055-62523a8827d3</uuid> <bridge name='virbr3' stp='on' delay='0'/> <mac address='52:54:00:77:d2:cd'/> <ip address='192.168.3.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.3.129' end='192.168.3.254'/> </dhcp> </ip> </network> This patch also updated the test case to cover this scenario. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/networks.py | 2 -- tests/test_model_network.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/model/networks.py b/model/networks.py index 9ae2ea8..333ea6d 100644 --- a/model/networks.py +++ b/model/networks.py @@ -23,7 +23,6 @@ import libvirt import sys import time from libvirt import VIR_INTERFACE_XML_INACTIVE -from xml.sax.saxutils import escape from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError, OperationFailed @@ -107,7 +106,6 @@ class NetworksModel(object): self._set_network_vepa(params) # create network XML - params['name'] = escape(params['name']) xml = to_network_xml(**params) try: diff --git a/tests/test_model_network.py b/tests/test_model_network.py index 14d7288..89c9f7d 100644 --- a/tests/test_model_network.py +++ b/tests/test_model_network.py @@ -149,7 +149,7 @@ class NetworkTests(unittest.TestCase): def test_network_lifecycle(self): # Verify all the supported network type networks = [{'name': u'kīмсhī-пet', 'connection': 'isolated'}, - {'name': u'nat-network', 'connection': 'nat'}, + {'name': u'<!nat-network>&', 'connection': 'nat'}, {'name': u'subnet-network', 'connection': 'nat', 'subnet': '127.0.100.0/24'}] -- 2.5.5

2 2

[PATCH] [Kimchi] Bug fix: Create VM based on Remote ISO Template
by Aline Manera 06 May '16

06 May '16

When trying to create a VM from a recent created remote ISO Template, an error was raised: Error in async_task 1 Traceback (most recent call last): File "/home/alinefm/wok/src/wok/asynctask.py", line 72, in _run_helper self.fn(cb, opaque) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 168, in _create_task vol_list = t.fork_vm_storage(vm_uuid) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/templates.py", line 397, in fork_vm_storage vol_list = self.to_volume_list(vm_uuid) File "/home/alinefm/wok/src/wok/plugins/kimchi/vmtemplate.py", line 262, in to_volume_list base_fmt = imageinfo.probe_img_info(d['base'])['format'] File "/home/alinefm/wok/src/wok/plugins/kimchi/imageinfo.py", line 40, in probe_img_info info['actual-size'] = info['actual-size'] >> 30 KeyError: 'actual-size' It was because the remote ISO path was being set as CDROM and also as base image, causing the issue when creating the VM. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/templates.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/model/templates.py b/model/templates.py index 131f86b..5cdac00 100644 --- a/model/templates.py +++ b/model/templates.py @@ -68,10 +68,9 @@ class TemplatesModel(object): if source_media['type'] == 'netboot': params['netboot'] = True return self.save_template(params) - else: - # Get path of source media if it's based on disk type. - path = source_media.get('path', None) + # Get path of source media if it's based on disk type. + path = source_media.get('path', None) if path is None: raise InvalidParameter("KCHTMPL0016E") @@ -80,9 +79,10 @@ class TemplatesModel(object): if urlparse.urlparse(path).scheme in ["http", "https", "tftp", "ftp", "ftps"]: params["cdrom"] = path + return self.save_template(params) - # image does not exists: raise error - elif not os.path.exists(path): + # Local file (ISO/Img) does not exist: raise error + if not os.path.exists(path): raise InvalidParameter("KCHTMPL0002E", {'path': path}) # create magic object to discover file type -- 2.5.5

3 3

[PATCH] [Kimchi] Create template error message not being displayed in panel
by Socorro Stoppler 06 May '16

06 May '16

When an error occurs in Create Template, the error message is being displayed on its parent rather than the Create Template panel. This patch fixes that so the error is now being displayed in the create template panel. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/pages/template-add.html.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index 670c7a2..2a8fdb7 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -29,6 +29,7 @@ </div> <div class="modal-body"> <div class="template-modal-container"> + <div id="alert-modal-container"></div> </div> <div class="template-pager"> <div class="page-list"> -- 2.5.0

3 2

[PATCH] [Kimchi 0/2] *** DEPENDS ON GINGERBASE NETINFO PATCH *** migrating to Gingerbase netinfo
by dhbarboza82＠gmail.com 05 May '16

05 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch set adapts Kimchi source code to uses the netinfo module from Gingerbase. Daniel Henrique Barboza (2): Migration to Gingerbase netinfo: import changes Migration to Gingerbase netinfo: removing netinfo.py model/interfaces.py | 2 +- model/networks.py | 6 +- netinfo.py | 265 ---------------------------------------------------- tests/test_model.py | 2 +- 4 files changed, 5 insertions(+), 270 deletions(-) delete mode 100644 netinfo.py -- 2.5.5

3 4

[PATCH] [Kimchi] VEPA network UI: fixing network creation
by dhbarboza82＠gmail.com 05 May '16

05 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> VEPA has a multiple interface select. This wasn't being considered when assigning the value of network.interface element being used to call the network creation API. Result was an error "Interface should be bare NIC or bonding" because the backend was receiving an array of array. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- ui/js/src/kimchi.network_add_main.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index 99e42c1..4eb5c5b 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -35,6 +35,10 @@ kimchi.startNetworkCreation = function() { interfaces: [ network.interface ], vlan_id: network.vlan_id }; + // in VEPA connection case, network.interface is already an array + if (data.connection === kimchi.NETWORK_TYPE_VEPA) { + data.interfaces = network.interface; + } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down"; -- 2.5.5

4 3

[PATCH] [Kimchi] Disable Template when it has invalid parameters
by peterpnns＠gmail.com 05 May '16

05 May '16

From: peterpennings <peterpnns(a)gmail.com> This patch adds a block behavior on the action to select invalid templates when creating a guest peterpennings (1): Disable Template when it has invalid parameters ui/css/kimchi.css | 28 ++++++++++++++++++--- ui/css/src/modules/_guests.scss | 6 +++++ ui/css/src/modules/_templates.scss | 18 +++++++++++--- ui/js/src/kimchi.guest_add_main.js | 8 ++++++ ui/js/src/kimchi.network_add_main.js | 48 +++++++++++++++++++++++++----------- ui/js/src/kimchi.template_main.js | 9 +++++-- ui/pages/guest-add.html.tmpl | 7 +++--- ui/pages/tabs/templates.html.tmpl | 6 +++-- 8 files changed, 102 insertions(+), 28 deletions(-) -- 2.5.0

2 4

[PATCH V2] [Kimchi] Remove cherrypy configuration from kimchi.conf file
by Aline Manera 05 May '16

05 May '16

This patch depends on Wok patch "[PATCH] [Wok 3/3] Add root configuration as default for PluginConfig" V1 - V2: - update tes case Aline Manera (1): Remove cherrypy configuration from kimchi.conf file kimchi.conf | 13 ------------- tests/test_config.py.in | 5 ++--- 2 files changed, 2 insertions(+), 16 deletions(-) -- 2.5.5

2 3

[PATCH] [Wok 0/3] Make session timeout configurable
by Aline Manera 05 May '16

05 May '16

Aline Manera (3): Add wok-robot header to /notifications requests Issue #19: Make session timeout configurable Add root configuration as default for PluginConfig src/wok.conf.in | 4 ++++ src/wok/auth.py | 2 +- src/wok/config.py.in | 16 +++++++++++++--- src/wokd.in | 5 +++++ tests/test_config.py.in | 2 -- ui/js/src/wok.api.js | 1 + 6 files changed, 24 insertions(+), 6 deletions(-) -- 2.5.5

3 6

[Wok][PATCH 0/7] Multi-Culture Support
by pkulkark＠linux.vnet.ibm.com 04 May '16

04 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> co-authored by: Archana Singh <archus(a)linux.vnet.ibm.com> This patch set provides multi-culture support by adding another drop down list during login for user locale selection. The numeric data and datetime fields are formatted based on the locale selected. Pooja Kulkarni (7): Multi-Culture Support - Add a separate drop down list for locale Multi-Culture support - Add methods to get and set locales in wok.lang.js Multi-Culture support - Add locale in format settings in wok.line-chart.js Multi-Culture support : Format datetime as per locale in wok.list.js Multi-Culture support : Implement new drop down list for locale in wok.login.js Multi-Culture support : Modify wok.formatMeasurement util to include formatting based on locale Multi-Culture support : Format datetime in user activity log as per locale ui/js/src/wok.lang.js | 8 ++++++++ ui/js/src/wok.line-chart.js | 3 ++- ui/js/src/wok.list.js | 4 ++++ ui/js/src/wok.login.js | 9 +++++++++ ui/js/src/wok.utils.js | 10 +++++++--- ui/js/wok.bootgrid.js | 10 +++++++++- ui/js/wok.user-log.js | 3 ++- ui/pages/login.html.tmpl | 34 ++++++++++++++++++++++++++++++++++ 8 files changed, 75 insertions(+), 6 deletions(-) -- 2.1.0

3 10

[PATCH] [Kimchi] Remove cherrypy configuration from kimchi.conf file
by Aline Manera 04 May '16

04 May '16

This patch depends on Wok patch "[PATCH] [Wok 3/3] Add root configuration as default for PluginConfig" Aline Manera (1): Remove cherrypy configuration from kimchi.conf file kimchi.conf | 13 ------------- 1 file changed, 13 deletions(-) -- 2.5.5

2 3