March 2016 - Kimchi-devel - oVirt List Archives

[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] [Wok 0/3] Implement Asynchronous Notifications frontend
by Lucio Correia 12 Apr '16

12 Apr '16

This patchset depends on Asynchronous Notification backend. Lucio Correia (3): Implement notifications JS API Implement wok.notification widget Implement notifications loop ui/js/src/wok.api.js | 18 ++++++++++++++++++ ui/js/src/wok.main.js | 5 +++++ ui/js/src/wok.notification.js | 36 ++++++++++++++++++++++++++++++++++++ ui/js/src/wok.utils.js | 19 +++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 ui/js/src/wok.notification.js -- 1.9.1

3 9

[PATCH V2] [Kimchi] Add support to Libvirt Events.
by pvital＠linux.vnet.ibm.com 07 Apr '16

07 Apr '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch adds support to handle in Kimchi any Libvirt Event, just by adding a callback to process the event and register the event with the callback. A method called register_common_events() is responsible to register the common domain events to use a generic callback that logs into error log, the event happened and it's details. This patch is part of the solution for Kimchi Issue #817 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- i18n.py | 4 +++ model/libvirtevents.py | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 +++- 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 model/libvirtevents.py diff --git a/i18n.py b/i18n.py index 6214687..3939aba 100644 --- a/i18n.py +++ b/i18n.py @@ -326,4 +326,8 @@ messages = { "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), + "KCHEVENT0001E": _("Failed to register the default event implementation."), + "KCHEVENT0002E": _("Failed to register timeout event."), + "KCHEVENT0003E": _("Failed to Run the default event implementation."), + } diff --git a/model/libvirtevents.py b/model/libvirtevents.py new file mode 100644 index 0000000..2775476 --- /dev/null +++ b/model/libvirtevents.py @@ -0,0 +1,97 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 cherrypy +import libvirt +import time + +from wok.exception import OperationFailed +from wok.utils import wok_log + + +class LibvirtEvents(object): + def __init__(self): + # Register default implementation of event handlers + if libvirt.virEventRegisterDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0001E') + + # Run a background thread with the event loop. Using cherrypy + # BackgroundTask class due to issues when using threading module with + # cherrypy. + self.event_loop_thread = cherrypy.process.plugins.BackgroundTask( + 2, + self._event_loop_run + ) + self.event_loop_thread.setName('KimchiLibvirtEventLoop') + self.event_loop_thread.setDaemon(True) + self.event_loop_thread.start() + + # Set an event timeout to control the self._event_loop_run + if libvirt.virEventAddTimeout(0, self._kimchi_EventTimeout, None) < 0: + raise OperationFailed('KCHEVENT0002E') + + # Event loop method to be executed in background as thread + def _event_loop_run(self): + while True: + if libvirt.virEventRunDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0003E') + + def is_event_loop_alive(self): + return self.event_loop_thread.isAlive() + + # Event loop handler used to limit length of waiting for any other event. + def _kimchi_EventTimeout(self, timer, opaque): + time.sleep(1) + + def domain_event_generic_cb(self, conn, dom, event, detail, *args): + """ + Generic callback to handle Domain (VMs) events. + """ + evStrings = ("Defined", "Undefined", "Started", "Suspended", "Resumed", + "Stopped", "Shutdown", "PMSuspended", "Crashed") + evDetails = (("Added", "Updated"), + ("Removed", ), + ("Booted", "Migrated", "Restored", "Snapshot", "Wakeup"), + ("Paused", "Migrated", "IOError", "Watchdog", "Restored", + "Snapshot", "API error"), + ("Unpaused", "Migrated", "Snapshot"), + ("Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", + "Failed", "Snapshot"), + ("Finished", ), + ("Memory", "Disk"), + ("Panicked")) + msg = "Libvirt Event: Domain %s %s %s" % (dom.name(), evStrings[event], + evDetails[event][detail]) + + wok_log.error(msg) + + def register_common_domain_events(self, conn): + """ + Register the most common Libvirt domain events to be handled. + """ + conn = conn.get() + for ev in (libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE, + libvirt.VIR_DOMAIN_EVENT_ID_REBOOT, + libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS, + libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG): + conn.domainEventRegisterAny(None, ev, self.domain_event_generic_cb, + ev) diff --git a/model/model.py b/model/model.py index e44f804..aeb8b7d 100644 --- a/model/model.py +++ b/model/model.py @@ -26,6 +26,7 @@ from wok.plugins.kimchi import config from wok.utils import import_module, listPathModules from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection +from wok.plugins.kimchi.model.libvirtevents import LibvirtEvents class Model(BaseModel): @@ -43,8 +44,11 @@ class Model(BaseModel): return instances self.objstore = ObjectStore(objstore_loc or config.get_object_store()) + self.events = LibvirtEvents() self.conn = LibvirtConnection(libvirt_uri) - kargs = {'objstore': self.objstore, 'conn': self.conn} + self.events.register_common_domain_events(self.conn) + kargs = {'objstore': self.objstore, 'conn': self.conn, + 'eventsloop': self.events} models = [] # Import task model from Wok -- 2.5.5

3 2

[PATCH v4][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 06 Apr '16

06 Apr '16

Instead of specify if the media is cdrom or disk, use source_media to create a template Changes: v2: Remove libvirt connection from VMtemplate Fix incorrect changes on tests Fix return status when source_media not passed v3: Fix pep8 issues Remove/add some constants Rewrite API message Ramon Medeiros (4): Create a single field to pass the installation media Fix checking duplicate template before creating it Identify installation media while creating template Update tests API.json | 5 ++ i18n.py | 2 +- model/templates.py | 15 ++++-- tests/test_authorization.py | 4 +- tests/test_livemigration.py | 7 +-- tests/test_mockmodel.py | 13 +++--- tests/test_model.py | 94 ++++++++++++++++++++----------------- tests/test_rest.py | 36 +++++++-------- tests/test_template.py | 47 +++++++++---------- tests/test_vmtemplate.py | 40 ++++++++-------- vmtemplate.py | 110 +++++++++++++++++++++++++++++++++++++------- 11 files changed, 235 insertions(+), 138 deletions(-) -- 2.5.5

3 16

[PATCH V2] [Wok] Implement Asynchronous Notifications backend
by Lucio Correia 01 Apr '16

01 Apr '16

* There is no POST method: a notification is added through add_notification() method. * Notifications are always stored in Wok object store under 'notification' type, even if added by a plugin. * Every time Wok is started, all notifications are erased, since this is a UI feature, intended to be showed to the user asynchronously, independent of which tab is opened. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- docs/API/notifications.md | 34 ++++++++++++++++++++++++ src/wok/control/notifications.py | 37 ++++++++++++++++++++++++++ src/wok/i18n.py | 3 +++ src/wok/model/notifications.py | 56 ++++++++++++++++++++++++++++++++++++++++ src/wok/objectstore.py | 39 ++++++++++++++++++++++++++++ src/wok/server.py | 4 +++ 6 files changed, 173 insertions(+) create mode 100644 docs/API/notifications.md create mode 100644 src/wok/control/notifications.py create mode 100644 src/wok/model/notifications.py Changes in V2: - added timestamp - code as required parameter in add_notification - added DELETE api for notification This patch depends on WokMessage V3 patch diff --git a/docs/API/notifications.md b/docs/API/notifications.md new file mode 100644 index 0000000..851352f --- /dev/null +++ b/docs/API/notifications.md @@ -0,0 +1,34 @@ +## REST API Specification for Notifications + +### Collection: Notifications + +**URI:** /notifications + +**Methods:** + +* **GET**: Retrieve a summarized list of current Notifications + +#### Examples +GET /notifications +[{Notification1}, {Notification2}, ...] + +### Resource: Notification + +**URI:** /notifications/*:id* + +A task represents an asynchronous operation that is being performed by the +server. + +**Methods:** + +* **GET**: Retrieve the full description of the Notification + * code: message ID + * message: message text already translated + +#### Examples +GET /notifications/KCHLIBVIRT0001W +{ + id: "KCHLIBVIRT0001W", + message: "KCHLIBVIRT0001W: Lack of storage space in guest vm-1", + timestamp: first time notification was emitted +} diff --git a/src/wok/control/notifications.py b/src/wok/control/notifications.py new file mode 100644 index 0000000..37d45f2 --- /dev/null +++ b/src/wok/control/notifications.py @@ -0,0 +1,37 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 wok.control.base import Collection, Resource +from wok.control.utils import UrlSubNode + + +@UrlSubNode('notifications', True) +class Notifications(Collection): + def __init__(self, model): + super(Notifications, self).__init__(model) + self.resource = Notification + + +class Notification(Resource): + def __init__(self, model, id): + super(Notification, self).__init__(model, id) + + @property + def data(self): + return self.info diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e6087f4..5a2876f 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -45,6 +45,9 @@ messages = { "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), "WOKLOG0002E": _("Creation of log file failed: %(err)s"), + "WOKNOT0001E": _("Unable to find notification %(id)s"), + "WOKNOT0002E": _("Unable to delete notification %(id)s: %(message)s"), + "WOKOBJST0001E": _("Unable to find %(item)s in datastore"), "WOKUTILS0001E": _("Unable to reach %(url)s. Make sure it is accessible and try again."), diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py new file mode 100644 index 0000000..77184db --- /dev/null +++ b/src/wok/model/notifications.py @@ -0,0 +1,56 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 wok.exception import NotFoundError, OperationFailed +from wok.message import WokMessage + + +class NotificationsModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def get_list(self): + with self.objstore as session: + return session.get_list('notification') + + +class NotificationModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def lookup(self, id): + with self.objstore as session: + notification = session.get('notification', str(id)) + + # use WokMessage to translate the notification + if notification: + timestamp = notification['timestamp'] + plugin = notification.pop('_plugin_name', None) + message = WokMessage(id, notification, plugin).get_text() + return {"code": id, "message": message, "timestamp": timestamp} + + raise NotFoundError("WOKNOT0001E", {'id': str(id)}) + + def delete(self, id): + try: + with self.objstore as session: + session.delete('notification', str(id)) + except Exception as e: + raise OperationFailed("WOKNOT0002E", {'id': str(id), + 'msg': e.msg()}) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 59354f3..dbc3ee3 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -23,6 +23,8 @@ import sqlite3 import threading import traceback +from datetime import datetime + try: from collections import OrderedDict except ImportError: @@ -144,3 +146,40 @@ class ObjectStore(object): # exception again wok_log.error(traceback.format_exc()) return False + + +def add_notification(code, args={}, plugin_name=None): + if not code: + wok_log.error("Unable to add notification: invalide code '%(code)s'" % + {'code': str(code)}) + return + + found = True + try: + with ObjectStore() as session: + notification = session.get('notification', code) + except NotFoundError: + found = False + + try: + args.update({"_plugin_name": plugin_name, + "timestamp": datetime.now().isoformat()}) + + # do not update timestamp if notification already exists + if found: + args["timestamp"] = notification["timestamp"] + + with ObjectStore() as session: + session.store('notification', code, args) + except Exception as e: + wok_log.error("Unable to store notification: %s" % e.message) + + +def clean_notifications(): + try: + with ObjectStore() as session: + notifications = session.get_list('notification') + for item in notifications: + session.delete('notification', item) + except Exception as e: + wok_log.error("Unable to clean notifications: %s" % e.message) diff --git a/src/wok/server.py b/src/wok/server.py index 902d4bf..a329ed4 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,6 +33,7 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model +from wok.objectstore import clean_notifications from wok.proxy import start_proxy, terminate_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot @@ -106,6 +107,9 @@ class Server(object): if dev_env: cherrypy.log.screen = True + # clean object store notifications + clean_notifications() + # close standard file handlers because we are going to use a # watchedfiled handler, otherwise we will have two file handlers # pointing to the same file, duplicating log enries -- 1.9.1

3 4

[PATCH V3] [Wok] Implement WokMessage class
by Lucio Correia 01 Apr '16

01 Apr '16

WokMessage is a generic message implementation, which looks up and translates error messages for all plugins and Wok itself. Lookup and translation code was adapted from WokException class, which now just uses WokMessage. WokMessage is intended to be used by other modules dealing with messages, such as User Request Log and future feature Asynchronous Notifications. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/exception.py | 45 +++-------------------------- src/wok/message.py | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 41 deletions(-) create mode 100644 src/wok/message.py Changes in V3: - Aline's review diff --git a/src/wok/exception.py b/src/wok/exception.py index 023334b..52f007e 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -20,53 +20,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import cherrypy -import gettext -from wok.i18n import messages as _messages -from wok.template import get_lang, validate_language +from wok.message import WokMessage class WokException(Exception): def __init__(self, code='', args={}): self.code = code - - for key, value in args.iteritems(): - if isinstance(value, unicode): - continue - - # value is not unicode: convert it - try: - # In case the value formats itself to an ascii string. - args[key] = unicode(str(value), 'utf-8') - except UnicodeEncodeError: - # In case the value is a WokException or it formats - # itself to a unicode string. - args[key] = unicode(value) - - # First, check if it is a Wok error message, then search in plugin - # error messages list - msg = _messages.get(code, code) - if (msg == code) and (cherrypy.request.app): - msg = self._get_translation() - - msg = unicode(msg, 'utf-8') % args - pattern = "%s: %s" % (code, msg) - cherrypy.log.error_log.error(pattern) - Exception.__init__(self, pattern) - - def _get_translation(self): - lang = validate_language(get_lang()) - paths = cherrypy.request.app.root.paths - domain = cherrypy.request.app.root.domain - messages = cherrypy.request.app.root.messages - text = messages.get(self.code, self.code) - - try: - translation = gettext.translation(domain, paths.mo_dir, [lang]) - except: - translation = gettext - - return translation.gettext(text) + msg = WokMessage(code, args).get_text() + cherrypy.log.error_log.error(msg) + Exception.__init__(self, msg) class NotFoundError(WokException): diff --git a/src/wok/message.py b/src/wok/message.py new file mode 100644 index 0000000..414788c --- /dev/null +++ b/src/wok/message.py @@ -0,0 +1,81 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2015-2016 +# +# Code derived from Project Kimchi +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 cherrypy +import gettext + +from wok.template import get_lang, validate_language + + +class WokMessage(object): + def __init__(self, code='', args={}, plugin=None): + # make all args unicode + for key, value in args.iteritems(): + if isinstance(value, unicode): + continue + + try: + # In case the value formats itself to an ascii string. + args[key] = unicode(str(value), 'utf-8') + except UnicodeEncodeError: + # In case the value is a WokException or it formats + # itself to a unicode string. + args[key] = unicode(value) + + self.code = code + self.args = args + self.plugin = plugin + + def _get_translation(self): + wok_app = cherrypy.tree.apps[''] + + # get app from plugin path if specified + if self.plugin: + app = cherrypy.tree.apps[self.plugin] + # if on request, try to get app from it + elif cherrypy.request.app: + app = cherrypy.request.app + # fallback: get root app (WokRoot) + else: + app = wok_app + + # fallback to Wok message in case plugins raise Wok exceptions + text = app.root.messages.get(self.code, None) + if text is None: + app = wok_app + text = app.root.messages.get(self.code, self.code) + + # do translation + domain = app.root.domain + paths = app.root.paths + lang = validate_language(get_lang()) + + try: + translation = gettext.translation(domain, paths.mo_dir, [lang]) + except: + translation = gettext + + return translation.gettext(text) + + def get_text(self): + msg = self._get_translation() + msg = unicode(msg, 'utf-8') % self.args + return "%s: %s" % (self.code, msg) -- 1.9.1

2 1

[PATCH v3][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 30 Mar '16

30 Mar '16

Instead of specify if the media is cdrom or disk, use source_media to create a template Ramon Medeiros (4): Create a single field to pass the installation media Fix checking duplicate template before creating it Identify installation media while creating template Update tests API.json | 5 ++ i18n.py | 2 +- model/templates.py | 15 ++++-- tests/test_authorization.py | 4 +- tests/test_livemigration.py | 7 +-- tests/test_mockmodel.py | 13 +++--- tests/test_model.py | 94 ++++++++++++++++++++----------------- tests/test_rest.py | 36 +++++++------- tests/test_template.py | 47 +++++++++---------- tests/test_vmtemplate.py | 40 +++++++++------- vmtemplate.py | 111 +++++++++++++++++++++++++++++++++++++------- 11 files changed, 236 insertions(+), 138 deletions(-) -- 2.5.5

3 8

[PATCH v2][Kimchi 0/4] Use a single field to create a template
by Ramon Medeiros 30 Mar '16

30 Mar '16

Instead of specify if the media is cdrom or disk, use source_media to create a template Ramon Medeiros (4): Create a single field to pass the installation media Fix checking duplicate template before creating it Identify installation media while creating template Update tests API.json | 5 ++ i18n.py | 2 +- model/templates.py | 15 ++++-- tests/test_authorization.py | 4 +- tests/test_livemigration.py | 7 +-- tests/test_mockmodel.py | 14 +++--- tests/test_model.py | 91 ++++++++++++++++++++--------------- tests/test_rest.py | 32 ++++++------- tests/test_template.py | 47 ++++++++----------- tests/test_vmtemplate.py | 38 +++++++-------- vmtemplate.py | 112 ++++++++++++++++++++++++++++++++++++++------ 11 files changed, 232 insertions(+), 135 deletions(-) -- 2.5.5

3 12

[PATCH] [Kimchi] Add support to Libvirt Events.
by pvital＠linux.vnet.ibm.com 30 Mar '16

30 Mar '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch adds support to handle in Kimchi any Libvirt Event, just by adding a callback to process the event and register the event with the callback. A method called register_common_events() is responsible to register the common domain events to use a generic callback that logs into error log, the event happened and it's details. This patch is part of the solution for Kimchi Issue #817 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- i18n.py | 4 ++ model/libvirtevents.py | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++ model/model.py | 6 ++- 3 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 model/libvirtevents.py diff --git a/i18n.py b/i18n.py index 6214687..3939aba 100644 --- a/i18n.py +++ b/i18n.py @@ -326,4 +326,8 @@ messages = { "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), + "KCHEVENT0001E": _("Failed to register the default event implementation."), + "KCHEVENT0002E": _("Failed to register timeout event."), + "KCHEVENT0003E": _("Failed to Run the default event implementation."), + } diff --git a/model/libvirtevents.py b/model/libvirtevents.py new file mode 100644 index 0000000..44da18f --- /dev/null +++ b/model/libvirtevents.py @@ -0,0 +1,99 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 cherrypy +import libvirt +import time + +from wok.exception import OperationFailed +from wok.utils import wok_log + + +class LibvirtEvents(object): + def __init__(self): + # Register default implementation of event handlers + if libvirt.virEventRegisterDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0001E') + + # Run a background thread with the event loop. Using cherrypy + # BackgroundTask class due to issues when using threading module with + # cherrypy. + self.event_loop_thread = cherrypy.process.plugins.BackgroundTask( + 2, + self._event_loop_run + ) + self.event_loop_thread.setName('KimchiLibvirtEventLoop') + self.event_loop_thread.setDaemon(True) + self.event_loop_thread.start() + + # Set an event timeout to control the self._event_loop_run + if libvirt.virEventAddTimeout(0, self._kimchi_EventTimeout, None) < 0: + raise OperationFailed('KCHEVENT0002E') + + # List to control which domains are using events + self.vms_tracked = [] + + # Event loop method to be executed in background as thread + def _event_loop_run(self): + while True: + if libvirt.virEventRunDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0003E') + + def is_event_loop_alive(self): + return self.event_loop_thread.isAlive() + + # Event loop handler used to limit length of waiting for any other event. + def _kimchi_EventTimeout(self, timer, opaque): + time.sleep(1) + + def event_generic_cb(self, conn, dom, event, detail, *args): + """ + Generic callback to handle Domain (VMs) events. + """ + evStrings = ("Defined", "Undefined", "Started", "Suspended", "Resumed", + "Stopped", "Shutdown", "PMSuspended", "Crashed") + evDetails = (("Added", "Updated"), + ("Removed", ), + ("Booted", "Migrated", "Restored", "Snapshot", "Wakeup"), + ("Paused", "Migrated", "IOError", "Watchdog", "Restored", + "Snapshot", "API error"), + ("Unpaused", "Migrated", "Snapshot"), + ("Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", + "Failed", "Snapshot"), + ("Finished", ), + ("Memory", "Disk"), + ("Panicked")) + msg = "Libvirt Event: Domain %s %s %s" % (dom.name(), evStrings[event], + evDetails[event][detail]) + + wok_log.error(msg) + + def register_common_events(self, conn): + """ + Register the most common Libvirt events to be handled. + """ + conn = conn.get() + for ev in (libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE, + libvirt.VIR_DOMAIN_EVENT_ID_REBOOT, + libvirt.VIR_DOMAIN_EVENT_ID_RTC_CHANGE, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + libvirt.VIR_DOMAIN_EVENT_ID_GRAPHICS, + libvirt.VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + libvirt.VIR_DOMAIN_EVENT_ID_WATCHDOG): + conn.domainEventRegisterAny(None, ev, self.event_generic_cb, ev) diff --git a/model/model.py b/model/model.py index e44f804..dd50ec2 100644 --- a/model/model.py +++ b/model/model.py @@ -26,6 +26,7 @@ from wok.plugins.kimchi import config from wok.utils import import_module, listPathModules from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection +from wok.plugins.kimchi.model.libvirtevents import LibvirtEvents class Model(BaseModel): @@ -43,8 +44,11 @@ class Model(BaseModel): return instances self.objstore = ObjectStore(objstore_loc or config.get_object_store()) + self.events = LibvirtEvents() self.conn = LibvirtConnection(libvirt_uri) - kargs = {'objstore': self.objstore, 'conn': self.conn} + self.events.register_common_events(self.conn) + kargs = {'objstore': self.objstore, 'conn': self.conn, + 'eventsloop': self.events} models = [] # Import task model from Wok -- 2.5.0

4 3

[PATCH v2][Kimchi] Fix memory value return when hotplug memory devs
by Rodrigo Trujillo 29 Mar '16

29 Mar '16

There is an issue when Kimchi returns the value of memory, if the guest is running. It is returning the current memory value, instead of the total memory, which includes the value of the memory devices added. This patch fix this problem returning the total value: current memory + total of memory devs. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index e3bc266..08c3e45 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1228,7 +1228,11 @@ class VMModel(object): unit = 'KiB' memory = convert_data_size(val, unit, 'MiB') else: - memory = info[2] >> 10 + # Return current memory plus the amount of memory given by memory + # devices + root = ET.fromstring(xml) + totMemDevs = len(root.findall('./devices/memory')) * 1024 + memory = (info[2] >> 10) + totMemDevs # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

2 2

[PATCH][Kimchi] Add support to recognize latest CentOS version
by Rodrigo Trujillo 29 Mar '16

29 Mar '16

Latest CentOS (7) has a different identifier and Kimchi is not able to recognize the version and the os name in templates and in the guest. This patch changes the regular expression in order to cover latest version. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- isoinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isoinfo.py b/isoinfo.py index 3cd4daf..4cb0209 100644 --- a/isoinfo.py +++ b/isoinfo.py @@ -46,7 +46,7 @@ iso_dir = [ ('openbsd', lambda m: m.group(2), ('OpenBSD/(i386|amd64) (\d+\.\d+) Install CD')), ('centos', lambda m: m.group(1), - ('CentOS_(\d+\.\d+)_Final')), + ('CentOS[ _](\d+\.?\d?)[ _].+')), ('windows', '2000', ('W2AFPP|SP1AFPP|SP2AFPP|YRMAFPP|ZRMAFPP|W2AOEM|SP1AOEM|SP2AOEM' + '|YRMAOEM|ZRMAOEM|W2ASEL|SP2ASEL|W2SFPP|SP1SFPP|SP2SFPP|YRMSFPP' + -- 2.1.0

2 1

[PATCH][Kimchi] Check memory values in UI before submit request
by Rodrigo Trujillo 29 Mar '16

29 Mar '16

This patch adds a simple test to check memory values being submitted to backend, canceling the request if Memory is higher then Max Memory, avoiding useless requests. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 8 ++++++++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 9 insertions(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 19d9e7d..7a9c754 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -744,6 +744,14 @@ kimchi.guest_edit_main = function() { if (data['max-memory'] !== undefined) { data['max-memory'] = Number(data['max-memory']); } + + // Test memory values before submit. Avoid requests we know are going to fail + if ($('#guest-edit-memory-textbox').val() > $('#guest-edit-max-memory-textbox').val()) { + wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } + if (data['vcpus'] !== undefined) { var cpu = Number(data['vcpus']); var maxCpu = Number(data['max-processor']); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 5be0a66..153d7c2 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -66,6 +66,7 @@ "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", "KCHVM0001E": "$_("Input is not a number")", + "KCHVM0002E": "$_("Memory value cannot be higher then Max Memory value")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6003M": "$_("Attaching...")", -- 2.1.0

3 2

[PATCH v3][Kimchi] Fix memory value return when hotplug memory devs
by Rodrigo Trujillo 29 Mar '16

29 Mar '16

There is an issue when Kimchi returns the value of memory, if the guest is running. It is returning the current memory value, instead of the total memory, which includes the value of the memory devices added. This patch fix this problem returning the total value: current memory + total of memory devs. This patch computes the total of memory considering different memory device sizes and units. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index b56727e..a6db2bf 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1229,7 +1229,15 @@ class VMModel(object): unit = 'KiB' memory = convert_data_size(val, unit, 'MiB') else: - memory = info[2] >> 10 + # Return current memory plus the amount of memory given by memory + # devices + root = ET.fromstring(xml) + totMemDevs = 0 + for size in root.findall('./devices/memory/target/size'): + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + memory = (info[2] >> 10) + totMemDevs # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

2 1

[PATCH] [Wok] Implement Asynchronous Notifications backend
by Lucio Correia 29 Mar '16

29 Mar '16

* There is no POST method: a notification is added through add_notification() method. * Notifications are always stored in Wok object store under 'notification' type, even if added by a plugin. * Every time Wok is started, all notifications are erased, since this is a UI feature, intended to be showed to the user asynchronously, independent of which tab is opened. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- docs/API/notifications.md | 33 ++++++++++++++++++++++++++++ src/wok/control/notifications.py | 39 +++++++++++++++++++++++++++++++++ src/wok/i18n.py | 2 ++ src/wok/model/notifications.py | 47 ++++++++++++++++++++++++++++++++++++++++ src/wok/objectstore.py | 20 +++++++++++++++++ src/wok/server.py | 4 ++++ 6 files changed, 145 insertions(+) create mode 100644 docs/API/notifications.md create mode 100644 src/wok/control/notifications.py create mode 100644 src/wok/model/notifications.py IMPORTANT: This patch depends on WokMessage patch. diff --git a/docs/API/notifications.md b/docs/API/notifications.md new file mode 100644 index 0000000..fb0e691 --- /dev/null +++ b/docs/API/notifications.md @@ -0,0 +1,33 @@ +## REST API Specification for Notifications + +### Collection: Notifications + +**URI:** /notifications + +**Methods:** + +* **GET**: Retrieve a summarized list of current Notifications + +#### Examples +GET /notifications +[{Notification1}, {Notification2}, ...] + +### Resource: Notification + +**URI:** /notifications/*:id* + +A task represents an asynchronous operation that is being performed by the +server. + +**Methods:** + +* **GET**: Retrieve the full description of the Notification + * code: message ID + * message: message text already translated + +#### Examples +GET /notifications/KCHLIBVIRT0001W +{ + id: "KCHLIBVIRT0001W", + message: "KCHLIBVIRT0001W: Lack of storage space in guest vm-1", +} diff --git a/src/wok/control/notifications.py b/src/wok/control/notifications.py new file mode 100644 index 0000000..4e6d8d9 --- /dev/null +++ b/src/wok/control/notifications.py @@ -0,0 +1,39 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# Code derived from Project Kimchi +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 wok.control.base import Collection, Resource +from wok.control.utils import UrlSubNode + + +@UrlSubNode('notifications', True) +class Notifications(Collection): + def __init__(self, model): + super(Notifications, self).__init__(model) + self.resource = Notification + + +class Notification(Resource): + def __init__(self, model, id): + super(Notification, self).__init__(model, id) + + @property + def data(self): + return self.info diff --git a/src/wok/i18n.py b/src/wok/i18n.py index e6087f4..1bc92e3 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -45,6 +45,8 @@ messages = { "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), "WOKLOG0002E": _("Creation of log file failed: %(err)s"), + "WOKNOT0001E": _("Unable to find notification %(id)s"), + "WOKOBJST0001E": _("Unable to find %(item)s in datastore"), "WOKUTILS0001E": _("Unable to reach %(url)s. Make sure it is accessible and try again."), diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py new file mode 100644 index 0000000..7158571 --- /dev/null +++ b/src/wok/model/notifications.py @@ -0,0 +1,47 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 wok.exception import NotFoundError +from wok.message import WokMessage + + +class NotificationsModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def get_list(self): + with self.objstore as session: + return session.get_list('notification') + + +class NotificationModel(object): + def __init__(self, **kargs): + self.objstore = kargs['objstore'] + + def lookup(self, id): + with self.objstore as session: + notification = session.get('notification', str(id)) + + # use WokMessage to translate the notification + if notification: + plugin = notification.pop('_plugin_name', None) + message = WokMessage(id, notification, plugin).get_text() + return {"code": id, "message": message} + + raise NotFoundError("WOKNOT0001E", {'id': str(id)}) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index 59354f3..2bae30b 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -144,3 +144,23 @@ class ObjectStore(object): # exception again wok_log.error(traceback.format_exc()) return False + + +def add_notification(code="", args={}, plugin_name=None): + try: + args.update({"_plugin_name": plugin_name}) + + with ObjectStore() as session: + session.store('notification', code, args) + except Exception as e: + wok_log.error("Unable to generate notification: %s" % e.message) + + +def clean_notifications(): + try: + with ObjectStore() as session: + notifications = session.get_list('notification') + for item in notifications: + session.delete('notification', item) + except Exception as e: + wok_log.error("Unable to clean notifications: %s" % e.message) diff --git a/src/wok/server.py b/src/wok/server.py index 902d4bf..a329ed4 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,6 +33,7 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model +from wok.objectstore import clean_notifications from wok.proxy import start_proxy, terminate_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot @@ -106,6 +107,9 @@ class Server(object): if dev_env: cherrypy.log.screen = True + # clean object store notifications + clean_notifications() + # close standard file handlers because we are going to use a # watchedfiled handler, otherwise we will have two file handlers # pointing to the same file, duplicating log enries -- 1.9.1

3 4

[PATCH V2] [Wok] Implement WokMessage class
by Lucio Correia 29 Mar '16

29 Mar '16

WokMessage is a generic message implementation, which looks up and translates error messages for all plugins and Wok itself. Lookup and translation code was adapted from WokException class, which now just uses WokMessage. WokMessage is intended to be used by other modules dealing with messages, such as User Request Log and future feature Asynchronous Notifications. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/exception.py | 45 +++--------------------------- src/wok/message.py | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 41 deletions(-) create mode 100644 src/wok/message.py diff --git a/src/wok/exception.py b/src/wok/exception.py index 023334b..52f007e 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -20,53 +20,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import cherrypy -import gettext -from wok.i18n import messages as _messages -from wok.template import get_lang, validate_language +from wok.message import WokMessage class WokException(Exception): def __init__(self, code='', args={}): self.code = code - - for key, value in args.iteritems(): - if isinstance(value, unicode): - continue - - # value is not unicode: convert it - try: - # In case the value formats itself to an ascii string. - args[key] = unicode(str(value), 'utf-8') - except UnicodeEncodeError: - # In case the value is a WokException or it formats - # itself to a unicode string. - args[key] = unicode(value) - - # First, check if it is a Wok error message, then search in plugin - # error messages list - msg = _messages.get(code, code) - if (msg == code) and (cherrypy.request.app): - msg = self._get_translation() - - msg = unicode(msg, 'utf-8') % args - pattern = "%s: %s" % (code, msg) - cherrypy.log.error_log.error(pattern) - Exception.__init__(self, pattern) - - def _get_translation(self): - lang = validate_language(get_lang()) - paths = cherrypy.request.app.root.paths - domain = cherrypy.request.app.root.domain - messages = cherrypy.request.app.root.messages - text = messages.get(self.code, self.code) - - try: - translation = gettext.translation(domain, paths.mo_dir, [lang]) - except: - translation = gettext - - return translation.gettext(text) + msg = WokMessage(code, args).get_text() + cherrypy.log.error_log.error(msg) + Exception.__init__(self, msg) class NotFoundError(WokException): diff --git a/src/wok/message.py b/src/wok/message.py new file mode 100644 index 0000000..3167f1f --- /dev/null +++ b/src/wok/message.py @@ -0,0 +1,79 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2015-2016 +# +# Code derived from Project Kimchi +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 cherrypy +import gettext + +from wok.template import get_lang, validate_language + + +class WokMessage(object): + def __init__(self, code='', args={}, plugin=None): + # make all args unicode + for key, value in args.iteritems(): + if isinstance(value, unicode): + continue + + try: + # In case the value formats itself to an ascii string. + args[key] = unicode(str(value), 'utf-8') + except UnicodeEncodeError: + # In case the value is a WokException or it formats + # itself to a unicode string. + args[key] = unicode(value) + + self.code = code + self.args = args + self.plugin = plugin + + def _get_translation(self): + # get app from plugin path if specified + if self.plugin: + app = cherrypy.tree.apps[self.plugin] + # if on request, try to get app from it + elif cherrypy.request.app: + app = cherrypy.request.app + # fallback: get root app (WokRoot) + else: + app = cherrypy.tree.apps[''] + + # setup translation + domain = app.root.domain + paths = app.root.paths + lang = validate_language(get_lang()) + + try: + translation = gettext.translation(domain, paths.mo_dir, [lang]) + except: + translation = gettext + + # fallback to Wok message in case plugins raise Wok exceptions + text = app.root.messages.get(self.code, None) + if text is None: + wok_messages = cherrypy.tree.apps[''].root.messages + text = wok_messages.get(self.code, self.code) + + return translation.gettext(text) + + def get_text(self): + msg = self._get_translation() + msg = unicode(msg, 'utf-8') % self.args + return "%s: %s" % (self.code, msg) -- 1.9.1

2 1

[PATCH] [Wok] Updated Bootstrap-select library to latest version
by sguimaraes943＠gmail.com 29 Mar '16

29 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch updates Boootstrap-select files and wok customization SCSS / CSS. This patch is mandatory to enable multiple VEPA interfaces in Kimchi. Samuel Guimarães (1): Updated Bootstrap-select library to latest version ui/css/bootstrap-select.custom.css | 24 ++++++++++++++++++++++ ui/css/src/bootstrap-select.custom.scss | 21 +++++++++++++++++++ ui/js/src/wok.login.js | 4 ++-- ui/libs/bootstrap-select/LICENSE | 2 +- .../dist/css/bootstrap-select.min.css | 6 +++--- .../dist/js/bootstrap-select.min.js | 12 +++++------ 6 files changed, 57 insertions(+), 12 deletions(-) -- 1.8.3.1

3 4

Re: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout
by Samuel Henrique De Oliveira Guimaraes 29 Mar '16

29 Mar '16

I think this would have to go to the bugfix backlog for this release. I’m currently working on new features for Kimchi and Ginger but we’ll have to perform some enhancements on wok.window.js in order to work with ui tests and then we can investigate a fix once we start working on this task. I believe if we fix it in wok.window widget it would automatically work for all pages and plugins. Samuel From: Harshal Patil [mailto:harshal.patil@in.ibm.com] Sent: terça-feira, 29 de março de 2016 03:04 To: Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br> Cc: alinefm(a)linux.vnet.ibm.com; Chandra Sr Potula <chandra.shekhar(a)in.ibm.com>; kimchi-devel(a)ovirt.org Subject: Re: RE: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout That's great. Would you be able to fix this issue? I don't have much insight into UI. ----- Original message ----- From: Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br<mailto:samuel.guimaraes@eldorado.org.br>> To: Harshal Patil/India/IBM@IBMIN, "alinefm(a)linux.vnet.ibm.com<mailto:alinefm@linux.vnet.ibm.com>" <alinefm(a)linux.vnet.ibm.com<mailto:alinefm@linux.vnet.ibm.com>> Cc: Chandra Sr Potula/India/IBM@IBMIN, "kimchi-devel(a)ovirt.org<mailto:kimchi-devel@ovirt.org>" <kimchi-devel(a)ovirt.org<mailto:kimchi-devel@ovirt.org>> Subject: RE: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout Date: Thu, Mar 24, 2016 10:08 PM Hi, I was able to reproduce it here. I think we need to add a function to check if the user session is still valid before appending the modal window content inside the dialog and if it is not, then redirect to login page. Samuel From: Harshal Patil [mailto:harshal.patil@in.ibm.com] Sent: quinta-feira, 24 de março de 2016 13:13 To: alinefm(a)linux.vnet.ibm.com<mailto:alinefm@linux.vnet.ibm.com> Cc: Chandra Sr Potula <chandra.shekhar(a)in.ibm.com<mailto:chandra.shekhar@in.ibm.com>>; kimchi-devel(a)ovirt.org<mailto:kimchi-devel@ovirt.org>; Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br<mailto:samuel.guimaraes@eldorado.org.br>> Subject: Re: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout Screenshots, https://imgur.com/a/CcuMe ----- Original message ----- From: Aline Manera <alinefm(a)linux.vnet.ibm.com<mailto:alinefm@linux.vnet.ibm.com>> To: Harshal Patil/India/IBM@IBMIN, kimchi-devel(a)ovirt.org<mailto:kimchi-devel@ovirt.org>, samuel.guimaraes(a)eldorado.org.br<mailto:samuel.guimaraes@eldorado.org.br>, Chandra Sr Potula/India/IBM@IBMIN Cc: Subject: Re: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout Date: Thu, Mar 24, 2016 3:49 AM Thanks, Harshal, for reporting this problem! I will try to reproduce and update the issue according to my tests. On 03/23/2016 06:59 AM, Harshal Patil wrote: Hi, Wherever there are modal dialog boxes are used, the session timeout on UI is not handled properly. User is not able to log back in but instead is shown 405 error code. I have described the steps to reproduce here, https://github.com/kimchi-project/wok/issues/58 Let me know if you need more info. Harshal _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org<mailto:Kimchi-devel@ovirt.org> http://lists.ovirt.org/mailman/listinfo/kimchi-devel

1 0

Re: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout
by Samuel Henrique De Oliveira Guimaraes 29 Mar '16

29 Mar '16

Hi, I was able to reproduce it here. I think we need to add a function to check if the user session is still valid before appending the modal window content inside the dialog and if it is not, then redirect to login page. Samuel From: Harshal Patil [mailto:harshal.patil@in.ibm.com] Sent: quinta-feira, 24 de março de 2016 13:13 To: alinefm(a)linux.vnet.ibm.com Cc: Chandra Sr Potula <chandra.shekhar(a)in.ibm.com>; kimchi-devel(a)ovirt.org; Samuel Henrique De Oliveira Guimaraes <samuel.guimaraes(a)eldorado.org.br> Subject: Re: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout Screenshots, https://imgur.com/a/CcuMe ----- Original message ----- From: Aline Manera <alinefm(a)linux.vnet.ibm.com<mailto:alinefm@linux.vnet.ibm.com>> To: Harshal Patil/India/IBM@IBMIN, kimchi-devel(a)ovirt.org<mailto:kimchi-devel@ovirt.org>, samuel.guimaraes(a)eldorado.org.br<mailto:samuel.guimaraes@eldorado.org.br>, Chandra Sr Potula/India/IBM@IBMIN Cc: Subject: Re: [Kimchi-devel] [WOK][UI] Modal dialog box not able to log user back in after timeout Date: Thu, Mar 24, 2016 3:49 AM Thanks, Harshal, for reporting this problem! I will try to reproduce and update the issue according to my tests. On 03/23/2016 06:59 AM, Harshal Patil wrote: Hi, Wherever there are modal dialog boxes are used, the session timeout on UI is not handled properly. User is not able to log back in but instead is shown 405 error code. I have described the steps to reproduce here, https://github.com/kimchi-project/wok/issues/58 Let me know if you need more info. Harshal _______________________________________________ Kimchi-devel mailing list Kimchi-devel(a)ovirt.org<mailto:Kimchi-devel@ovirt.org> http://lists.ovirt.org/mailman/listinfo/kimchi-devel

2 1

Kimchi 2.1 is released!
by Aline Manera 28 Mar '16

28 Mar '16

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Kimchi 2.1*! Kimchi 2.1 depends on *Wok 2.1*! So make sure to have both of them properly installed in your system. Find more information about Wok 2.1 athttp://kimchi-project.github.io/wok/downloads Among many features, this release includes: ✔ Live migration support ✔ Guest memory hot plug support ✔ Guest serial console support ✔ Attach new disk to guest ✔ Linux bridges support ✔ VEPA network support ✔ Logical storage pool based on existing VG ✔ Maximum vCPUs support on Guests and Templates ✔ Maximum memory support on Guests and Templates ✔ Templates gallery view ✔ Guests gallery view ✔ Add user activity log support ✔ Bug fixes We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 23, Ubuntu 15.10, openSUSE LEAP 42.1, and RHEL 7.2. Kimchi uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔https://github.com/kimchi-project/kimchi/archive/2.1.0.tar.gz <https://github.com/kimchi-project/kimchi/archive/2.0.0.tar.gz> ✔ git clone --recursivehttps://github.com/kimchi-project/kimchi.git There are also some packages available for download at: ✔http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

2 1

[PATCH][Kimchi 0/6] Use a single field to create a template
by Ramon Medeiros 24 Mar '16

24 Mar '16

Instead of specify if the media is cdrom or disk, use source_media to create a template Ramon Medeiros (6): Create a single field to pass the installation media Method to retrieve stored templates at object store Fix checking duplicate template before creating it Identify installation media while creating template Only use source_media as boot media Update tests API.json | 5 ++ i18n.py | 2 +- model/templates.py | 13 ++-- tests/test_authorization.py | 4 +- tests/test_livemigration.py | 7 +- tests/test_mockmodel.py | 14 ++-- tests/test_model.py | 69 ++++++++++++-------- tests/test_rest.py | 32 ++++------ tests/test_template.py | 39 +++++------- tests/test_vmtemplate.py | 24 +++---- utils.py | 30 +++++++++ vmtemplate.py | 152 ++++++++++++++++++++++++++++++++++++++++---- 12 files changed, 279 insertions(+), 112 deletions(-) -- 2.5.5

3 21

easy install
by Nicolas Naud 24 Mar '16

24 Mar '16

Hello, I'm small administrator (rrot) for linux. It's possible easy installe for kimchi, I win a later 4 week for installing kimchi. thanks you -- Nicolas Naud Technicien informatique SFA - Administration générale - Service Informatique Général TSA 51106 9, Rue C C Chenou Bât B5 86073 POITIERS POITIERS CEDEX 9 Tél : +33 5 49 45 38 16 Port : 06.19.13.20.59 Courriel : nicolas.naud(a)univ-poitiers.fr

2 1

Wok 2.1 is released!
by Aline Manera 24 Mar '16

24 Mar '16

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Wok 2.1*! Among many features, Wok 2.1 includes: ✔ New Wok logo ✔ Plugins logo support ✔ User activity log support ✔ Allow user disable HTTP port ✔ Proxy websocket connections on nginx ✔ Rotate Wok logs ✔ Ensure plugins tab order ✔ Add multiple libraries to support new widgets ✔ Bootgrid plugin ✔ X-editable plugin ✔ Bootstrap Switch plugin ✔ Typeahead library ✔ JQuery ContainsNC library ✔ Bug fixes We have worked hard to ensure that Wok runs well on the most popular Linux distributions including: Fedora 23, Ubuntu 15.10, openSUSE LEAP 42.1, and RHEL 7.2. Wok uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔https://github.com/kimchi-project/wok/archive/2.1.0.tar.gz ✔ git clone --recursivehttps://github.com/kimchi-project/wok.git There are also some packages available at: ✔http://kimchi-project.github.io/wok/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

1 0

[WOK][UI] Modal dialog box not able to log user back in after timeout
by Harshal Patil 24 Mar '16

24 Mar '16

2 2

Re: [Kimchi-devel] [ginger-dev-list] [PATCH] [Ginger 4/4] Added support for UTF-8 encoding in user management.
by Archana Singh 24 Mar '16

24 Mar '16

Hi, Please find my comment below. Adding kimchi dev mailing and Aline as changes are suggested in wok util. Thanks, Archana Singh On 3/23/2016 12:33 PM, Daniel Henrique Barboza wrote: > > > On 03/23/2016 02:24 PM, Archana Singh wrote: >> >> >> On 3/23/2016 12:19 PM, Abhiram wrote: >>> On Wed, 2016-03-23 at 11:39 -0500, Archana Singh wrote: >>>> Hi Suresh, >>>> >>>> As all of these methods are not private methods, I will suggest to >>>> have >>>> check in all the methods. >>> Eventhough the methods arent private, the initial caller has to be >>> create,getlist,delete,lookup atleast as suresh mentioned from ui point. >>> I feel it has to be one place, rather than having in all sub methods >>> which is redundant in nature. >>> >>> If we want to have all places, do we want to have the unicode checking >>> and conversion into one common method and reuse the same everywhere? If >>> at all we have any change in future probably only one method we can >>> modify. >> >> I do understand the redundant point of view, but as these are not >> private methods can be called from any place. > > If it's a widespread issue then can we look at WoK engine code to fix > it for all cases and > plug-ins? > > I don't know if this is actually viable but at first it makes sense to > me. Would need > some investigation. > > > Daniel Hi Daniel, Are you pointing to have common wok util method for checking isinstance of unicode and encoding to utf-8? @Aline: Adding kimchi dev list and you to discuss this further as change is suggested in wok. Please provide you input. Thanks, Archana Singh > >> As we do not have type check for the parameter in the method, it is >> safe to ensure that we do not end up in some encoding issue. >> >>>> Thanks, >>>> Archana Singh >>>> >>>> On 3/23/2016 2:05 AM, Suresh Babu Angadi wrote: >>>>> Hi Archana, >>>>> Instead of checking unicode in every method, can we have it only in >>>>> UsersModel and UserModel - create, getlist, delete, lookup? >>>>> >>>>> On 03/22/2016 03:52 AM, archus(a)linux.vnet.ibm.com wrote: >>>>>> From: Archana Singh <archus(a)linux.vnet.ibm.com> >>>>>> >>>>>> --- >>>>>> i18n.py | 3 ++- >>>>>> model/users.py | 69 >>>>>> ++++++++++++++++++++++++++++++++++++++++++++++++---------- >>>>>> 2 files changed, 59 insertions(+), 13 deletions(-) >>>>>> >>>>>> diff --git a/i18n.py b/i18n.py >>>>>> index 78260a0..6729bf3 100644 >>>>>> --- a/i18n.py >>>>>> +++ b/i18n.py >>>>>> @@ -124,10 +124,11 @@ messages = { >>>>>> "GINUSER0006E": _("Could not add user '%(user)s' to kvm >>>>>> group."), >>>>>> "GINUSER0007E": _("Could not add user '%(user)s' to sudoers >>>>>> list."), >>>>>> "GINUSER0008E": _("The user name '%(user)s' is already in >>>>>> use'."), >>>>>> - "GINUSER0009E": _("Could not create user '%(user)s'."), >>>>>> + "GINUSER0009E": _("Could not create user '%(user)s', error: >>>>>> %(err)s'."), >>>>>> "GINUSER0010E": _("Could not delete user '%(user)s'."), >>>>>> "GINUSER0011E": _("User '%(user)s' does not exist."), >>>>>> "GINUSER0012E": _("Could not delete group '%(group)s'"), >>>>>> + "GINUSER0013E": _("Could not create group name'%(group)s', >>>>>> error: %(err)s'."), >>>>>> >>>>>> "GINFW0001E": _("Cannot update system firmware while running >>>>>> VMs."), >>>>>> "GINFW0002E": _("Firmware image unpack failed: rc = %(rc)s. " >>>>>> diff --git a/model/users.py b/model/users.py >>>>>> index a05bd5f..f8f450d 100644 >>>>>> --- a/model/users.py >>>>>> +++ b/model/users.py >>>>>> @@ -1,3 +1,4 @@ >>>>>> +# -*- coding: utf-8 -*- >>>>>> # >>>>>> # Project Ginger >>>>>> # >>>>>> @@ -51,6 +52,8 @@ def get_group_obj_by_gid(gid): >>>>>> >>>>>> def get_group_gid(groupname): >>>>>> adm = libuser.admin() >>>>>> + if isinstance(groupname, unicode): >>>>>> + groupname = groupname.encode('utf-8') >>>>>> group = adm.lookupGroupByName(groupname) >>>>>> if group is None: >>>>>> return None >>>>>> @@ -58,19 +61,30 @@ def get_group_gid(groupname): >>>>>> >>>>>> >>>>>> def create_group(groupname, gid): >>>>>> - adm = libuser.admin() >>>>>> - group = adm.lookupGroupByName(groupname) >>>>>> - if not group: >>>>>> - new_group = adm.initGroup(groupname) >>>>>> - new_group.set(libuser.GIDNUMBER, gid) >>>>>> - adm.addGroup(new_group) >>>>>> - return gid >>>>>> - else: >>>>>> - return group.get('pw_gid')[0] >>>>>> + try: >>>>>> + adm = libuser.admin() >>>>>> + if isinstance(groupname, unicode): >>>>>> + groupname = groupname.encode('utf-8') >>>>>> + if isinstance(gid, unicode): >>>>>> + gid = gid.encode('utf-8') >>>>>> + group = adm.lookupGroupByName(groupname) >>>>>> + if not group: >>>>>> + new_group = adm.initGroup(groupname) >>>>>> + new_group.set(libuser.GIDNUMBER, gid) >>>>>> + adm.addGroup(new_group) >>>>>> + return gid >>>>>> + else: >>>>>> + return group.get('pw_gid')[0] >>>>>> + except Exception as e: >>>>>> + wok_log.error('Could not create group name %s, error: %s', >>>>>> + groupname, e) >>>>>> + raise OperationFailed('GINUSER0013E', {'group': groupname, >>>>>> 'err': e}) >>>>>> >>>>>> >>>>>> def delete_group(groupname): >>>>>> adm = libuser.admin() >>>>>> + if isinstance(groupname, unicode): >>>>>> + groupname = groupname.encode('utf-8') >>>>>> group_obj = adm.lookupGroupById( >>>>>> int(get_group_gid(groupname)) >>>>>> ) >>>>>> @@ -89,6 +103,8 @@ def delete_group(groupname): >>>>>> >>>>>> def get_users_from_group(groupname): >>>>>> adm = libuser.admin() >>>>>> + if isinstance(groupname, unicode): >>>>>> + groupname = groupname.encode('utf-8') >>>>>> group_obj = adm.lookupGroupById( >>>>>> int(get_group_gid(groupname)) >>>>>> ) >>>>>> @@ -108,6 +124,8 @@ def get_users(exclude_system_users=True): >>>>>> >>>>>> def get_user_obj(username): >>>>>> adm = libuser.admin() >>>>>> + if isinstance(username, unicode): >>>>>> + username = username.encode('utf-8') >>>>>> return adm.lookupUserByName(username) >>>>>> >>>>>> >>>>>> @@ -120,6 +138,10 @@ def gen_salt(): >>>>>> >>>>>> def create_user(name, plain_passwd, profile=None, gid=None): >>>>>> adm = libuser.admin() >>>>>> + if isinstance(name, unicode): >>>>>> + name = name.encode('utf-8') >>>>>> + if isinstance(gid, unicode): >>>>>> + gid = gid.encode('utf-8') >>>>>> user = adm.lookupUserByName(name) >>>>>> if user: >>>>>> msg = 'User/Login "%s" already in use' % name >>>>>> @@ -150,15 +172,23 @@ def create_user(name, plain_passwd, >>>>>> profile=None, gid=None): >>>>>> enc_pwd = crypt.crypt(plain_passwd, salt) >>>>>> >>>>>> adm.setpassUser(new_user, enc_pwd, True) >>>>>> + except UnicodeEncodeError as ue: >>>>>> + err_msg = ue.message if ue.message else 'Username / >>>>>> password \ >>>>>> + has NON - ASCII charater' >>>>>> + wok_log.error('Could not create user %s, error: %s', name, >>>>>> err_msg) >>>>>> + raise OperationFailed('GINUSER0009E', {'user': name, 'err': >>>>>> err_msg}) >>>>>> except Exception as e: >>>>>> - wok_log.error('Could not create user %s, error: %s', >>>>>> name, e) >>>>>> - raise OperationFailed('GINUSER0009E', {'user': name}) >>>>>> + err_msg = e.message if e.message else e >>>>>> + wok_log.error('Could not create user %s, error: %s', name, >>>>>> err_msg) >>>>>> + raise OperationFailed('GINUSER0009E', {'user': name, 'err': >>>>>> err_msg}) >>>>>> >>>>>> return new_user >>>>>> >>>>>> >>>>>> def delete_user(username): >>>>>> adm = libuser.admin() >>>>>> + if isinstance(username, unicode): >>>>>> + username = username.encode('utf-8') >>>>>> user_obj = adm.lookupUserByName(username) >>>>>> >>>>>> if user_obj is None: >>>>>> @@ -182,6 +212,11 @@ class UsersModel(object): >>>>>> profile = params['profile'] >>>>>> groupname = params['group'] >>>>>> >>>>>> + if isinstance(username, unicode): >>>>>> + username = username.encode('utf-8') >>>>>> + if isinstance(groupname, unicode): >>>>>> + groupname = groupname.encode('utf-8') >>>>>> + >>>>>> gid = get_group_gid(groupname) >>>>>> if gid is None: >>>>>> user = create_user(username, passwd, profile=profile) >>>>>> @@ -213,6 +248,8 @@ class UsersModel(object): >>>>>> # Add new user to KVM group >>>>>> adm = libuser.admin() >>>>>> kvmgrp = get_group_obj('kvm') >>>>>> + if isinstance(user, unicode): >>>>>> + user = user.encode('utf-8') >>>>>> kvmgrp.add('gr_mem', user) >>>>>> ret = adm.modifyGroup(kvmgrp) >>>>>> if ret != 1: >>>>>> @@ -227,6 +264,7 @@ class UsersModel(object): >>>>>> >>>>>> >>>>>> class UserModel(object): >>>>>> + >>>>>> def delete(self, user): >>>>>> user_obj = get_user_obj(user) >>>>>> group_obj = get_group_obj_by_gid( >>>>>> @@ -252,7 +290,10 @@ class UserModel(object): >>>>>> group_name = grp.getgrgid(user_info.pw_gid).gr_name >>>>>> >>>>>> except KeyError: >>>>>> - group_name = str(user_info.pw_gid) >>>>>> + pw_gid = user_info.pw_gid >>>>>> + if isinstance(pw_gid, unicode): >>>>>> + pw_gid = pw_gid.encode('utf-8') >>>>>> + group_name = str(pw_gid) >>>>>> >>>>>> return {"name": user, >>>>>> "uid": user_info.pw_uid, >>>>>> @@ -263,6 +304,8 @@ class UserModel(object): >>>>>> def _get_user_profile(self, user): >>>>>> # ADMIN: Check /etc/sudoers.d >>>>>> adm = libuser.admin() >>>>>> + if isinstance(user, unicode): >>>>>> + user = user.encode('utf-8') >>>>>> if os.path.isfile(SUDOERS_FILE % user): >>>>>> return 'admin' >>>>>> else: >>>>>> @@ -278,6 +321,8 @@ class UserModel(object): >>>>>> return 'kimchiuser' >>>>>> >>>>>> def _delete_profile_settings(self, user): >>>>>> + if isinstance(user, unicode): >>>>>> + user = user.encode('utf-8') >>>>>> profile = self._get_user_profile(user) >>>>>> if profile == 'kimchiuser': >>>>>> return >>> >> >

1 0

Wok and Kimchi 2.1.0 tagged!
by Aline Manera 24 Mar '16

24 Mar '16

Hi all, I've just tagged the content for Wok and Kimchi 2.1 release. The official announcement will be done tomorrow and some packages will be available for download. I also merged the next branch into master and deleted it. So all the patches will be applied on master branch from now on. Regards, Aline Manera

2 4

[PATCH] [Kimchi] Enabling multiselect for VEPA networks
by sguimaraes943＠gmail.com 23 Mar '16

23 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch enables multiselect when the user chooses a VEPA network in "Add a Network" modal window. -Multiselect is enabled when interfaces > 1 -If nothing is selected, "Create" button won't be disabled but an error message will be displayed. -Default text when multiselect is enabled is "Select an Interface" -Search/filter is enabled when interfaces > 10 This won't work unless the latest version of Bootstrap-select is applied (patch sent to ML). Samuel Guimarães (1): Enabling multiselect for VEPA networks ui/js/src/kimchi.network_add_main.js | 10 ++++++++++ ui/pages/network-add.html.tmpl | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) -- 1.8.3.1

3 3

[PATCH] [Kimchi] Remove View Console link from guests that doesn't support vnc/spice
by Jose Ricardo Ziviani 23 Mar '16

23 Mar '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2542a63..4e588e2 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -693,6 +693,8 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { }); consoleActions.show(); } else { //we don't recognize the VMs supported graphics, so hide the menu choice + result.find('.vnc-link').css("display", "none"); + result.find('.column-vnc').html('--'); consoleActions.hide(); consoleActions.off("click", function(event) { event.preventDefault(); -- 1.9.1

2 1

[PATCH] [Kimchi] Add 'Current' to CPU Number/CPUs where needed
by Socorro Stoppler 23 Mar '16

23 Mar '16

Adding 'Current' to CPU Number/CPUs per feedback in bugzilla# 133521 Socorro Stoppler (1): Change CPU Number/CPUs to Current CPU Number/Current CPUs per feedback from bugzilla# 133521 ui/pages/guest-add.html.tmpl | 2 +- ui/pages/tabs/templates.html.tmpl | 6 +++--- ui/pages/template-edit.html.tmpl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 1.9.1

3 3

[PATCH] [Wok] Implement WokMessage class
by Lucio Correia 23 Mar '16

23 Mar '16

WokMessage is a generic message implementation, which looks up and translates error messages for all plugins and Wok itself. Lookup and translation code was adapted from WokException class, which now just uses WokMessage. WokMessage is intended to be used by other modules dealing with messages, such as User Request Log and future feature Asynchronous Notifications. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/exception.py | 45 +++----------------------------- src/wok/message.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 41 deletions(-) create mode 100644 src/wok/message.py diff --git a/src/wok/exception.py b/src/wok/exception.py index 023334b..52f007e 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -20,53 +20,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import cherrypy -import gettext -from wok.i18n import messages as _messages -from wok.template import get_lang, validate_language +from wok.message import WokMessage class WokException(Exception): def __init__(self, code='', args={}): self.code = code - - for key, value in args.iteritems(): - if isinstance(value, unicode): - continue - - # value is not unicode: convert it - try: - # In case the value formats itself to an ascii string. - args[key] = unicode(str(value), 'utf-8') - except UnicodeEncodeError: - # In case the value is a WokException or it formats - # itself to a unicode string. - args[key] = unicode(value) - - # First, check if it is a Wok error message, then search in plugin - # error messages list - msg = _messages.get(code, code) - if (msg == code) and (cherrypy.request.app): - msg = self._get_translation() - - msg = unicode(msg, 'utf-8') % args - pattern = "%s: %s" % (code, msg) - cherrypy.log.error_log.error(pattern) - Exception.__init__(self, pattern) - - def _get_translation(self): - lang = validate_language(get_lang()) - paths = cherrypy.request.app.root.paths - domain = cherrypy.request.app.root.domain - messages = cherrypy.request.app.root.messages - text = messages.get(self.code, self.code) - - try: - translation = gettext.translation(domain, paths.mo_dir, [lang]) - except: - translation = gettext - - return translation.gettext(text) + msg = WokMessage(code, args).get_text() + cherrypy.log.error_log.error(msg) + Exception.__init__(self, msg) class NotFoundError(WokException): diff --git a/src/wok/message.py b/src/wok/message.py new file mode 100644 index 0000000..e982fba --- /dev/null +++ b/src/wok/message.py @@ -0,0 +1,73 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2015-2016 +# +# Code derived from Project Kimchi +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# 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 cherrypy +import gettext + +from wok.template import get_lang, validate_language + + +class WokMessage(object): + def __init__(self, code='', args={}, plugin=None): + # make all args unicode + for key, value in args.iteritems(): + if isinstance(value, unicode): + continue + + try: + # In case the value formats itself to an ascii string. + args[key] = unicode(str(value), 'utf-8') + except UnicodeEncodeError: + # In case the value is a WokException or it formats + # itself to a unicode string. + args[key] = unicode(value) + + self.code = code + self.args = args + self.plugin = plugin + + def _get_translation(self): + # get app from plugin path if specified + if self.plugin: + app = cherrypy.tree.apps[self.plugin] + # if on request, try to get app from it + elif cherrypy.request.app: + app = cherrypy.request.app + # fallback: get root app (WokRoot) + else: + app = cherrypy.tree.apps[''] + + domain = app.root.domain + paths = app.root.paths + text = app.root.messages.get(self.code, self.code) + lang = validate_language(get_lang()) + + try: + translation = gettext.translation(domain, paths.mo_dir, [lang]) + except: + translation = gettext + + return translation.gettext(text) + + def get_text(self): + msg = self._get_translation() + msg = unicode(msg, 'utf-8') % self.args + return "%s: %s" % (self.code, msg) -- 1.9.1

3 2

[PATCH][Kimchi] Fix memory value return when hotplug memory devs
by Rodrigo Trujillo 23 Mar '16

23 Mar '16

There is an issue when Kimchi returns the value of memory. It is returning the current memory value, instead of the total memory, which includes the value of the memory devices added. This patch fix this problem returning the total value from "dom.info". Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index e3bc266..396758d 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1228,7 +1228,17 @@ class VMModel(object): unit = 'KiB' memory = convert_data_size(val, unit, 'MiB') else: - memory = info[2] >> 10 + # If guest is running we need information in real time, in order + # to get real value if memory devices were added: + # + # Class Libvirt::Domain::Info + # cpu_time[R] + # max_mem[R] -> current memory plus memory devs (use it) + # memory[R] -> current memory only, does not include mem devs + # nr_virt_cpu[R] + # state[R] + # + memory = info[1] >> 10 # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

2 1

[PATCH v2][Kimchi 1/2] Issue #838: Extend memory hotplug feature test
by Rodrigo Trujillo 23 Mar '16

23 Mar '16

If QEMU version is < 2.1, qemu is not going to start guest which have maxmemory tag configured in the XML. Kimchi adds this tag by default in order to allow memory hotplug. In other words, in order to allow memory hotplug, versions must be libvirt >= 1.2.14 and qemu >= 2.1. Libvirt was already being tested by the feature test, but qemu did not. Distros as Red Hat 7 and CentOS still are in qemu 1.5. This patch extend the feature test and do not create maxmemory tag in order to avoid problems in those distros. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/featuretests.py | 20 +++++++++++++------- model/vms.py | 11 ++++++++++- tests/test_model.py | 5 +++-- vmtemplate.py | 4 +++- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/i18n.py b/i18n.py index beefeb5..6214687 100644 --- a/i18n.py +++ b/i18n.py @@ -99,7 +99,7 @@ messages = { "KCHVM0043E": _("Only increase memory is allowed in active VMs"), "KCHVM0044E": _("For live memory update, new memory value must be equal old memory value plus multiples of 1024 Mib"), "KCHVM0045E": _("There are not enough free slots of 1024 Mib in the guest."), - "KCHVM0046E": _("Host's libvirt version does not support memory devices. Libvirt must be >= 1.2.14"), + "KCHVM0046E": _("Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1."), "KCHVM0047E": _("Error attaching memory device. Details: %(error)s"), "KCHVM0048E": _("Cannot start %(name)s. Virtual machine is already running."), "KCHVM0049E": _("Cannot power off %(name)s. Virtual machine is shut off."), diff --git a/model/featuretests.py b/model/featuretests.py index 378335a..ba728e1 100644 --- a/model/featuretests.py +++ b/model/featuretests.py @@ -72,6 +72,14 @@ MAXMEM_VM_XML = """ <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> </os> + <cpu> + <numa> + <cell id='0' cpus='0' memory='10240' unit='KiB'/> + </numa> + </cpu> + <features> + <acpi/> + </features> </domain>""" DEV_MEM_XML = """ @@ -209,13 +217,9 @@ class FeatureTests(object): A memory device can be hot-plugged or hot-unplugged since libvirt version 1.2.14. ''' - # Libvirt < 1.2.14 does not support memory devices, so firstly, check - # its version, then try to attach a device. These steps avoid errors - # with Libvirt 'test' driver for KVM - version = 1000000*1 + 1000*2 + 14 - if libvirt.getVersion() < version: - return False - + # Libvirt < 1.2.14 does not support memory devices, so try to attach a + # device. Then check if QEMU (>= 2.1) supports memory hotplug, starting + # the guest These steps avoid errors with Libvirt 'test' driver for KVM with RollbackContext() as rollback: FeatureTests.disable_libvirt_error_logging() rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) @@ -230,6 +234,8 @@ class FeatureTests(object): try: dom.attachDeviceFlags(DEV_MEM_XML, libvirt.VIR_DOMAIN_MEM_CONFIG) + dom.create() + rollback.prependDefer(dom.destroy) return True except libvirt.libvirtError: return False diff --git a/model/vms.py b/model/vms.py index 03ffdae..e3bc266 100644 --- a/model/vms.py +++ b/model/vms.py @@ -170,7 +170,8 @@ class VMsModel(object): stream_protocols = self.caps.libvirt_stream_protocols xml = t.to_vm_xml(name, vm_uuid, libvirt_stream_protocols=stream_protocols, - graphics=graphics) + graphics=graphics, + mem_hotplug_support = self.caps.mem_hotplug_support) cb('Defining new VM') try: @@ -809,6 +810,14 @@ class VMModel(object): return (nonascii_name if nonascii_name is not None else vm_name, dom) def _update_memory_config(self, xml, params): + # Cannot pass max memory if there is not support to memory hotplug + # Then set max memory as memory, just to continue with the update + if not self.caps.mem_hotplug_support: + if 'maxmemory' in params['memory']: + raise InvalidOperation("KCHVM0046E") + else: + params['memory']['maxmemory'] = params['memory']['current'] + root = ET.fromstring(xml) # MiB to KiB hasMem = 'current' in params['memory'] diff --git a/tests/test_model.py b/tests/test_model.py index b461172..c91ba8f 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -912,13 +912,14 @@ class ModelTests(unittest.TestCase): # rename and increase memory when vm is not running params = {'name': u'пeω-∨м', - 'memory': {'current': 2048, - 'maxmemory': 2048}} + 'memory': {'current': 2048}} inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, u'пeω-∨м') self.assertEquals(info['uuid'], inst.vm_lookup(u'пeω-∨м')['uuid']) info = inst.vm_lookup(u'пeω-∨м') + # Max memory is returned, add to test + params['memory']['maxmemory'] = 2048 for key in params.keys(): self.assertEquals(params[key], info[key]) diff --git a/vmtemplate.py b/vmtemplate.py index 4bcf324..653ad02 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -376,7 +376,9 @@ class VMTemplate(object): # Rearrange memory parameters params['memory'] = self.info['memory'].get('current') params['max_memory'] = "" - if memory != maxmemory: + # if there is not support to memory hotplug in Libvirt or qemu, we + # cannot add the tag maxMemory + if memory != maxmemory and kwargs.get('mem_hotplug_support', True): maxmem_xml = "<maxMemory slots='%s' unit='MiB'>%s</maxMemory>" params['max_memory'] = maxmem_xml % (slots, maxmemory) -- 2.1.0

2 2

[PATCH][Kimchi 0/6] Use a single field to create a template
by Ramon Medeiros 23 Mar '16

23 Mar '16

Instead of specify if the media is cdrom or disk, use source_media to create a template Ramon Medeiros (6): Create a single field to pass the installation media Method to retrieve stored templates at object store Fix checking duplicate template before creating it Identify installation media while creating template Only use source_media as boot media Update tests API.json | 5 ++ i18n.py | 2 +- model/templates.py | 13 ++-- tests/test_authorization.py | 4 +- tests/test_livemigration.py | 7 +- tests/test_mockmodel.py | 14 ++-- tests/test_model.py | 69 ++++++++++++-------- tests/test_rest.py | 32 ++++------ tests/test_template.py | 39 +++++------- tests/test_vmtemplate.py | 24 +++---- utils.py | 30 +++++++++ vmtemplate.py | 152 ++++++++++++++++++++++++++++++++++++++++---- 12 files changed, 279 insertions(+), 112 deletions(-) -- 2.5.0

2 9

[PATCH] [Kimchi] Adding wok version dependency
by dhbarboza82＠gmail.com 23 Mar '16

23 Mar '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch adds WoK dependency >= 2.1.0 for the upcoming Kimchi 2.1.0 release packaging. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- contrib/DEBIAN/control.in | 2 +- contrib/kimchi.spec.fedora.in | 2 +- contrib/kimchi.spec.suse.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index b6acdaf..6cfd8ee 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -3,7 +3,7 @@ Version: @PACKAGE_VERSION@ Section: base Priority: optional Architecture: all -Depends: wok, +Depends: wok (>= 2.1.0), ginger-base, python-imaging, python-configobj, diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 292ad03..29d4463 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -7,7 +7,7 @@ BuildArch: noarch Group: System Environment/Base License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz -Requires: wok +Requires: wok >= 2.1.0 Requires: ginger-base Requires: qemu-kvm Requires: gettext diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 7a57538..c12bcab 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -7,7 +7,7 @@ BuildArch: noarch Group: System Environment/Base License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz -Requires: wok +Requires: wok >= 2.1.0 Requires: ginger-base Requires: kvm Requires: gettext-tools -- 2.5.0

2 1

[PATCH][Kimchi 1/2] Issue #838: Extend memory hotplug feature test
by Rodrigo Trujillo 23 Mar '16

23 Mar '16

If QEMU version is < 2.1, qemu is not going to start guest which have maxmemory tag configured in the XML. Kimchi adds this tag by default in order to allow memory hotplug. In other words, in order to allow memory hotplug, versions must be libvirt >= 1.2.14 and qemu >= 2.1. Libvirt was already being tested by the feature test, but qemu did not. Distros as Red Hat 7 and CentOS still are in qemu 1.5. This patch extend the feature test and do not create maxmemory tag in order to avoid problems in those distros. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/featuretests.py | 20 +++++++++++++------- model/vms.py | 8 ++++++++ vmtemplate.py | 7 ++++++- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/i18n.py b/i18n.py index beefeb5..6214687 100644 --- a/i18n.py +++ b/i18n.py @@ -99,7 +99,7 @@ messages = { "KCHVM0043E": _("Only increase memory is allowed in active VMs"), "KCHVM0044E": _("For live memory update, new memory value must be equal old memory value plus multiples of 1024 Mib"), "KCHVM0045E": _("There are not enough free slots of 1024 Mib in the guest."), - "KCHVM0046E": _("Host's libvirt version does not support memory devices. Libvirt must be >= 1.2.14"), + "KCHVM0046E": _("Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1."), "KCHVM0047E": _("Error attaching memory device. Details: %(error)s"), "KCHVM0048E": _("Cannot start %(name)s. Virtual machine is already running."), "KCHVM0049E": _("Cannot power off %(name)s. Virtual machine is shut off."), diff --git a/model/featuretests.py b/model/featuretests.py index 378335a..ba728e1 100644 --- a/model/featuretests.py +++ b/model/featuretests.py @@ -72,6 +72,14 @@ MAXMEM_VM_XML = """ <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> </os> + <cpu> + <numa> + <cell id='0' cpus='0' memory='10240' unit='KiB'/> + </numa> + </cpu> + <features> + <acpi/> + </features> </domain>""" DEV_MEM_XML = """ @@ -209,13 +217,9 @@ class FeatureTests(object): A memory device can be hot-plugged or hot-unplugged since libvirt version 1.2.14. ''' - # Libvirt < 1.2.14 does not support memory devices, so firstly, check - # its version, then try to attach a device. These steps avoid errors - # with Libvirt 'test' driver for KVM - version = 1000000*1 + 1000*2 + 14 - if libvirt.getVersion() < version: - return False - + # Libvirt < 1.2.14 does not support memory devices, so try to attach a + # device. Then check if QEMU (>= 2.1) supports memory hotplug, starting + # the guest These steps avoid errors with Libvirt 'test' driver for KVM with RollbackContext() as rollback: FeatureTests.disable_libvirt_error_logging() rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) @@ -230,6 +234,8 @@ class FeatureTests(object): try: dom.attachDeviceFlags(DEV_MEM_XML, libvirt.VIR_DOMAIN_MEM_CONFIG) + dom.create() + rollback.prependDefer(dom.destroy) return True except libvirt.libvirtError: return False diff --git a/model/vms.py b/model/vms.py index 03ffdae..557d37a 100644 --- a/model/vms.py +++ b/model/vms.py @@ -809,6 +809,14 @@ class VMModel(object): return (nonascii_name if nonascii_name is not None else vm_name, dom) def _update_memory_config(self, xml, params): + # Cannot pass max memory if there is not support to memory hotplug + # Then set max memory as memory, just to continue with the update + if not self.caps.mem_hotplug_support: + if 'maxmemory' in params['memory']: + raise InvalidOperation("KCHVM0046E") + else: + params['memory']['maxmemory'] = params['memory']['current'] + root = ET.fromstring(xml) # MiB to KiB hasMem = 'current' in params['memory'] diff --git a/vmtemplate.py b/vmtemplate.py index 4bcf324..535efd7 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -32,6 +32,7 @@ from wok.exception import MissingParameter, OperationFailed from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.isoinfo import IsoImage +from wok.plugins.kimchi.model.config import CapabilitiesModel from wok.plugins.kimchi.utils import check_url_path, pool_name_from_uri from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml from wok.plugins.kimchi.xmlutils.disk import get_disk_xml @@ -118,6 +119,8 @@ class VMTemplate(object): disk_info['index'] = disk_info.get('index', index) self.info['disks'][index] = disk_info + self.caps = CapabilitiesModel() + def _get_os_info(self, args, scan): distro = version = 'unknown' @@ -376,7 +379,9 @@ class VMTemplate(object): # Rearrange memory parameters params['memory'] = self.info['memory'].get('current') params['max_memory'] = "" - if memory != maxmemory: + # if there is not support to memory hotplug in Libvirt or qemu, we + # cannot add the tag maxMemory + if memory != maxmemory and self.caps.mem_hotplug_support: maxmem_xml = "<maxMemory slots='%s' unit='MiB'>%s</maxMemory>" params['max_memory'] = maxmem_xml % (slots, maxmemory) -- 2.1.0

3 5

[PATCH] [Wok] Issue #41: encode of ident should only happen if it is of type unicode.
by archus＠linux.vnet.ibm.com 23 Mar '16

23 Mar '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added isinstance unicode check of ident before encoding it. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index be2e35e..25f6522 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- # # Project Wok # @@ -69,7 +70,9 @@ class Resource(object): self.admin_methods = [] self.log_map = {} self.log_args = { - 'ident': self.ident.encode('utf-8') if self.ident else '', + 'ident': self.ident.encode('utf-8') + if isinstance(self.ident, unicode) + else self.ident if self.ident else '', } def _redirect(self, action_result, code=303): -- 2.5.0

4 3

[RFC] VEPA Network UI and multiple selection
by Samuel Henrique De Oliveira Guimaraes 21 Mar '16

21 Mar '16

Hi team, I was looking into Bootstrap-Select that is already implemented on Wok and it does allows multiple option selection, which means we can use it to select more than one interface when creating a new Vepa network. But instead of looking like a default multi-select input, it keeps the default style and puts the selected items separated by comma: https://silviomoreto.github.io/bootstrap-select/examples/#multiple-select-b… In the other hand, this is what a multiple select looks like with native HTML controls: http://www.w3schools.com/tags/tryit.asp?filename=tryhtml_select_multiple IMO the default html control looks better and it delivers a better user experience than a dropdown. We can "destroy" Bootstrap-Select style and widget if a VEPA network type is selected and customize the default html control with CSS3 to look like other form elements. However, what if there are hundreds of interfaces? In this case I propose we keep Bootstrap-Select with a search/filter on top, which would work like this jsfiddle: https://jsfiddle.net/4yvgnx9e/ Any thoughts or comments? Regards, Samuel

2 1

Gap between the scss/css file's
by Chandra Shekhar Reddy Potula 21 Mar '16

21 Mar '16

Hi All, I see a gap between scss and css always in the upstream code. For sure during the development we always re-compile and get the latest style sheets. My suggestion would be whenever there is a change in the scss file's request to upstream, will it be good idea to ask developer who want scss changes to upstream push corresponding css file changes too ie re-compiled code ? This will some times eliminate the gap between the css and scss files, which I suppose mostly taken care by the maintainer at present ? Just a thought, let me know your views on this !!! Thanks and Regards Chandra

4 3

[PATCH v2][Kimchi 0/2] Makes Kimchi better use /etc
by Rodrigo Trujillo 18 Mar '16

18 Mar '16

v2: - Apply review changes v1: - Kimchi package version was not looking at /etc/kimchi - Moves template.conf to /etc Rodrigo Trujillo (2): Fix issue #840: Change distros.d internal path Move 'template.conf' to /etc Makefile.am | 7 +++++-- config.py.in | 5 ++++- contrib/kimchi.spec.fedora.in | 1 - contrib/kimchi.spec.suse.in | 1 - model/config.py | 4 ++++ model/networks.py | 4 ++-- model/storagepools.py | 5 ++--- osinfo.py | 3 ++- tests/test_model.py | 8 ++++---- 9 files changed, 23 insertions(+), 15 deletions(-) -- 2.1.0

2 3

[PATCH][Kimchi 0/2] Makes Kimchi better use /etc
by Rodrigo Trujillo 18 Mar '16

18 Mar '16

- Kimchi package version was not looking at /etc/kimchi - Moves template.conf to /etc Rodrigo Trujillo (2): Fix issue #840: Change distros.d internal path Move 'template.conf' to /etc Makefile.am | 7 +++++-- config.py.in | 7 ++++++- contrib/kimchi.spec.fedora.in | 1 - contrib/kimchi.spec.suse.in | 1 - model/config.py | 4 ++++ model/networks.py | 4 ++-- model/storagepools.py | 5 ++--- osinfo.py | 3 ++- tests/test_model.py | 8 ++++---- 9 files changed, 25 insertions(+), 15 deletions(-) -- 2.1.0

2 5

[PATCH] [Kimchi] Issue #788: Network information mismatch in template creation
by sguimaraes943＠gmail.com 18 Mar '16

18 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Samuel Guimarães (1): Issue #788: Network information mismatch in template creation ui/js/src/kimchi.network.js | 6 +++--- ui/js/src/kimchi.template_edit_main.js | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) -- 1.9.3

2 2

[PATCH] [Kimchi] Issue #809: PCI filter does not seem to work
by sguimaraes943＠gmail.com 17 Mar '16

17 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes issue #809 "PCI filter does not seem to work". This fix requires "Added jquery.containsNC to enable case insensitive pseudo-selector in JS" applied since it uses this snippet to allow case insensitive filter. Samuel Guimarães (1): Issue #809: PCI filter does not seem to work ui/js/src/kimchi.guest_edit_main.js | 49 ++++++++++++++++++++----------------- ui/pages/guest-edit.html.tmpl | 8 +++--- 2 files changed, 31 insertions(+), 26 deletions(-) -- 1.9.3

3 3

[PATCH] [Kimchi] Issue #818: Frontend doesn't update the PCI tab after a PCI attachment
by sguimaraes943＠gmail.com 17 Mar '16

17 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Tested with real environment. The "Save" button is disabled by default when switching to a tab that has inline editing feature, so this patch doesn't cover issue #847 yet. Samuel Guimarães (1): Issue #818: Frontend doesn't update the PCI tab after a PCI attachment ui/js/src/kimchi.guest_edit_main.js | 40 ++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 18 deletions(-) -- 1.9.3

3 3

[PATCH] [Kimchi] Fix problem when removing window size fo GPU
by Jose Ricardo Ziviani 17 Mar '16

17 Mar '16

- This patch fixes errors when removing the window size command from libvirt qemu:commandline xml. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 2a62249..5f33d10 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -290,7 +290,8 @@ class VMHostDevsModel(object): new_xml = self._add_win_memory_size(dom, size) # update the XML - self.conn.get().defineXML(new_xml) + if new_xml is not None: + self.conn.get().defineXML(new_xml) def _update_win_memory_size(self, dom, counter, wnd_size): root = objectify.fromstring(dom.XMLDesc(0)) @@ -304,12 +305,11 @@ class VMHostDevsModel(object): if not arg.values()[0].startswith(CMDLINE_FIELD_NAME): continue - # update mem_win_size value if counter > 1: arg.set('value', CMDLINE_FIELD_NAME + '=' + wnd_size) - # remove mem_win_size - elif counter <= 1: + else: + line.remove(arg.getprevious()) line.remove(arg) return etree.tostring(root, encoding='utf-8', @@ -330,25 +330,12 @@ class VMHostDevsModel(object): root.append(etree.fromstring(get_qemucmdline_xml(args))) return etree.tostring(root, encoding='utf-8', pretty_print=True) - # <qemu:commandline> exists and already has the tag - # <qemu:arg value='-global'> (user could already been using this for - # something else), so we just add our <qemu:arg...> missing. - found = False - for arg in cmdline.iterchildren(): - if arg.values()[0] == '-global': - EM = ElementMaker(namespace=QEMU_NAMESPACE, - nsmap={'qemu': QEMU_NAMESPACE}) - cmdline.append(EM.arg(value=val)) - found = True - break - # <qemu:commandline> exists but there is no <qemu:arg value global> # so, we add those missing arguments inside the exising cmdline - if not found: - EM = ElementMaker(namespace=QEMU_NAMESPACE, - nsmap={'qemu': QEMU_NAMESPACE}) - cmdline.append(EM.arg(value='-global')) - cmdline.append(EM.arg(value=val)) + EM = ElementMaker(namespace=QEMU_NAMESPACE, + nsmap={'qemu': QEMU_NAMESPACE}) + cmdline.append(EM.arg(value='-global')) + cmdline.append(EM.arg(value=val)) return etree.tostring(root, encoding='utf-8', pretty_print=True) @@ -443,7 +430,8 @@ class VMHostDevModel(object): if e.attrib['type'] == 'pci': self._delete_affected_pci_devices(dom, dev_name, pci_devs) if is_3D_device: - self.update_mmio_guest(vmid, False) + devsmodel = VMHostDevsModel(conn=self.conn) + devsmodel.update_mmio_guest(vmid, False) break else: raise NotFoundError('KCHVMHDEV0001E', -- 1.9.1

2 1

probleme for kimchi
by Nicolas Naud 17 Mar '16

17 Mar '16

Hi, I'm problem after install kimchi on debian: "KCHVM0019E: Impossible de démarrer la machine virtuelle test. Détails : unsupported configuration: Memory cgroup is not available on this host" Thanks you -- Nicolas Naud Technicien informatique SFA - Administration générale - Service Informatique Général TSA 51106 9, Rue C C Chenou Bât B5 86073 POITIERS POITIERS CEDEX 9 Tél : +33 5 49 45 38 16 Port : 06.19.13.20.59 Courriel : nicolas.naud(a)univ-poitiers.fr

2 1

[PATCH] [Kimchi] Issue 814: UI just show exported NFS path when clicked twice at field
by sguimaraes943＠gmail.com 17 Mar '16

17 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> I wasn't able to reproduce the issue with a nfs path pointing to localhost but I did tested with two NFS paths in a NFS server and found that wok.combobox() and wok.selectFilter() dropdowns were showing an empty list. If the list is empty their objects are destroyed but the validation still occurs when the user types a valid ip address and a nfs path. Samuel Guimarães (1): Issue 814: UI just show exported NFS path when clicked twice at field ui/js/src/kimchi.storagepool_add_main.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 1.9.3

3 3

[PATCH v2] [Kimchi 0/4] Fix issues on web serial console
by Jose Ricardo Ziviani 17 Mar '16

17 Mar '16

v2: - applied code review This patchset contains some issues found in the web serial console code as well as some small improvements. Jose Ricardo Ziviani (4): Move unix socket files from /tmp to /run Improve log messages printed by the serial console Make serial console timeout configurable Check if guest is listening to serial before connecting to it i18n.py | 2 + kimchi.conf | 3 ++ model/vms.py | 26 ++++++++-- serialconsole.py | 117 +++++++++++++++++++++++++++++++-------------- tests/test_model.py | 4 +- ui/serial/html/serial.html | 4 -- 6 files changed, 109 insertions(+), 47 deletions(-) -- 1.9.1

4 8

[PATCH] [Kimchi] Issue #847: Save button is having wrong behavior when edit a running Guest
by sguimaraes943＠gmail.com 16 Mar '16

16 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch addresses the Save Button in Edit Guests modal window when the user switches to different tabs and goes back to General tab if a VM is running. Samuel Guimarães (1): Issue #847: Save button is having wrong behavior when edit a running Guest ui/js/src/kimchi.guest_edit_main.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 1.9.3

2 2

[PATCH] [Kimchi] Added support for CentOS 7 iso images
by rkoch＠rk-it.at 16 Mar '16

16 Mar '16

From: Rene Koch <rkoch(a)rk-it.at> CentOS 7 x86_64 minimal ISO is labled "CentOS 7 x86_64", so operating system is not recognized by Kimchi. This patch adds support for CentOS 7 minimal ISO. Rene Koch (1): Issue #861: CentOS 7 image not recognized isoinfo.py | 2 ++ 1 file changed, 2 insertions(+) -- 2.5.0

2 2

[PATCH][Kimchi] Remove useless function 'validate_repo_url' from Kimchi
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

This function was moved to GingerBase. It is not used in any part of Kimchi. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- utils.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/utils.py b/utils.py index 87d7d9b..eae16d5 100644 --- a/utils.py +++ b/utils.py @@ -87,22 +87,6 @@ def check_url_path(path, redirected=0): return True -def validate_repo_url(url): - url_parts = url.split('://') # [0] = prefix, [1] = rest of URL - - if url_parts[0] == '': - raise InvalidParameter("KCHREPOS0002E") - - if url_parts[0] in ['http', 'https', 'ftp']: - if not check_url_path(url): - raise InvalidParameter("WOKUTILS0001E", {'url': url}) - elif url_parts[0] == 'file': - if not os.path.exists(url_parts[1]): - raise InvalidParameter("WOKUTILS0001E", {'url': url}) - else: - raise InvalidParameter("KCHREPOS0002E") - - def upgrade_objectstore_data(item, old_uri, new_uri): """ Upgrade the value of a given JSON's item of all Template and VM entries -- 2.1.0

3 2

[PATCH v2] [Kimchi] Fixed "Add a Storage Device to VM" modal behavior
by Socorro Stoppler 16 Mar '16

16 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v2: Change default to qcow2 format Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> Signed-off-by: Samuel Guimarães <sguimaraes943(a)gmail.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 41 ++++++++++++++++-------------- ui/pages/guest-storage-add.html.tmpl | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 3f416e7..fb7fed3 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -83,12 +83,13 @@ kimchi.guest_storage_add_main = function() { } formatTextbox.empty(); formatTextbox.append(selectFormatHTML); - $(formatTextbox).change(); + formatTextbox.val("qcow2"); + $(formatTextbox).trigger('change'); formatTextbox.selectpicker(); $('.selectpicker').selectpicker('refresh'); }; - typeTextbox.change(function() { + typeTextbox.on('change',function() { var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'}; selectType = $(this).val(); $.each(pathObject, function(type, value) { @@ -105,13 +106,13 @@ kimchi.guest_storage_add_main = function() { if ($('#new-disk').checked) { $('#existing-disk-box').addClass('hidden'); $(newPoolTextbox).val('default'); - $(newPoolTextbox).change(); + $(newPoolTextbox).trigger('change'); $(formatTextbox).val('qcow2'); - $(formatTextbox).change(); + $(formatTextbox).trigger('change'); } else if ($('#existing-disk').checked) { $('#new-disk-box').addClass('hidden'); $(poolTextbox).val('default'); - $(poolTextbox).change(); + $(poolTextbox).trigger('change'); } else { //Goes here the first time since radiobuttons are undefined if (rbExisting === 'true') { @@ -119,7 +120,7 @@ kimchi.guest_storage_add_main = function() { } else { $('#existing-disk-box').addClass('hidden'); $(formatTextbox).val('qcow2'); - $(formatTextbox).change(); + $(formatTextbox).trigger('change'); } } } else { @@ -159,13 +160,13 @@ kimchi.guest_storage_add_main = function() { if (radioButton === 'existing') { poolTextbox.empty(); poolTextbox.append(selectStoragePoolHTML); - $(poolTextbox).change(); + $(poolTextbox).trigger('change'); poolTextbox.selectpicker(); $('.selectpicker').selectpicker('refresh'); } else if (radioButton === 'new') { //new disk newPoolTextbox.empty(); newPoolTextbox.append(selectStoragePoolHTML); - $(newPoolTextbox).val("qcow2"); + $(newPoolTextbox).val("ISO"); newPoolTextbox.selectpicker(); getFormatList(); } @@ -176,7 +177,7 @@ kimchi.guest_storage_add_main = function() { //First time retrieving list of Storage Pools - defaulting to new disk getStoragePools('new'); - poolTextbox.change(function() { + poolTextbox.on('change',function() { var options = []; selectStorageVolHTML = ''; volTextbox.empty(); @@ -198,7 +199,7 @@ kimchi.guest_storage_add_main = function() { } volTextbox.append(selectStorageVolHTML); $(volTextbox).val(options[0].value); - $(volTextbox).change(); + $(volTextbox).trigger('change'); $(volTextbox).prop('disabled',false); }else { $(volTextbox).prop('disabled',true); @@ -213,7 +214,7 @@ kimchi.guest_storage_add_main = function() { }, null, false); }); - typeTextbox.change(function() { + typeTextbox.on('change',function() { var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'}; var selectType = $(this).val(); $.each(pathObject, function(type, value) { @@ -226,7 +227,7 @@ kimchi.guest_storage_add_main = function() { }); var currentPage = 'new-disk-box'; - $('#existing-disk').change(function() { + $('#existing-disk').on('change',function() { if (this.checked) { rbExisting = 'true'; if (currentPage === 'new-disk-box') { @@ -246,10 +247,10 @@ kimchi.guest_storage_add_main = function() { } }); - $('#new-disk').change(function() { + $('#new-disk').on('change',function() { if (this.checked) { $(formatTextbox).val("qcow2"); - $(formatTextbox).change(); + $(formatTextbox).trigger('change'); rbExisting = 'false'; if (currentPage === 'existing-disk-box') { kimchi.switchPage(currentPage, 'new-disk-box', 'right'); @@ -268,19 +269,21 @@ kimchi.guest_storage_add_main = function() { } }); + var selectType = $(typeTextbox).val(); if (kimchi.thisVMState === 'running') { - types =typesRunning; - $(typeTextbox).val('disk'); - typeTextbox.change(); - poolTextbox.change(); + types = typesRunning; } - var selectType = $(typeTextbox).val(); for (var i = 0; i < types.length; i++) { selectStorageTypeHTML += '<option value="'+ types[i].value + '">' + types[i].label + '</option>'; } typeTextbox.append(selectStorageTypeHTML); typeTextbox.find('option:first').attr('selected','selected'); typeTextbox.selectpicker(); + if (kimchi.thisVMState === 'running') { + $(typeTextbox).val('disk'); + typeTextbox.trigger('change'); + poolTextbox.trigger('change'); + } var validateCDROM = function(settings) { if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path'])){ diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index 18da825..afc72c8 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -39,7 +39,7 @@ <label>$_("Device Type")</label> <select id="guest-storage-type" class="selectpicker col-md-12 col-lg-12"> </select> - <p class="help-block"><i class="fa fa-info-circle"></i> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported.")</p> + <p class="help-block"><i class="fa fa-info-circle"></i> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported. If the guest is running, only \"disk\" is supported.")</p> </div> <div class="volume-section hidden form-group"> <div class="template-modal-container"> -- 1.9.1

3 2