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> - $_("The device type. Currently, \"cdrom\" and \"disk\" are supported.") + $_("The device type. Currently, \"cdrom\" and \"disk\" are supported. If the guest is running, only \"disk\" is supported.") </div> <div class="volume-section hidden form-group"> <div class="template-modal-container"> -- 1.9.1

3 2

[PATCH v2] [Kimchi] Fixed Memory and Max Memory values when adding a new Guest
by Socorro Stoppler 16 Mar '16

16 Mar '16

v2: Socorro Stoppler (1): Fixed Memory and Max Memory values when adding a new Guest Removed showing of max memory in guest and made guest and templates display the same way for cpu/memory for consistency ui/pages/guest-add.html.tmpl | 10 +++++----- ui/pages/tabs/templates.html.tmpl | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- 1.9.1 v1: Samuel Guimarães (1): Fixed Memory and Max Memory values when adding a new Guest ui/pages/guest-add.html.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 1.9.3

4 4

[PATCH v3] [Wok] Fixed wok logos in small screen resolutions
by sguimaraes943＠gmail.com 16 Mar '16

16 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v3 - Removed wrong selector change in bootstrap-select files Samuel Guimarães (1): Fixed wok logos in small screen resolutions ui/css/src/modules/_login.scss | 9 ++++----- ui/css/wok.css | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) -- 1.9.3

2 2

[PATCH][Wok] Move function 'get_next_clone_name' from Wok
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

This function is not related to any Wok feature or resource. So moving it to Kimchi. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/utils.py | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 7e9a928..175cf25 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -391,47 +391,6 @@ def remove_old_files(globexpr, hours): wok_log.error(str(e)) -def get_next_clone_name(all_names, basename, name_suffix=''): - """Find the next available name for a cloned resource. - - If any resource named "<basename>-clone-<number><name_suffix>" is found - in "all_names", use the maximum "number" + 1; else, use 1. - - Arguments: - all_names -- All existing names for the resource type. This list will - be used to make sure the new name won't conflict with - existing names. - basename -- The name of the original resource. - name_suffix -- The resource name suffix (optional). This parameter - exist so that a resource named "foo.img" gets the name - "foo-clone-1.img" instead of "foo.img-clone-1". If this parameter - is used, the suffix should not be present in "basename". - - Return: - A UTF-8 string in the format "<basename>-clone-<number><name_suffix>". - """ - re_group_num = 'num' - - re_expr = u'%s-clone-(?P<%s>\d+)' % (basename, re_group_num) - if name_suffix != '': - re_expr = u'%s%s' % (re_expr, name_suffix) - - max_num = 0 - re_compiled = re.compile(re_expr) - - for n in all_names: - match = re_compiled.match(n) - if match is not None: - max_num = max(max_num, int(match.group(re_group_num))) - - # increments the maximum "clone number" found - new_name = u'%s-clone-%d' % (basename, max_num + 1) - if name_suffix != '': - new_name = new_name + name_suffix - - return new_name - - def get_unique_file_name(all_names, name): """Find the next available, unique name for a file. -- 2.1.0

3 2

[PATCH v3][Kimchi 0/3] Add new function to Kimchi and fix multiple clones
by Rodrigo Trujillo 16 Mar '16

16 Mar '16

v3: - Add default value "1" (requested in review) v2: This is the v2 of patchset to fix/provide support to clone a guest multiple times. This patch: - Creates a new function, moved from Wok to name clones; - Use timestamp parameter of the function to avoid clone problems; - Fixes backend imports; - Adds UI. Rodrigo Trujillo (3): Add function 'get_next_clone_name' Fix issue when clone a vm multiple times Add UI support to clone a guest multiple times mockmodel.py | 4 +-- model/storagevolumes.py | 4 +-- model/vms.py | 5 ++-- ui/js/src/kimchi.guest_main.js | 59 ++++++++++++++++++++++++++++++++---------- ui/pages/guest-clone.html.tmpl | 47 +++++++++++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 3 ++- utils.py | 50 +++++++++++++++++++++++++++++++++++ 7 files changed, 152 insertions(+), 20 deletions(-) create mode 100644 ui/pages/guest-clone.html.tmpl -- 2.1.0

2 4

[PATCH][Kimchi] Fix issue:#838 - Set qemu version to 2.1
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

Qemu only supports memory hotplug after 2.1 version, see: http://wiki.qemu.org/ChangeLog/2.1#x86 In order to avoid errors starting guests, it is better to set the minimal version required (2.1) in packages specs. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 2 +- contrib/kimchi.spec.fedora.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index b6acdaf..c46b5b3 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,7 +14,7 @@ Depends: wok, gettext, libvirt-bin, nfs-common, - qemu-kvm, + qemu-kvm (>= 2.1), python-parted, python-psutil (>= 0.6.0), python-ethtool, diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index c2111f9..1bdf38c 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -9,7 +9,7 @@ License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz Requires: wok Requires: ginger-base -Requires: qemu-kvm +Requires: qemu-kvm >= 2.1 Requires: gettext Requires: libvirt Requires: libvirt-python -- 2.1.0

3 4

[PATCH v2][Kimchi 0/3] Add new function to Kimchi and fix multiple clones
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

This is the v2 of patchset to fix/provide support to clone a guest multiple times. This patch: - Creates a new function, moved from Wok to name clones; - Use timestamp parameter of the function to avoid clone problems; - Fixes backend imports; - Adds UI. Rodrigo Trujillo (3): Add function 'get_next_clone_name' Fix issue when clone a vm multiple times Add UI support to clone a guest multiple times mockmodel.py | 4 +-- model/storagevolumes.py | 4 +-- model/vms.py | 5 ++-- ui/js/src/kimchi.guest_main.js | 58 ++++++++++++++++++++++++++++++++---------- ui/pages/guest-clone.html.tmpl | 47 ++++++++++++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 3 ++- utils.py | 50 ++++++++++++++++++++++++++++++++++++ 7 files changed, 151 insertions(+), 20 deletions(-) create mode 100644 ui/pages/guest-clone.html.tmpl -- 2.1.0

3 6

[PATCH v2] [Wok] Fixed wok logos in small screen resolutions
by sguimaraes943＠gmail.com 15 Mar '16

15 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Fixed image alignment Samuel Guimarães (1): Fixed wok logos in small screen resolutions ui/css/bootstrap.custom.css | 6 +++--- ui/css/src/modules/_login.scss | 5 ++--- ui/css/wok.css | 7 +++---- 3 files changed, 8 insertions(+), 10 deletions(-) -- 1.9.3

2 2

[PATCH] [Wok 0/2] Enhancements and new library
by sguimaraes943＠gmail.com 15 Mar '16

15 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> The first patch includes jquery.containsNC pseudo-selector for jQuery functions. This is required in order to fix Kimchi issue #809. The second patch includes an enhancement in Wok login page, fixing Wok logos in small screens. Wok will render up to three logos per row below the login panel instead of only two. Samuel Guimarães (2): Added jquery.containsNC to enable case insensitive pseudo-selector in JS Fixed wok logos in small screen resolutions configure.ac | 1 + ui/css/bootstrap.custom.css | 6 +++--- ui/css/src/modules/_login.scss | 3 +-- ui/css/wok.css | 5 ++--- ui/libs/Makefile.am | 2 +- ui/libs/jquery-containsNC/LICENSE | 21 +++++++++++++++++++++ ui/libs/jquery-containsNC/Makefile.am | 22 ++++++++++++++++++++++ ui/libs/jquery-containsNC/jquery.containsNC.js | 3 +++ ui/pages/wok-ui.html.tmpl | 1 + 9 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 ui/libs/jquery-containsNC/LICENSE create mode 100644 ui/libs/jquery-containsNC/Makefile.am create mode 100644 ui/libs/jquery-containsNC/jquery.containsNC.js -- 1.9.3

2 3

[PATCH][Kimchi 1/2] Fix issue when clone a vm multiple times
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

When Kimchi clones a guest it uses the Wok function "get_next_clone_name", which adds an incremental number in the new clone name. This approach causes a race condiction if Kimchi tries to clone a guest multiple times, sending multiple request at once. To avoid this problem, it is better to use timestamps in the clones names instead of incremental numbers. Them it guarantees names will be unique. This patch requires timestamp support in "get_next_clone_name" wok funtion. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 195c879..e60bf51 100644 --- a/model/vms.py +++ b/model/vms.py @@ -318,7 +318,7 @@ class VMModel(object): vms_being_created.append(uri_name) current_vm_names = self.vms.get_list() + vms_being_created - new_name = get_next_clone_name(current_vm_names, name) + new_name = get_next_clone_name(current_vm_names, name, ts=True) # create a task with the actual clone function taskid = add_task(u'/plugins/kimchi/vms/%s/clone' % new_name, -- 2.1.0

2 3

[PATCH][Wok] Add support to timestamps in clone naming function
by Rodrigo Trujillo 15 Mar '16

15 Mar '16

There is a potential race condiction issue when some plugin tries to use the function get_next_clone_name(all_names, basename, name_suffix=''). If clone requests are done so fast, it is possible that the plugin does not send all resource names in all_names parameter, then the function is going to select the same name for 2 or more clones, which is going to cause errors in the plugin. Supporting timestamps in microsecond precision, plugins can avoid this type of error coding its own race condiction fix or just using the timestamp function option. New name will be "basename-clone-timestamp-name-suffix". Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/utils.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 7e9a928..b80a80b 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -31,6 +31,7 @@ import re import sqlite3 import subprocess import sys +import time import traceback import xml.etree.ElementTree as ET @@ -391,7 +392,7 @@ def remove_old_files(globexpr, hours): wok_log.error(str(e)) -def get_next_clone_name(all_names, basename, name_suffix=''): +def get_next_clone_name(all_names, basename, name_suffix='', ts=False): """Find the next available name for a cloned resource. If any resource named "<basename>-clone-<number><name_suffix>" is found @@ -406,26 +407,34 @@ def get_next_clone_name(all_names, basename, name_suffix=''): exist so that a resource named "foo.img" gets the name "foo-clone-1.img" instead of "foo.img-clone-1". If this parameter is used, the suffix should not be present in "basename". + ts -- use timestamp, instead of incremental numbers Return: A UTF-8 string in the format "<basename>-clone-<number><name_suffix>". """ re_group_num = 'num' - re_expr = u'%s-clone-(?P<%s>\d+)' % (basename, re_group_num) - if name_suffix != '': - re_expr = u'%s%s' % (re_expr, name_suffix) + # Use timestamps or increase clone number + if ts: + # Microsecond precision + ts_suffix = int(time.time() * 1000000) + new_name = u'%s-clone-%d' % (basename, ts_suffix) + else: + re_expr = u'%s-clone-(?P<%s>\d+)' % (basename, re_group_num) + if name_suffix != '': + re_expr = u'%s%s' % (re_expr, name_suffix) - max_num = 0 - re_compiled = re.compile(re_expr) + max_num = 0 + re_compiled = re.compile(re_expr) - for n in all_names: - match = re_compiled.match(n) - if match is not None: - max_num = max(max_num, int(match.group(re_group_num))) + for n in all_names: + match = re_compiled.match(n) + if match is not None: + max_num = max(max_num, int(match.group(re_group_num))) + + # increments the maximum "clone number" found + new_name = u'%s-clone-%d' % (basename, max_num + 1) - # increments the maximum "clone number" found - new_name = u'%s-clone-%d' % (basename, max_num + 1) if name_suffix != '': new_name = new_name + name_suffix -- 2.1.0

2 2

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

14 Mar '16

v2: Change default to qcow2 format Samuel Guimarães (1): Fixed "Add a Storage Device to VM" modal behavior when guest is running 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(-) -- 1.9.1

1 0

[PATCH] [Kimchi] Fixed "Add a Storage Device to VM" modal behavior when guest is running
by sguimaraes943＠gmail.com 14 Mar '16

14 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes an issue when trying to attach a storage device when a guest is running. The combo box was showing the correct option but the disk panel was hidden. Samuel Guimarães (1): Fixed "Add a Storage Device to VM" modal behavior when guest is running ui/js/src/kimchi.guest_storage_add.main.js | 38 ++++++++++++++++-------------- ui/pages/guest-storage-add.html.tmpl | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) -- 1.9.3

3 3

[PATCH] [Kimchi] Fixed Memory and Max Memory values when adding a new Guest
by sguimaraes943＠gmail.com 14 Mar '16

14 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Fixed Memory and Max Memory values when adding a new Guest Samuel Guimarães (1): Fixed Memory and Max Memory values when adding a new Guest ui/pages/guest-add.html.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 1.9.3

4 6

Unable to activate PCI devices
by Samuel Henrique De Oliveira Guimaraes 14 Mar '16

14 Mar '16

Hi team, I was trying to find a fix for enabling PCI devices when editing a guest and the input filter as well but so far I'm unable to test it with any VM that I try to run: "KCHVMHDEV0003E: No IOMMU groups found. Host PCI pass through needs IOMMU group to function correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify the Kernel is compiled with IOMMU support. For Intel CPU, add 'intel_iommu=on' to GRUB_CMDLINE_LINUX parameter in /etc/default/grub file. For AMD CPU, add 'iommu=pt iommu=1'." Is this correct? Thanks, Samuel

2 1

Re: [Kimchi-devel] [ginger-dev-list] [PATCH V3] [Gingerbase 0/4] Issue #9 - Update selected packages.
by Paulo Ricardo Paz Vital 14 Mar '16

14 Mar '16

On Fri, Mar 11, 2016 at 06:55:02PM -0300, Aline Manera wrote: > > > On 03/11/2016 04:48 PM, Aline Manera wrote: > > > > > >On 03/10/2016 05:51 PM, Paulo Ricardo Paz Vital wrote: > >> > >>On 03/10/2016 04:23 PM, Daniel Henrique Barboza wrote: > >>>I've tested the patch in a real environment (my dev PC) and noticed > >>>the following behavior: > >>> > >>>- pick a single package to be updated. In this case I've chosen the > >>>'libv4l' package: > >>> > >>>[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: application/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l' > >>>-X GET > >>>Enter host password for user 'root': > >>>{ > >>> "depends":[ > >>> "libv4l" > >>> ], > >>> "version":"1.10.0-2.fc23", > >>> "arch":"i686", > >>> "repository":"updates", > >>> "package_name":"libv4l" > >>>} > >>> > >>>[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: application/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l/upgrade' > >>> > >>>-X POST -d'{}' > >>>Enter host password for user 'root': > >>>{ > >>> "status":"running", > >>> "message":"", > >>> "id":"1", > >>>"target_uri":"/plugins/gingerbase/host/packagesupdate/libv4l/upgrade" > >>>}[danielhb@arthas gingerbase]$ > >>> > >>> > >>>- after the update process, the lookup was still returning package > >>>info, > >>>as if it > >>>was still available for updating: > >>> > >>>[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: application/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l' > >>>-X GET > >>>Enter host password for user 'root': > >>>{ > >>> "depends":[ > >>> "libv4l" > >>> ], > >>> "version":"1.10.0-2.fc23", > >>> "arch":"i686", > >>> "repository":"updates", > >>> "package_name":"libv4l" > >>>} > >>> > >>>- after that I've listed all the packages to be updated, wondering if > >>>there was some > >>>sort of refresh problem after the single update: > >>> > >>>}[danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: aplication/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/' -X GET > >>>(... long output) > >>> > >>> > >>>- and finally tried the lookup of the libv4l package again: > >>> > >>>][danielhb@arthas gingerbase]$ curl -k -u root -H "Content-Type: > >>>application/json" -H "Accept: aplication/json" > >>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/libv4l' > >>>-X GET > >>>Enter host password for user 'root': > >>>{ > >>> "reason":"GGBPKGUPD0002E: Package libv4l is not marked to be > >>>updated.", > >>> "code":"404 Not Found", > >>> "call_stack":"Traceback (most recent call last):\n File > >>>\"/usr/lib/python2.7/site-packages/cherrypy/_cprequest.py\", line 670, > >>>in respond\n response.body = self.handler()\n File > >>>\"/usr/lib/python2.7/site-packages/cherrypy/lib/encoding.py\", line > >>>217, > >>>in __call__\n self.body = self.oldhandler(*args, **kwargs)\n File > >>>\"/usr/lib/python2.7/site-packages/cherrypy/_cpdispatch.py\", line 61, > >>>in __call__\n return self.callable(*self.args, **self.kwargs)\n > >>>File > >>>\"/home/danielhb/kimchi/wok_ginger/src/wok/control/base.py\", line 210, > >>>in index\n raise cherrypy.HTTPError(404, e.message)\nHTTPError: > >>>(404, > >>>u'GGBPKGUPD0002E: Package libv4l is not marked to be updated.')\n" > >>>}[ > >>> > >>> > >>>My conclusion is that, after the single package update, we need to do > >>>a list of the all the packages again to update/refresh some internal > >>>model > >>>info. > >>> > >>Yes, this happens because the lookup of one single package returns the > >>dictionary from the internal list, after the first overall lookup. > >> > >>>In my opinion the package list needs to be updated after every single > >>>update. > >>>Perhaps there is a way of simply removing the updated package(s) from > >>>this > >>>list instead of refreshing the whole list again, operation that is now > >>>even slower > >>>than before due to all the additional info being fetched. > >>> > >>Ok, I'll add something to remove from the internal list of packages the > >>package and its dependencies in the V4 > > > >My suggestion is to save the timestamp when a request to get_list() is > >made. > >And on lookup() verifies the timestamp does not exceed X seconds and if > >so, grab the information from yum again for the given resource. > > > > Instead of doing that, it would be better to do not cache the information on > get_list(). > get_list() should return only the list of packages names and lookup() grabs > the detailed information for each package. > > As you are calling a new command on lookup() for a given package with this > patch (to get the list of dependencies), I believe this command you are > using also returns the information cached on get_list() - repository, > version, etc. The way PackagesUpdate works is different from what you described here. PackagesUpdate.get_list() returns the same return of SoftwareUpdate.getUpdates() that is, basically, the cached dictionary (called SoftwareUpdate._packages) that contains all packages eligible to update and it's information (package_name, version, arch, repository and, now, list of dependencies). All these information are collected by the private method SoftwareUpdate._scanUpdates() that is executed at first time, when the first PackagesUpdate.get_list() is requested by user. PackageUpdate.lookup() returns the information of one package by calling SoftwareUpdate.getUpdate(<package_name>), that is nothing more that the information of that specific package cached in SoftwareUpdate._packages. > > Said that, I'd say to you change get_list() to only returns the packages > names. > And improve your command output on lookup() to grab the information before > cached on get_list(). > Ok, interesting idea, but doesn't this change how UI and user see the information - I mean, how API should works? If following your idea, when user access the Updates tab on UI, he/she will see only the list of packages. Today, it's provided the information of the bew version number of that package, the arch and repository that provides the package. > If you fail to parse the command output on lookup() that means the package > is not marked to be upgraded so raise an error. > > Something like below on lookup(): > > out = run_command(<command to get the dependencies>) > name = get_name_from_out() > if name is None: > # package is not marked to be upgraded > raise NotFound() > > deps = get_deps_from_out() > ... > > return info > > >>>Thanks, > >>> > >>> > >>>Daniel > >>> > >>> > >>>On 03/09/2016 04:01 PM, pvital(a)linux.vnet.ibm.com wrote: > >>>>From: Paulo Vital <pvital(a)linux.vnet.ibm.com> > >>>> > >>>>V2 - V3: > >>>> * Modified _get_dnf_info_requires() of DnfUpdate class to > >>>>prevent > >>>>the > >>>> addition of the package in the dependencies list, and how to > >>>>process the > >>>> name of the dependencies to be added. > >>>> > >>>>V2: > >>>> > >>>>This patch-set is the V2 of the feature to add backend support to > >>>>select one or > >>>>more packages to be updated by host package manager. > >>>> > >>>>All modifications for V2 were based on the feedback provided by the > >>>>mail thread > >>>>"[RFC] Gingerbase Issue#9: Update selected packages." > >>>> > >>>>To test, use: > >>>> > >>>># List all packages selected by host package manager, as eligible to > >>>>be updated > >>>>$ curl -k -u test -H "Content-Type: application/json" -H \ > >>>>"Accept: application/json" \ > >>>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate' -X GET > >>>>Enter host password for user 'test': > >>>>[ > >>>> { > >>>> "depends":[ > >>>> "libudisks2", > >>>> "udisks2" > >>>> ], > >>>> "version":"2.1.7-1.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"libudisks2" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "glusterfs-client-xlators", > >>>> "glusterfs", > >>>> "glusterfs-fuse", > >>>> "glusterfs-libs", > >>>> "glusterfs-api" > >>>> ], > >>>> "version":"3.7.8-2.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"glusterfs-client-xlators" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "parted" > >>>> ], > >>>> "version":"3.2-16.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"parted" > >>>> }, > >>>> > >>>> < result cut, due to a large number of packages > > >>>> > >>>> { > >>>> "depends":[ > >>>> "openssl", > >>>> "openssl-libs" > >>>> ], > >>>> "version":"1:1.0.2g-2.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"openssl" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "gnome-shell" > >>>> ], > >>>> "version":"3.18.4-1.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"gnome-shell" > >>>> }, > >>>> { > >>>> "depends":[ > >>>> "openssl", > >>>> "openssl-libs" > >>>> ], > >>>> "version":"1:1.0.2g-2.fc23", > >>>> "arch":"i686", > >>>> "repository":"updates", > >>>> "package_name":"openssl-libs" > >>>> }, > >>>> > >>>> < result cut, due to a large number of packages > > >>>> > >>>>] > >>>> > >>>># Print information about one selected package > >>>>$ curl -k -u test -H "Content-Type: application/json" -H \ > >>>>"Accept: application/json" \ > >>>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/openssl' > >>>>-X > >>>>GET > >>>>Enter host password for user 'test': > >>>>{ > >>>> "depends":[ > >>>> "openssl", > >>>> "openssl-libs" > >>>> ], > >>>> "version":"1:1.0.2g-2.fc23", > >>>> "arch":"x86_64", > >>>> "repository":"updates", > >>>> "package_name":"openssl" > >>>>} > >>>> > >>>># Select only one package to be updated. All packages that were > >>>>listed as > >>>># eligible to be update and are dependencies of this package will > >>>>also be > >>>># updated automatically. > >>>>$ curl -k -u test -H "Content-Type: application/json" -H \ > >>>>"Accept: application/json" \ > >>>>'https://localhost:8001/plugins/gingerbase/host/packagesupdate/openssl/upgra…' > >>>> > >>>>\ > >>>>-X POST -d '{}' > >>>>Enter host password for user 'test': > >>>>{ > >>>> "status":"running", > >>>> "message":"", > >>>> "id":"1", > >>>>"target_uri":"/plugins/gingerbase/host/packagesupdate/openssl/upgrade" > >>>>} > >>>> > >>>> > >>>>Paulo Vital (4): > >>>> Issue #9 - Reorganize Package Update classes. > >>>> Issue #9 - List dependencies of packages to update > >>>> Issue #9 - Add support to update selected packages > >>>> Issue #9 - Test cases to update selected packages > >>>> > >>>> control/host.py | 36 ++-------- > >>>> control/packagesupdate.py | 53 ++++++++++++++ > >>>> docs/API.md | 18 +++-- > >>>> mockmodel.py | 39 ++++++++--- > >>>> model/host.py | 43 ------------ > >>>> model/packagesupdate.py | 116 +++++++++++++++++++++++++++++++ > >>>> swupdate.py | 172 > >>>>+++++++++++++++++++++++++++++++++++++++++----- > >>>> tests/test_host.py | 37 ++++++++-- > >>>> yumparser.py | 16 ++--- > >>>> 9 files changed, 404 insertions(+), 126 deletions(-) > >>>> create mode 100644 control/packagesupdate.py > >>>> create mode 100644 model/packagesupdate.py > >>>> > >>>>-- > >>>>2.5.0 > >>>> > > > > -- > You received this message because you are subscribed to the Google Groups "Ginger Development Mailing List" group. > To unsubscribe from this group and stop receiving emails from it, send an email to ginger-dev-list+unsubscribe(a)googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- Paulo Ricardo Paz Vital IBM Linux Technology Center http://www.ibm.com

1 1

[PATCH] [Kimchi] Removing disks.py because it was moved to gingerbase
by Jose Ricardo Ziviani 11 Mar '16

11 Mar '16

- I didn't find any place using this module so I'm removing the file to avoid any confusion. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- disks.py | 297 --------------------------------------------------------------- 1 file changed, 297 deletions(-) delete mode 100644 disks.py diff --git a/disks.py b/disks.py deleted file mode 100644 index 52a793c..0000000 --- a/disks.py +++ /dev/null @@ -1,297 +0,0 @@ -# -# Project Kimchi -# -# Copyright IBM Corp, 2015-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 os.path -import re -from parted import Device as PDevice -from parted import Disk as PDisk - -from wok.exception import OperationFailed -from wok.utils import run_command, wok_log - - -def _get_dev_node_path(maj_min): - """ Returns device node path given the device number 'major:min' """ - - dm_name = "/sys/dev/block/%s/dm/name" % maj_min - if os.path.exists(dm_name): - with open(dm_name) as dm_f: - content = dm_f.read().rstrip('\n') - return "/dev/mapper/" + content - - uevent = "/sys/dev/block/%s/uevent" % maj_min - with open(uevent) as ueventf: - content = ueventf.read() - - data = dict(re.findall(r'(\S+)=(".*?"|\S+)', content.replace("\n", " "))) - - return "/dev/%s" % data["DEVNAME"] - - -def _get_lsblk_devs(keys, devs=[]): - out, err, rc = run_command(["lsblk", "-Pbo"] + [','.join(keys)] + devs) - if rc != 0: - raise OperationFailed("KCHDISKS0001E", {'err': err}) - - return _parse_lsblk_output(out, keys) - - -def _get_dev_major_min(name): - maj_min = None - - keys = ["NAME", "MAJ:MIN"] - dev_list = _get_lsblk_devs(keys) - - for dev in dev_list: - if dev['name'].split()[0] == name: - maj_min = dev['maj:min'] - break - else: - raise OperationFailed("KCHDISKS0002E", {'device': name}) - - return maj_min - - -def _is_dev_leaf(devNodePath): - try: - # By default, lsblk prints a device information followed by children - # device information - childrenCount = len( - _get_lsblk_devs(["NAME"], [devNodePath])) - 1 - except OperationFailed as e: - # lsblk is known to fail on multipath devices - # Assume these devices contain children - wok_log.error( - "Error getting device info for %s: %s", devNodePath, e) - return False - - return childrenCount == 0 - - -def _is_dev_extended_partition(devType, devNodePath): - if devType != 'part': - return False - diskPath = devNodePath.rstrip('0123456789') - device = PDevice(diskPath) - try: - extended_part = PDisk(device).getExtendedPartition() - except NotImplementedError as e: - wok_log.warning( - "Error getting extended partition info for dev %s type %s: %s", - devNodePath, devType, e.message) - # Treate disk with unsupported partiton table as if it does not - # contain extended partitions. - return False - if extended_part and extended_part.path == devNodePath: - return True - return False - - -def _parse_lsblk_output(output, keys): - # output is on format key="value", - # where key can be NAME, TYPE, FSTYPE, SIZE, MOUNTPOINT, etc - lines = output.rstrip("\n").split("\n") - r = [] - for line in lines: - d = {} - for key in keys: - expression = r"%s=\".*?\"" % key - match = re.search(expression, line) - field = match.group() - k, v = field.split('=', 1) - d[k.lower()] = v[1:-1] - r.append(d) - return r - - -def _get_vgname(devNodePath): - """ Return volume group name of a physical volume. If the device node path - is not a physical volume, return empty string. """ - out, err, rc = run_command(["pvs", "--unbuffered", "--nameprefixes", - "--noheadings", "-o", "vg_name", devNodePath]) - if rc != 0: - return "" - - return re.findall(r"LVM2_VG_NAME='([^\']*)'", out)[0] - - -def _is_available(name, devtype, fstype, mountpoint, majmin): - devNodePath = _get_dev_node_path(majmin) - # Only list unmounted and unformated and leaf and (partition or disk) - # leaf means a partition, a disk has no partition, or a disk not held - # by any multipath device. Physical volume belongs to no volume group - # is also listed. Extended partitions should not be listed. - if (devtype in ['part', 'disk', 'mpath'] and - fstype in ['', 'LVM2_member'] and - mountpoint == "" and - _get_vgname(devNodePath) == "" and - _is_dev_leaf(devNodePath) and - not _is_dev_extended_partition(devtype, devNodePath)): - return True - return False - - -def get_partitions_names(check=False): - names = set() - keys = ["NAME", "TYPE", "FSTYPE", "MOUNTPOINT", "MAJ:MIN"] - # output is on format key="value", - # where key can be NAME, TYPE, FSTYPE, MOUNTPOINT - for dev in _get_lsblk_devs(keys): - # split()[0] to avoid the second part of the name, after the - # whiteline - name = dev['name'].split()[0] - if check and not _is_available(name, dev['type'], dev['fstype'], - dev['mountpoint'], dev['maj:min']): - continue - names.add(name) - - return list(names) - - -def get_partition_details(name): - majmin = _get_dev_major_min(name) - dev_path = _get_dev_node_path(majmin) - - keys = ["TYPE", "FSTYPE", "SIZE", "MOUNTPOINT"] - try: - dev = _get_lsblk_devs(keys, [dev_path])[0] - except OperationFailed as e: - wok_log.error( - "Error getting partition info for %s: %s", name, e) - return {} - - dev['available'] = _is_available(name, dev['type'], dev['fstype'], - dev['mountpoint'], majmin) - if dev['mountpoint']: - # Sometimes the mountpoint comes with [SWAP] or other - # info which is not an actual mount point. Filtering it - regexp = re.compile(r"\[.*\]") - if regexp.search(dev['mountpoint']) is not None: - dev['mountpoint'] = '' - dev['path'] = dev_path - dev['name'] = name - return dev - - -def vgs(): - """ - lists all volume groups in the system. All size units are in bytes. - - [{'vgname': 'vgtest', 'size': 999653638144L, 'free': 0}] - """ - cmd = ['vgs', - '--units', - 'b', - '--nosuffix', - '--noheading', - '--unbuffered', - '--options', - 'vg_name,vg_size,vg_free'] - - out, err, rc = run_command(cmd) - if rc != 0: - raise OperationFailed("KCHLVM0001E", {'err': err}) - - if not out: - return [] - - # remove blank spaces and create a list of VGs - vgs = map(lambda v: v.strip(), out.strip('\n').split('\n')) - - # create a dict based on data retrieved from vgs - return map(lambda l: {'vgname': l[0], - 'size': long(l[1]), - 'free': long(l[2])}, - [fields.split() for fields in vgs]) - - -def lvs(vgname=None): - """ - lists all logical volumes found in the system. It can be filtered by - the volume group. All size units are in bytes. - - [{'lvname': 'lva', 'path': '/dev/vgtest/lva', 'size': 12345L}, - {'lvname': 'lvb', 'path': '/dev/vgtest/lvb', 'size': 12345L}] - """ - cmd = ['lvs', - '--units', - 'b', - '--nosuffix', - '--noheading', - '--unbuffered', - '--options', - 'lv_name,lv_path,lv_size,vg_name'] - - out, err, rc = run_command(cmd) - if rc != 0: - raise OperationFailed("KCHLVM0001E", {'err': err}) - - if not out: - return [] - - # remove blank spaces and create a list of LVs filtered by vgname, if - # provided - lvs = filter(lambda f: vgname is None or vgname in f, - map(lambda v: v.strip(), out.strip('\n').split('\n'))) - - # create a dict based on data retrieved from lvs - return map(lambda l: {'lvname': l[0], - 'path': l[1], - 'size': long(l[2])}, - [fields.split() for fields in lvs]) - - -def pvs(vgname=None): - """ - lists all physical volumes in the system. It can be filtered by the - volume group. All size units are in bytes. - - [{'pvname': '/dev/sda3', - 'size': 469502001152L, - 'uuid': 'kkon5B-vnFI-eKHn-I5cG-Hj0C-uGx0-xqZrXI'}, - {'pvname': '/dev/sda2', - 'size': 21470642176L, - 'uuid': 'CyBzhK-cQFl-gWqr-fyWC-A50Y-LMxu-iHiJq4'}] - """ - cmd = ['pvs', - '--units', - 'b', - '--nosuffix', - '--noheading', - '--unbuffered', - '--options', - 'pv_name,pv_size,pv_uuid,vg_name'] - - out, err, rc = run_command(cmd) - if rc != 0: - raise OperationFailed("KCHLVM0001E", {'err': err}) - - if not out: - return [] - - # remove blank spaces and create a list of PVs filtered by vgname, if - # provided - pvs = filter(lambda f: vgname is None or vgname in f, - map(lambda v: v.strip(), out.strip('\n').split('\n'))) - - # create a dict based on data retrieved from pvs - return map(lambda l: {'pvname': l[0], - 'size': long(l[1]), - 'uuid': l[2]}, - [fields.split() for fields in pvs]) -- 1.9.1

3 2

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

11 Mar '16

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/wok Improve log messages printed by the serial console Make serial console timeout configurable Check if guest is listening to serial before connecting to it config.py.in | 3 ++ i18n.py | 2 + model/vms.py | 26 ++++++++-- serialconsole.py | 115 ++++++++++++++++++++++++++++++--------------- ui/serial/html/serial.html | 4 -- 5 files changed, 105 insertions(+), 45 deletions(-) -- 1.9.1

4 16

Storage Volume and selected disks
by Samuel Henrique De Oliveira Guimaraes 09 Mar '16

09 Mar '16

Hi team, In the final design spec for Storage Management we have two view modes for disks like we have in Guests and Templates. It also features a filter input and sort button, as well a new drop-down button for Volume management but there isn't any UI feedback for Volume selection. In the other hand, the old mockups for this screen features a checkbox and a green outline when the user selects the volume in gallery view mode. Here are my proposals: Keep the checkbox in the list/table view and hide it with Gallery view; Green outline like the other style used when selecting a Template in the modal window for Gallery view; Disable Action dropdown-button when nothing is selected. Questions: What are the formats to convert the files to? Regarding volume management, where is the full spec for volume actions such as create, delete, clone, resize and wipe? Should we append these actions to the Activate/Deactivate and Undefine dropdown? Thanks, Samuel

3 2

[PATCH] [Kimchi] Fix issue #849: Get network name for bridged networks
by Aline Manera 08 Mar '16

08 Mar '16

After attaching a bridged network to a guest, if you close the dialog and open it again, the network field was displayed in blank. So fix it. This patch also fix the KeyError issue reported in #849 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- mockmodel.py | 3 +-- model/vmifaces.py | 28 ++++++++++++---------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index a765770..cbeeb5d 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -34,7 +34,6 @@ from wok.xmlutils.utils import xml_item_update from wok.plugins.kimchi import imageinfo from wok.plugins.kimchi import osinfo from wok.plugins.kimchi.model import cpuinfo -from wok.plugins.kimchi.model import vmifaces from wok.plugins.kimchi.model.groups import PAMGroupsModel from wok.plugins.kimchi.model.host import DeviceModel from wok.plugins.kimchi.model.host import DevicesModel @@ -86,7 +85,7 @@ class MockModel(Model): self._mock_storagevolumes = MockStorageVolumes() cpuinfo.get_topo_capabilities = MockModel.get_topo_capabilities - vmifaces.getDHCPLeases = MockModel.getDHCPLeases + libvirt.virNetwork.DHCPLeases = MockModel.getDHCPLeases libvirt.virDomain.XMLDesc = MockModel.domainXMLDesc libvirt.virDomain.undefine = MockModel.undefineDomain libvirt.virDomain.attachDeviceFlags = MockModel.attachDeviceFlags diff --git a/model/vmifaces.py b/model/vmifaces.py index 72f717b..0ec89b6 100644 --- a/model/vmifaces.py +++ b/model/vmifaces.py @@ -29,14 +29,6 @@ from wok.plugins.kimchi.model.vms import DOM_STATE_MAP, VMModel from wok.plugins.kimchi.xmlutils.interface import get_iface_xml -def getDHCPLeases(net, mac): - try: - leases = net.DHCPLeases(mac) - return leases - except libvirt.libvirtError: - return [] - - class VMIfacesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] @@ -134,10 +126,9 @@ class VMIfaceModel(object): info['type'] = iface.attrib['type'] info['mac'] = iface.mac.get('address') + info['network'] = iface.source.get('network') if iface.find("model") is not None: info['model'] = iface.model.get('type') - if info['type'] == 'network': - info['network'] = iface.source.get('network') if info['type'] == 'bridge': info['bridge'] = iface.source.get('bridge') info['ips'] = self._get_ips(vm, info['mac'], info['network']) @@ -159,14 +150,19 @@ class VMIfaceModel(object): # First check the ARP cache. with open('/proc/net/arp') as f: ips = [line.split()[0] for line in f.xreadlines() if mac in line] + # Some ifaces may be inactive, so if the ARP cache didn't have them, # and they happen to be assigned via DHCP, we can check there too. - net = conn.networkLookupByName(network) - leases = getDHCPLeases(net, mac) - for lease in leases: - ip = lease.get('ipaddr') - if ip not in ips: - ips.append(ip) + try: + # Some type of interfaces may not have a network associated with + net = conn.networkLookupByName(network) + leases = net.DHCPLeases(mac) + for lease in leases: + ip = lease.get('ipaddr') + if ip not in ips: + ips.append(ip) + except libvirt.libvirtError: + pass return ips -- 2.5.0

2 2

[PATCH] [Kimchi] Issue #859 - Fix error when adding new disk to VM.
by pvital＠linux.vnet.ibm.com 08 Mar '16

08 Mar '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Remove hard-coded reference to the storage pool when attaching a new disk to a guest. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index 55bc3ac..3f416e7 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -322,7 +322,7 @@ kimchi.guest_storage_add_main = function() { } var createVol = function(settings, addVolSettings) { - kimchi.createVolumeWithCapacity('default', { + kimchi.createVolumeWithCapacity(settings['pool'], { name: settings['vol'], format: settings['format'], capacity: settings['capacity'] -- 2.5.0

4 3

[PATCH] [Kimchi] Customize user request log messages
by Lucio Correia 08 Mar '16

08 Mar '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- control/networks.py | 15 +++++++++++++++ control/storagepools.py | 16 ++++++++++++++++ control/storagevolumes.py | 17 +++++++++++++++++ control/templates.py | 15 +++++++++++++++ control/vm/hostdevs.py | 11 +++++++++++ control/vm/ifaces.py | 12 ++++++++++++ control/vm/snapshots.py | 14 ++++++++++++++ control/vm/storages.py | 12 ++++++++++++ control/vms.py | 24 ++++++++++++++++++++++++ 9 files changed, 136 insertions(+) diff --git a/control/networks.py b/control/networks.py index cd1feed..a8a26b2 100644 --- a/control/networks.py +++ b/control/networks.py @@ -21,6 +21,19 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +NETWORKS_REQUESTS = { + 'POST': {'default': "Create virtual network '%(name)s'"}, +} + +NETWORK_REQUESTS = { + 'DELETE': {'default': "Remove virtual network '%(ident)s'"}, + 'POST': { + 'activate': "Activate virtual network '%(ident)s'", + 'deactivate': "Deactivate virtual network '%(ident)s'", + }, +} + + @UrlSubNode('networks', True) class Networks(Collection): def __init__(self, model): @@ -28,6 +41,7 @@ class Networks(Collection): self.role_key = 'network' self.admin_methods = ['POST'] self.resource = Network + self.log_map = NETWORKS_REQUESTS class Network(Resource): @@ -39,6 +53,7 @@ class Network(Resource): self.activate = self.generate_action_handler('activate') self.deactivate = self.generate_action_handler('deactivate', destructive=True) + self.log_map = NETWORK_REQUESTS @property def data(self): diff --git a/control/storagepools.py b/control/storagepools.py index 10b371d..2139566 100644 --- a/control/storagepools.py +++ b/control/storagepools.py @@ -29,6 +29,20 @@ from wok.plugins.kimchi.control.storagevolumes import StorageVolumes from wok.plugins.kimchi.model.storagepools import ISO_POOL_NAME +STORAGEPOOLS_REQUESTS = { + 'POST': {'default': "Create storage pool '%(name)s'"}, +} + +STORAGEPOOL_REQUESTS = { + 'DELETE': {'default': "Remove storage pool '%(ident)s'"}, + 'PUT': {'default': "Update storage pool"}, + 'POST': { + 'activate': "Activate storage pool '%(ident)s'", + 'deactivate': "Deactivate storage pool '%(ident)s'", + }, +} + + @UrlSubNode('storagepools', True) class StoragePools(Collection): def __init__(self, model): @@ -38,6 +52,7 @@ class StoragePools(Collection): self.resource = StoragePool isos = IsoPool(model) setattr(self, ISO_POOL_NAME, isos) + self.log_map = STORAGEPOOLS_REQUESTS def create(self, params, *args): try: @@ -84,6 +99,7 @@ class StoragePool(Resource): self.deactivate = self.generate_action_handler('deactivate', destructive=True) self.storagevolumes = StorageVolumes(self.model, ident) + self.log_map = STORAGEPOOL_REQUESTS @property def data(self): diff --git a/control/storagevolumes.py b/control/storagevolumes.py index d78eefb..01654cb 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -22,6 +22,21 @@ from wok.control.base import AsyncCollection, Collection, Resource from wok.control.utils import get_class_name, model_fn +STORAGEVOLUMES_REQUESTS = { + 'POST': {'default': "Create storage volume '%(name)s'"}, +} + +STORAGEVOLUME_REQUESTS = { + 'DELETE': {'default': "Remove template '%(ident)s'"}, + 'PUT': {'default': "Update storage volume"}, + 'POST': { + 'wipe': "Wipe storage volume '%(ident)s'", + 'resize': "Resize storage volume '%(ident)s'", + 'clone': "Clone storage volume '%(ident)s'", + }, +} + + class StorageVolumes(AsyncCollection): def __init__(self, model, pool): super(StorageVolumes, self).__init__(model) @@ -29,6 +44,7 @@ class StorageVolumes(AsyncCollection): self.pool = pool self.resource_args = [self.pool, ] self.model_args = [self.pool, ] + self.log_map = STORAGEVOLUMES_REQUESTS def filter_data(self, resources, fields_filter): # filter directory from storage volumes @@ -48,6 +64,7 @@ class StorageVolume(Resource): self.resize = self.generate_action_handler('resize', ['size']) self.wipe = self.generate_action_handler('wipe') self.clone = self.generate_action_handler_task('clone') + self.log_map = STORAGEVOLUME_REQUESTS @property def data(self): diff --git a/control/templates.py b/control/templates.py index aebac0c..486dca1 100644 --- a/control/templates.py +++ b/control/templates.py @@ -21,6 +21,19 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +TEMPLATES_REQUESTS = { + 'POST': {'default': "Create template '%(name)s'"}, +} + +TEMPLATE_REQUESTS = { + 'DELETE': {'default': "Remove template '%(ident)s'"}, + 'PUT': {'default': "Update template"}, + 'POST': { + 'clone': "Clone template '%(ident)s'", + }, +} + + @UrlSubNode('templates', True) class Templates(Collection): def __init__(self, model): @@ -28,6 +41,7 @@ class Templates(Collection): self.role_key = 'templates' self.admin_methods = ['GET', 'POST'] self.resource = Template + self.log_map = TEMPLATES_REQUESTS class Template(Resource): @@ -37,6 +51,7 @@ class Template(Resource): self.admin_methods = ['PUT', 'POST', 'DELETE'] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') + self.log_map = TEMPLATE_REQUESTS @property def data(self): diff --git a/control/vm/hostdevs.py b/control/vm/hostdevs.py index bae98df..11e59c2 100644 --- a/control/vm/hostdevs.py +++ b/control/vm/hostdevs.py @@ -21,6 +21,15 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMHOSTDEVS_REQUESTS = { + 'POST': {'default': "Attach host device '%(name)s' to guest"}, +} + +VMHOSTDEV_REQUESTS = { + 'DELETE': {'default': "Detach host device '%(ident)s' from guest"}, +} + + @UrlSubNode("hostdevs") class VMHostDevs(Collection): def __init__(self, model, vmid): @@ -29,6 +38,7 @@ class VMHostDevs(Collection): self.vmid = vmid self.resource_args = [self.vmid, ] self.model_args = [self.vmid, ] + self.log_map = VMHOSTDEVS_REQUESTS class VMHostDev(Resource): @@ -37,6 +47,7 @@ class VMHostDev(Resource): self.vmid = vmid self.ident = ident self.model_args = [self.vmid, self.ident] + self.log_map = VMHOSTDEV_REQUESTS @property def data(self): diff --git a/control/vm/ifaces.py b/control/vm/ifaces.py index d856956..f7c4e36 100644 --- a/control/vm/ifaces.py +++ b/control/vm/ifaces.py @@ -21,6 +21,16 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMIFACES_REQUESTS = { + 'POST': {'default': "Attach network interface '%(network)s' to guest"}, +} + +VMIFACE_REQUESTS = { + 'DELETE': {'default': "Detach network interface '%(ident)s' from guest"}, + 'PUT': {'default': "Update guest network interface"}, +} + + @UrlSubNode("ifaces") class VMIfaces(Collection): def __init__(self, model, vm): @@ -29,6 +39,7 @@ class VMIfaces(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + self.log_map = VMIFACES_REQUESTS class VMIface(Resource): @@ -39,6 +50,7 @@ class VMIface(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/ifaces/%s' + self.log_map = VMIFACE_REQUESTS @property def data(self): diff --git a/control/vm/snapshots.py b/control/vm/snapshots.py index b95eaa9..5a6013c 100644 --- a/control/vm/snapshots.py +++ b/control/vm/snapshots.py @@ -21,6 +21,18 @@ from wok.control.base import AsyncCollection, Resource from wok.control.utils import UrlSubNode +VMSNAPSHOTS_REQUESTS = { + 'POST': {'default': "Create guest snapshot '%(name)s'"}, +} + +VMSNAPSHOT_REQUESTS = { + 'DELETE': {'default': "Remove guest snapshot '%(ident)s'"}, + 'POST': { + 'revert': "Revert to guest snapshot '%(ident)s'", + }, +} + + @UrlSubNode('snapshots') class VMSnapshots(AsyncCollection): def __init__(self, model, vm): @@ -30,6 +42,7 @@ class VMSnapshots(AsyncCollection): self.resource_args = [self.vm, ] self.model_args = [self.vm, ] self.current = CurrentVMSnapshot(model, vm) + self.log_map = VMSNAPSHOTS_REQUESTS class VMSnapshot(Resource): @@ -40,6 +53,7 @@ class VMSnapshot(Resource): self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/snapshots/%s' self.revert = self.generate_action_handler('revert') + self.log_map = VMSNAPSHOT_REQUESTS @property def data(self): diff --git a/control/vm/storages.py b/control/vm/storages.py index 3c7d1a3..5e7b8c4 100644 --- a/control/vm/storages.py +++ b/control/vm/storages.py @@ -21,6 +21,16 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMSTORAGES_REQUESTS = { + 'POST': {'default': "Attach '%(type)s' storage '%(path)s' to guest"}, +} + +VMSTORAGE_REQUESTS = { + 'DELETE': {'default': "Remove storage '%(ident)s' from guest"}, + 'PUT': {'default': "Update guest storage path to '%(path)s'"}, +} + + @UrlSubNode("storages") class VMStorages(Collection): def __init__(self, model, vm): @@ -29,6 +39,7 @@ class VMStorages(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + self.log_map = VMSTORAGES_REQUESTS class VMStorage(Resource): @@ -39,6 +50,7 @@ class VMStorage(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/storages/%s' + self.log_map = VMSTORAGE_REQUESTS @property def data(self): diff --git a/control/vms.py b/control/vms.py index 7745a18..1297955 100644 --- a/control/vms.py +++ b/control/vms.py @@ -23,6 +23,28 @@ from wok.control.utils import internal_redirect, UrlSubNode from wok.plugins.kimchi.control.vm import sub_nodes +VMS_REQUESTS = { + 'POST': {'default': "Create guest from template '%(template)s'"}, +} + +VM_REQUESTS = { + 'DELETE': {'default': "Remove guest '%(ident)s'"}, + 'PUT': {'default': "Update guest"}, + 'POST': { + 'start': "Start guest '%(ident)s'", + 'poweroff': "Power off guest '%(ident)s'", + 'shutdown': "Shutdown guest '%(ident)s'", + 'reset': "Restart guest '%(ident)s'", + 'connect': "Connect to guest '%(ident)s' through novnc/spice", + 'clone': "Clone guest '%(ident)s'", + 'migrate': "Migrate guest '%(ident)s'", + 'suspend': "Suspend guest '%(ident)s'", + 'resume': "Resume guest '%(ident)s'", + 'serial': "Connect to guest '%(ident)s' through serial", + }, +} + + @UrlSubNode('vms', True) class VMs(AsyncCollection): def __init__(self, model): @@ -30,6 +52,7 @@ class VMs(AsyncCollection): self.resource = VM self.role_key = 'guests' self.admin_methods = ['POST'] + self.log_map = VMS_REQUESTS class VM(Resource): @@ -56,6 +79,7 @@ class VM(Resource): self.suspend = self.generate_action_handler('suspend') self.resume = self.generate_action_handler('resume') self.serial = self.generate_action_handler('serial') + self.log_map = VM_REQUESTS @property def data(self): -- 1.9.1

2 1

[PATCH v3][Kimchi] Increase guest Max Memory limits
by Rodrigo Trujillo 08 Mar '16

08 Mar '16

This patch changes the limits of max memory to 16TiB in PowerPC and 4TiB in x86 architectures. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/templates.py | 12 ++++++++---- tests/test_template.py | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/i18n.py b/i18n.py index 008e327..707b74b 100644 --- a/i18n.py +++ b/i18n.py @@ -133,7 +133,7 @@ messages = { "KCHVM0076E": _("VM %(name)s must have serial and console defined to open a web serial console"), "KCHVM0077E": _("Impossible to get the serial console of %(name)s"), "KCHVM0078E": _("Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB."), - "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 1TiB"), + "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: %(value)sTiB"), "KCHVM0080E": _("Cannot update Maximum Memory when guest is running."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), diff --git a/model/templates.py b/model/templates.py index fb63dc1..92705b6 100644 --- a/model/templates.py +++ b/model/templates.py @@ -38,8 +38,10 @@ from wok.plugins.kimchi.vmtemplate import VMTemplate # In PowerPC, memories must be aligned to 256 MiB PPC_MEM_ALIGN = 256 -# Max memory 1TB, in KiB -MAX_MEM_LIM = 1073741824 +# Max memory 16TB for PPC and 4TiB for X (according to Red Hat), in KiB +MAX_MEM_LIM = 4294967296 # 4 TiB +if os.uname()[4] in ['ppc', 'ppc64', 'ppc64le']: + MAX_MEM_LIM *= 4 # 16TiB class TemplatesModel(object): @@ -225,9 +227,11 @@ def validate_memory(memory): else: host_memory = psutil.TOTAL_PHYMEM >> 10 >> 10 - # Memories must be lesser than 1TB and the Host memory limit + # Memories must be lesser than 16TiB (PPC) or 4TiB (x86) and the Host + # memory limit if (current > (MAX_MEM_LIM >> 10)) or (maxmem > (MAX_MEM_LIM >> 10)): - raise InvalidParameter("KCHVM0079E") + raise InvalidParameter("KCHVM0079E", + {'value': str(MAX_MEM_LIM / (1024**3))}) if (current > host_memory) or (maxmem > host_memory): raise InvalidParameter("KCHVM0078E", {'memHost': host_memory}) diff --git a/tests/test_template.py b/tests/test_template.py index 4a74955..fcb2e46 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -29,6 +29,7 @@ from tests.utils import get_free_port, patch_auth, request, run_server from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.mockmodel import MockModel from wok.plugins.kimchi.model.featuretests import FeatureTests +from wok.plugins.kimchi.model.templates import MAX_MEM_LIM model = None @@ -227,8 +228,8 @@ class TemplateTests(unittest.TestCase): req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) - # - max memory greater than 1TiB limit - req = json.dumps({'memory': {'maxmemory': 1073741824 + 1024}}) + # - max memory greater than limit: 16TiB to PPC and 4TiB to x86 + req = json.dumps({'memory': {'maxmemory': MAX_MEM_LIM + 1024}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) self.assertTrue('KCHVM0079E' in resp.read()) -- 2.1.0

3 2

[PATCH v2][Kimchi] Increase guest Max Memory limits
by Rodrigo Trujillo 08 Mar '16

08 Mar '16

This patch changes the limits of max memory to 16TiB in PowerPC and 4TiB in x86 architectures. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/templates.py | 12 ++++++++---- tests/test_template.py | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/i18n.py b/i18n.py index 008e327..707b74b 100644 --- a/i18n.py +++ b/i18n.py @@ -133,7 +133,7 @@ messages = { "KCHVM0076E": _("VM %(name)s must have serial and console defined to open a web serial console"), "KCHVM0077E": _("Impossible to get the serial console of %(name)s"), "KCHVM0078E": _("Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB."), - "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 1TiB"), + "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: %(value)sTiB"), "KCHVM0080E": _("Cannot update Maximum Memory when guest is running."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), diff --git a/model/templates.py b/model/templates.py index fb63dc1..ef725f5 100644 --- a/model/templates.py +++ b/model/templates.py @@ -38,8 +38,10 @@ from wok.plugins.kimchi.vmtemplate import VMTemplate # In PowerPC, memories must be aligned to 256 MiB PPC_MEM_ALIGN = 256 -# Max memory 1TB, in KiB -MAX_MEM_LIM = 1073741824 +# Max memory 16TB for PPC and 4TiB for X (according to Red Hat), in KiB +MAX_MEM_LIM = 4294967296 # 4 TiB +if os.uname()[4] in ['ppc', 'ppc64', 'ppc64le']: + MAX_MEM_LIM = 4 * 4294967296 # 16TiB class TemplatesModel(object): @@ -225,9 +227,11 @@ def validate_memory(memory): else: host_memory = psutil.TOTAL_PHYMEM >> 10 >> 10 - # Memories must be lesser than 1TB and the Host memory limit + # Memories must be lesser than 16TiB (PPC) or 4TiB (x86) and the Host + # memory limit if (current > (MAX_MEM_LIM >> 10)) or (maxmem > (MAX_MEM_LIM >> 10)): - raise InvalidParameter("KCHVM0079E") + raise InvalidParameter("KCHVM0079E", + {'value': str(MAX_MEM_LIM / (1024**3))}) if (current > host_memory) or (maxmem > host_memory): raise InvalidParameter("KCHVM0078E", {'memHost': host_memory}) diff --git a/tests/test_template.py b/tests/test_template.py index 4a74955..fcb2e46 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -29,6 +29,7 @@ from tests.utils import get_free_port, patch_auth, request, run_server from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.mockmodel import MockModel from wok.plugins.kimchi.model.featuretests import FeatureTests +from wok.plugins.kimchi.model.templates import MAX_MEM_LIM model = None @@ -227,8 +228,8 @@ class TemplateTests(unittest.TestCase): req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) - # - max memory greater than 1TiB limit - req = json.dumps({'memory': {'maxmemory': 1073741824 + 1024}}) + # - max memory greater than limit: 16TiB to PPC and 4TiB to x86 + req = json.dumps({'memory': {'maxmemory': MAX_MEM_LIM + 1024}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) self.assertTrue('KCHVM0079E' in resp.read()) -- 2.1.0

2 2

[PATCH][Kimchi] Increase guest Max Memory limit to 16TiB
by Rodrigo Trujillo 08 Mar '16

08 Mar '16

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/templates.py | 6 +++--- tests/test_template.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/i18n.py b/i18n.py index 008e327..dc374c3 100644 --- a/i18n.py +++ b/i18n.py @@ -133,7 +133,7 @@ messages = { "KCHVM0076E": _("VM %(name)s must have serial and console defined to open a web serial console"), "KCHVM0077E": _("Impossible to get the serial console of %(name)s"), "KCHVM0078E": _("Memory or Maximum Memory value is higher than amount supported by the host: %(memHost)sMiB."), - "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 1TiB"), + "KCHVM0079E": _("Memory or Maximum Memory value is higher than maximum amount recommended: 16TiB"), "KCHVM0080E": _("Cannot update Maximum Memory when guest is running."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), diff --git a/model/templates.py b/model/templates.py index fb63dc1..39e8982 100644 --- a/model/templates.py +++ b/model/templates.py @@ -38,8 +38,8 @@ from wok.plugins.kimchi.vmtemplate import VMTemplate # In PowerPC, memories must be aligned to 256 MiB PPC_MEM_ALIGN = 256 -# Max memory 1TB, in KiB -MAX_MEM_LIM = 1073741824 +# Max memory 16TB, in KiB +MAX_MEM_LIM = 17179869184 class TemplatesModel(object): @@ -225,7 +225,7 @@ def validate_memory(memory): else: host_memory = psutil.TOTAL_PHYMEM >> 10 >> 10 - # Memories must be lesser than 1TB and the Host memory limit + # Memories must be lesser than 16TB and the Host memory limit if (current > (MAX_MEM_LIM >> 10)) or (maxmem > (MAX_MEM_LIM >> 10)): raise InvalidParameter("KCHVM0079E") if (current > host_memory) or (maxmem > host_memory): diff --git a/tests/test_template.py b/tests/test_template.py index 4a74955..912afe3 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -227,8 +227,8 @@ class TemplateTests(unittest.TestCase): req = json.dumps({'memory': {'current': 2048}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) - # - max memory greater than 1TiB limit - req = json.dumps({'memory': {'maxmemory': 1073741824 + 1024}}) + # - max memory greater than 16TiB limit + req = json.dumps({'memory': {'maxmemory': (16 * 1073741824) + 1024}}) resp = self.request(new_tmpl_uri, req, 'PUT') self.assertEquals(400, resp.status) self.assertTrue('KCHVM0079E' in resp.read()) -- 2.1.0

1 1

[PATCH] [Kimchi] Bug fix: Remove storage volume file while removing the storage volume
by Aline Manera 07 Mar '16

07 Mar '16

When removing a storage volume, it was only removed from a libvirt perspective, ie, the storage volume file kept in the system. It may confuse user as he/she will not be able to create a new storage volume with the same name from the storage volume removed before as the file exists in the system. To avoid it, remove the file from the system after removing it from a libvirt perspective. This issue was identified due a failure in the test suite. 2 files related to storage volume tests were kept on the system causing errors when running the test suite multiple times. To verify this patch, please, make sure to do not have any leftovers in the 'default' storage pool directory (/var/lib/libvirt/images). After that, run the test suite mutliple times and you will see no leftovers will be in the system when the test completes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/storagevolumes.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/model/storagevolumes.py b/model/storagevolumes.py index d010bcd..f87738f 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -367,12 +367,19 @@ class StorageVolumeModel(object): raise InvalidParameter("KCHVOL0012E", {'type': pool_info['type']}) volume = StorageVolumeModel.get_storagevolume(pool, name, self.conn) + vol_path = volume.path() try: volume.delete(0) except libvirt.libvirtError as e: raise OperationFailed("KCHVOL0010E", {'name': name, 'err': e.get_error_message()}) + try: + os.remove(vol_path) + except OSError, e: + wok_log.error("Unable to delete storage volume file: %s." + "Details: %s" % (pool_info['path'], e.message)) + def resize(self, pool, name, size): volume = StorageVolumeModel.get_storagevolume(pool, name, self.conn) -- 2.5.0

4 10

[PATCH V2] [Kimchi] Customize user request log messages
by Lucio Correia 07 Mar '16

07 Mar '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- control/networks.py | 15 +++++++++++++++ control/storagepools.py | 16 ++++++++++++++++ control/storagevolumes.py | 25 +++++++++++++++++++++++++ control/templates.py | 15 +++++++++++++++ control/vm/hostdevs.py | 19 +++++++++++++++++++ control/vm/ifaces.py | 24 ++++++++++++++++++++++++ control/vm/snapshots.py | 21 +++++++++++++++++++++ control/vm/storages.py | 21 +++++++++++++++++++++ control/vms.py | 27 +++++++++++++++++++++++++++ 9 files changed, 183 insertions(+) Changes in V2: - Improve log messages according to wok modifications diff --git a/control/networks.py b/control/networks.py index cd1feed..8ba2206 100644 --- a/control/networks.py +++ b/control/networks.py @@ -21,6 +21,19 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +NETWORKS_REQUESTS = { + 'POST': {'default': "Create %(connection)s virtual network '%(name)s'"}, +} + +NETWORK_REQUESTS = { + 'DELETE': {'default': "Remove virtual network '%(ident)s'"}, + 'POST': { + 'activate': "Activate virtual network '%(ident)s'", + 'deactivate': "Deactivate virtual network '%(ident)s'", + }, +} + + @UrlSubNode('networks', True) class Networks(Collection): def __init__(self, model): @@ -28,6 +41,7 @@ class Networks(Collection): self.role_key = 'network' self.admin_methods = ['POST'] self.resource = Network + self.log_map = NETWORKS_REQUESTS class Network(Resource): @@ -39,6 +53,7 @@ class Network(Resource): self.activate = self.generate_action_handler('activate') self.deactivate = self.generate_action_handler('deactivate', destructive=True) + self.log_map = NETWORK_REQUESTS @property def data(self): diff --git a/control/storagepools.py b/control/storagepools.py index 10b371d..aa7dbd3 100644 --- a/control/storagepools.py +++ b/control/storagepools.py @@ -29,6 +29,20 @@ from wok.plugins.kimchi.control.storagevolumes import StorageVolumes from wok.plugins.kimchi.model.storagepools import ISO_POOL_NAME +STORAGEPOOLS_REQUESTS = { + 'POST': {'default': "Create %(type)s storage pool '%(name)s'"}, +} + +STORAGEPOOL_REQUESTS = { + 'DELETE': {'default': "Remove storage pool '%(ident)s'"}, + 'PUT': {'default': "Update storage pool '%(ident)s'"}, + 'POST': { + 'activate': "Activate storage pool '%(ident)s'", + 'deactivate': "Deactivate storage pool '%(ident)s'", + }, +} + + @UrlSubNode('storagepools', True) class StoragePools(Collection): def __init__(self, model): @@ -38,6 +52,7 @@ class StoragePools(Collection): self.resource = StoragePool isos = IsoPool(model) setattr(self, ISO_POOL_NAME, isos) + self.log_map = STORAGEPOOLS_REQUESTS def create(self, params, *args): try: @@ -84,6 +99,7 @@ class StoragePool(Resource): self.deactivate = self.generate_action_handler('deactivate', destructive=True) self.storagevolumes = StorageVolumes(self.model, ident) + self.log_map = STORAGEPOOL_REQUESTS @property def data(self): diff --git a/control/storagevolumes.py b/control/storagevolumes.py index d78eefb..a04ad35 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -22,6 +22,23 @@ from wok.control.base import AsyncCollection, Collection, Resource from wok.control.utils import get_class_name, model_fn +STORAGEVOLUMES_REQUESTS = { + 'POST': {'default': "Create storage volume '%(name)s' at pool '%(pool)s'"}, +} + +STORAGEVOLUME_REQUESTS = { + 'DELETE': {'default': "Remove storage volume '%(ident)s' from " + "pool '%(pool)s'"}, + 'PUT': {'default': "Update storage volume '%(ident)s' at pool '%(pool)s'"}, + 'POST': { + 'wipe': "Wipe storage volume '%(ident)s' off pool '%(pool)s'", + 'resize': "Resize storage volume '%(ident)s' at pool '%(pool)s' with " + "size %(size)s", + 'clone': "Clone storage volume '%(ident)s' at pool '%(pool)s'", + }, +} + + class StorageVolumes(AsyncCollection): def __init__(self, model, pool): super(StorageVolumes, self).__init__(model) @@ -29,6 +46,10 @@ class StorageVolumes(AsyncCollection): self.pool = pool self.resource_args = [self.pool, ] self.model_args = [self.pool, ] + self.log_map = STORAGEVOLUMES_REQUESTS + self.log_args.update({ + 'pool': self.pool.encode('utf-8') if self.pool else '', + }) def filter_data(self, resources, fields_filter): # filter directory from storage volumes @@ -48,6 +69,10 @@ class StorageVolume(Resource): self.resize = self.generate_action_handler('resize', ['size']) self.wipe = self.generate_action_handler('wipe') self.clone = self.generate_action_handler_task('clone') + self.log_map = STORAGEVOLUME_REQUESTS + self.log_args.update({ + 'pool': self.pool.encode('utf-8') if self.pool else '', + }) @property def data(self): diff --git a/control/templates.py b/control/templates.py index aebac0c..343ced1 100644 --- a/control/templates.py +++ b/control/templates.py @@ -21,6 +21,19 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +TEMPLATES_REQUESTS = { + 'POST': {'default': "Create template '%(name)s'"}, +} + +TEMPLATE_REQUESTS = { + 'DELETE': {'default': "Remove template '%(ident)s'"}, + 'PUT': {'default': "Update template '%(ident)s'"}, + 'POST': { + 'clone': "Clone template '%(ident)s'", + }, +} + + @UrlSubNode('templates', True) class Templates(Collection): def __init__(self, model): @@ -28,6 +41,7 @@ class Templates(Collection): self.role_key = 'templates' self.admin_methods = ['GET', 'POST'] self.resource = Template + self.log_map = TEMPLATES_REQUESTS class Template(Resource): @@ -37,6 +51,7 @@ class Template(Resource): self.admin_methods = ['PUT', 'POST', 'DELETE'] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') + self.log_map = TEMPLATE_REQUESTS @property def data(self): diff --git a/control/vm/hostdevs.py b/control/vm/hostdevs.py index bae98df..8a82db0 100644 --- a/control/vm/hostdevs.py +++ b/control/vm/hostdevs.py @@ -21,6 +21,17 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMHOSTDEVS_REQUESTS = { + 'POST': {'default': "Attach host device '%(name)s' to guest '%(vmid)s'"}, +} + +VMHOSTDEV_REQUESTS = { + 'DELETE': { + 'default': "Detach host device '%(ident)s' from guest '%(vmid)s'", + }, +} + + @UrlSubNode("hostdevs") class VMHostDevs(Collection): def __init__(self, model, vmid): @@ -29,6 +40,10 @@ class VMHostDevs(Collection): self.vmid = vmid self.resource_args = [self.vmid, ] self.model_args = [self.vmid, ] + self.log_map = VMHOSTDEVS_REQUESTS + self.log_args.update({ + 'vmid': self.vmid.encode('utf-8') if self.vmid else '', + }) class VMHostDev(Resource): @@ -37,6 +52,10 @@ class VMHostDev(Resource): self.vmid = vmid self.ident = ident self.model_args = [self.vmid, self.ident] + self.log_map = VMHOSTDEV_REQUESTS + self.log_args.update({ + 'vmid': self.vmid.encode('utf-8') if self.vmid else '', + }) @property def data(self): diff --git a/control/vm/ifaces.py b/control/vm/ifaces.py index d856956..9ecfc8f 100644 --- a/control/vm/ifaces.py +++ b/control/vm/ifaces.py @@ -21,6 +21,22 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMIFACES_REQUESTS = { + 'POST': { + 'default': "Attach network interface '%(network)s' to guest '%(vm)s'", + }, +} + +VMIFACE_REQUESTS = { + 'DELETE': { + 'default': "Detach network interface '%(ident)s' from guest '%(vm)s'", + }, + 'PUT': { + 'default': "Update network interface '%(ident)s' at guest '%(vm)s'", + }, +} + + @UrlSubNode("ifaces") class VMIfaces(Collection): def __init__(self, model, vm): @@ -29,6 +45,10 @@ class VMIfaces(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + self.log_map = VMIFACES_REQUESTS + self.log_args.update({ + 'vm': self.vm.encode('utf-8') if self.vm else '', + }) class VMIface(Resource): @@ -39,6 +59,10 @@ class VMIface(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/ifaces/%s' + self.log_map = VMIFACE_REQUESTS + self.log_args.update({ + 'vm': self.vm.encode('utf-8') if self.vm else '', + }) @property def data(self): diff --git a/control/vm/snapshots.py b/control/vm/snapshots.py index b95eaa9..d8cccc1 100644 --- a/control/vm/snapshots.py +++ b/control/vm/snapshots.py @@ -21,6 +21,18 @@ from wok.control.base import AsyncCollection, Resource from wok.control.utils import UrlSubNode +VMSNAPSHOTS_REQUESTS = { + 'POST': {'default': "Create snapshot '%(name)s' at guest '%(vm)s'"}, +} + +VMSNAPSHOT_REQUESTS = { + 'DELETE': {'default': "Remove snapshot '%(ident)s' from guest '%(vm)s'"}, + 'POST': { + 'revert': "Revert guest '%(vm)s' to snapshot '%(ident)s'", + }, +} + + @UrlSubNode('snapshots') class VMSnapshots(AsyncCollection): def __init__(self, model, vm): @@ -30,6 +42,11 @@ class VMSnapshots(AsyncCollection): self.resource_args = [self.vm, ] self.model_args = [self.vm, ] self.current = CurrentVMSnapshot(model, vm) + self.log_map = VMSNAPSHOTS_REQUESTS + self.log_args.update({ + 'vm': self.vm.encode('utf-8') if self.vm else '', + 'name': '', + }) class VMSnapshot(Resource): @@ -40,6 +57,10 @@ class VMSnapshot(Resource): self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/snapshots/%s' self.revert = self.generate_action_handler('revert') + self.log_map = VMSNAPSHOT_REQUESTS + self.log_args.update({ + 'vm': self.vm.encode('utf-8') if self.vm else '', + }) @property def data(self): diff --git a/control/vm/storages.py b/control/vm/storages.py index 3c7d1a3..4a4c8d2 100644 --- a/control/vm/storages.py +++ b/control/vm/storages.py @@ -21,6 +21,18 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +VMSTORAGES_REQUESTS = { + 'POST': { + 'default': "Attach %(type)s storage '%(path)s' to guest '%(vm)s'", + }, +} + +VMSTORAGE_REQUESTS = { + 'DELETE': {'default': "Remove storage '%(ident)s' from guest '%(vm)s'"}, + 'PUT': {'default': "Update storage '%(ident)s' at guest '%(vm)s'"}, +} + + @UrlSubNode("storages") class VMStorages(Collection): def __init__(self, model, vm): @@ -29,6 +41,11 @@ class VMStorages(Collection): self.vm = vm self.resource_args = [self.vm, ] self.model_args = [self.vm, ] + self.log_map = VMSTORAGES_REQUESTS + self.log_args.update({ + 'vm': self.vm.encode('utf-8') if self.vm else '', + 'path': '', + }) class VMStorage(Resource): @@ -39,6 +56,10 @@ class VMStorage(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/storages/%s' + self.log_map = VMSTORAGE_REQUESTS + self.log_args.update({ + 'vm': self.vm.encode('utf-8') if self.vm else '', + }) @property def data(self): diff --git a/control/vms.py b/control/vms.py index 7745a18..64df00e 100644 --- a/control/vms.py +++ b/control/vms.py @@ -23,6 +23,30 @@ from wok.control.utils import internal_redirect, UrlSubNode from wok.plugins.kimchi.control.vm import sub_nodes +VMS_REQUESTS = { + 'POST': { + 'default': "Create guest '%(name)s' from template '%(template)s'", + }, +} + +VM_REQUESTS = { + 'DELETE': {'default': "Remove guest '%(ident)s'"}, + 'PUT': {'default': "Edit guest '%(ident)s'"}, + 'POST': { + 'start': "Start guest '%(ident)s'", + 'poweroff': "Power off guest '%(ident)s'", + 'shutdown': "Shutdown guest '%(ident)s'", + 'reset': "Restart guest '%(ident)s'", + 'connect': "Connect to guest '%(ident)s' through novnc/spice", + 'clone': "Clone guest '%(ident)s'", + 'migrate': "Migrate guest '%(ident)s' to '%(remote_host)s'", + 'suspend': "Suspend guest '%(ident)s'", + 'resume': "Resume guest '%(ident)s'", + 'serial': "Connect to guest '%(ident)s' through serial", + }, +} + + @UrlSubNode('vms', True) class VMs(AsyncCollection): def __init__(self, model): @@ -30,6 +54,8 @@ class VMs(AsyncCollection): self.resource = VM self.role_key = 'guests' self.admin_methods = ['POST'] + self.log_map = VMS_REQUESTS + self.log_args.update({'name': ''}) class VM(Resource): @@ -56,6 +82,7 @@ class VM(Resource): self.suspend = self.generate_action_handler('suspend') self.resume = self.generate_action_handler('resume') self.serial = self.generate_action_handler('serial') + self.log_map = VM_REQUESTS @property def data(self): -- 1.9.1

3 2

[PATCH] [Wok] User Request Log backend improvements
by Lucio Correia 07 Mar '16

07 Mar '16

- Use log_args attribute to improve message quality - Fix handling of utf8 vs str messages Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 59 ++++++++++++++++++++++++------------------------- src/wok/reqlogger.py | 5 +++-- src/wok/utils.py | 23 +++++++++++++++++++ 3 files changed, 55 insertions(+), 32 deletions(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index 79dd22c..be2e35e 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -33,13 +33,15 @@ from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError from wok.exception import OperationFailed, UnauthorizedError, WokException from wok.reqlogger import RequestRecord -from wok.utils import get_plugin_from_request +from wok.utils import get_plugin_from_request, utf8_dict # Default request log messages COLLECTION_DEFAULT_LOG = "request on collection" RESOURCE_DEFAULT_LOG = "request on resource" +LOG_DISABLED_METHODS = ['GET'] + class Resource(object): """ @@ -66,6 +68,9 @@ class Resource(object): self.role_key = None self.admin_methods = [] self.log_map = {} + self.log_args = { + 'ident': self.ident.encode('utf-8') if self.ident else '', + } def _redirect(self, action_result, code=303): uri_params = [] @@ -129,12 +134,10 @@ class Resource(object): action_fn = getattr(self.model, model_fn(self, action_name)) action_result = action_fn(*model_args) - params = {} - if model_args: - params = {'ident': model_args[0].encode('utf-8')} - + # log request + reqParams = utf8_dict(self.log_args, request) RequestRecord( - self.getRequestMessage(method, action_name) % params, + self.getRequestMessage(method, action_name) % reqParams, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') @@ -175,18 +178,6 @@ class Resource(object): fn = getattr(self.model, model_fn(self, 'delete')) fn(*self.model_args) cherrypy.response.status = 204 - - method = 'DELETE' - params = {} - if self.model_args: - params = {'ident': self.model_args[0].encode('utf-8')} - - RequestRecord( - self.getRequestMessage(method, 'default') % params, - app=get_plugin_from_request(), - req=method, - user=cherrypy.session.get(USER_NAME, 'N/A') - ).log() except AttributeError: e = InvalidOperation('WOKAPI0002E', {'resource': get_class_name(self)}) @@ -206,9 +197,9 @@ class Resource(object): if not self.is_authorized(): raise UnauthorizedError('WOKAPI0009E') - return {'GET': self.get, - 'DELETE': self.delete, - 'PUT': self.update}[method](*args, **kargs) + result = {'GET': self.get, + 'DELETE': self.delete, + 'PUT': self.update}[method](*args, **kargs) except InvalidOperation, e: raise cherrypy.HTTPError(400, e.message) except InvalidParameter, e: @@ -222,6 +213,17 @@ class Resource(object): except WokException, e: raise cherrypy.HTTPError(500, e.message) + # log request + if method not in LOG_DISABLED_METHODS: + RequestRecord( + self.getRequestMessage(method) % self.log_args, + app=get_plugin_from_request(), + req=method, + user=cherrypy.session.get(USER_NAME, 'N/A') + ).log() + + return result + def is_authorized(self): user_name = cherrypy.session.get(USER_NAME, '') user_groups = cherrypy.session.get(USER_GROUPS, []) @@ -249,14 +251,6 @@ class Resource(object): args = list(self.model_args) + [params] ident = update(*args) - - method = 'PUT' - RequestRecord( - self.getRequestMessage(method) % params, - app=get_plugin_from_request(), - req=method, - user=cherrypy.session.get(USER_NAME, 'N/A') - ).log() self._redirect(ident) self.lookup() return self.get() @@ -323,6 +317,7 @@ class Collection(object): self.role_key = None self.admin_methods = [] self.log_map = {} + self.log_args = {} def create(self, params, *args): try: @@ -413,12 +408,16 @@ class Collection(object): elif method == 'POST': params = parse_request() result = self.create(params, *args) + + # log request + reqParams = utf8_dict(self.log_args, params) RequestRecord( - self.getRequestMessage(method) % params, + self.getRequestMessage(method) % reqParams, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') ).log() + return result except InvalidOperation, e: raise cherrypy.HTTPError(400, e.message) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 3e79377..1294be1 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -29,7 +29,7 @@ from tempfile import NamedTemporaryFile from wok.config import config, get_log_download_path from wok.exception import InvalidParameter, OperationFailed -from wok.utils import remove_old_files +from wok.utils import ascii_dict, remove_old_files # Log search setup @@ -89,7 +89,8 @@ class RequestParser(object): with fd: for record in sortedList: - fd.write(LOG_FORMAT % record) + asciiRecord = ascii_dict(record) + fd.write(LOG_FORMAT % asciiRecord) fd.close() except IOError as e: diff --git a/src/wok/utils.py b/src/wok/utils.py index e3a4124..7e9a928 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -21,6 +21,7 @@ # import cherrypy +import copy import glob import grp import os @@ -135,6 +136,28 @@ def get_plugin_from_request(): return 'wok' +def ascii_dict(base, overlay=None): + result = copy.deepcopy(base) + result.update(overlay or {}) + + for key, value in result.iteritems(): + if isinstance(value, unicode): + result[key] = str(value.decode('utf-8')) + + return result + + +def utf8_dict(base, overlay=None): + result = copy.deepcopy(base) + result.update(overlay or {}) + + for key, value in result.iteritems(): + if isinstance(value, unicode): + result[key] = value.encode('utf-8') + + return result + + def import_class(class_path): module_name, class_name = class_path.rsplit('.', 1) try: -- 1.9.1

3 2

[PATCH][Wok] Display Wok messages when requested from plugins
by Rodrigo Trujillo 07 Mar '16

07 Mar '16

When a plugin makes a request and backend fails in some Wok routine or function, a Wok error message is returned. However, only the message code is displayed not the message text. This patch fixes this problem, so Wok error messages are displayed properly. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/exception.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wok/exception.py b/src/wok/exception.py index 878922a..023334b 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -43,10 +43,11 @@ class WokException(Exception): # itself to a unicode string. args[key] = unicode(value) - if cherrypy.request.app: + # 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() - else: - msg = _messages.get(code, code) msg = unicode(msg, 'utf-8') % args pattern = "%s: %s" % (code, msg) -- 2.1.0

3 2

[PATCH v2][Kimchi] Fix minor issues in Kimchi UI: Template CPUs and Guest CPUs
by Rodrigo Trujillo 04 Mar '16

04 Mar '16

This patch apply two fixes: - display Templates number of cores (it was missing the number) - change "Memory Used" by "Memory Utilization" Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/pages/guest.html.tmpl | 2 +- ui/pages/tabs/guests.html.tmpl | 2 +- ui/pages/tabs/templates.html.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index be9b47e..c8f32a9 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -82,7 +82,7 @@ <div class="progress-bar light-grey cpu"></div> <div class="progress-bar cpu-progress-bar"></div> </div>$_("Processors Used") + -->$_("Processors Utilization")  <div class='percentage-label memory-percentage'></div> diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index 4d72ea6..af68d66 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -72,7 +72,7 @@ -->$_("Guest Name ID")$_("OS Type")$_("VNC")$_("Processors Used")$_("Processors Utilization")$_("Memory Utilization")$_("Storage I/O")$_("Network I/O")$_("OS"){os_version}$_("Version"){cpus} $_("cores"){cpu_info.vcpus} $_("cores")$_("CPUs"){memory.current} $_("M")$_("Memory") -- 2.1.0

3 2

[PATCH][Kimchi] Fix minor issues in Kimchi UI: Template CPUs and Guest CPUs
by Rodrigo Trujillo 04 Mar '16

04 Mar '16

This patch apply two fixes: - display Templates number of cores (it was missing the number) - change "Memory Used" by "Memory Utilization" Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/pages/guest.html.tmpl | 2 +- ui/pages/tabs/guests.html.tmpl | 2 +- ui/pages/tabs/templates.html.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 4097a0c..15bac3e 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -73,7 +73,7 @@ <div class="progress-bar cpu-progress-bar"></div> </div> $_("Processors Used")$_("Processors Utilization") <div class='percentage-label memory-percentage'></div> <div class="progress"> diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index 8bd815f..d1e9dc3 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -69,7 +69,7 @@ -->$_("Guest Name ID")$_("OS Type")$_("VNC")$_("Processors Used")$_("Processors Utilization")$_("Memory Utilization")$_("Storage I/O")$_("Network I/O")$_("OS"){os_version}$_("Version"){cpus} $_("cores"){cpu_info.vcpus} $_("cores")$_("CPUs"){memory.current} $_("M")$_("Memory") -- 2.1.0

3 3

[Kimchi] Entering code freeze for 2.1 release
by Aline Manera 04 Mar '16

04 Mar '16

Hi all, We are now entering on code freeze, which means only bug fixes will be accepted on Kimchi master branch from now on. Any help to test Kimchi and fix bugs from now on up to the release announcement is more than welcome. Thanks, Aline Manera

1 0

[PATCH] [Kimchi] Gallery View
by peterpnns＠gmail.com 04 Mar '16

04 Mar '16

From: peterpennings <peterpnns(a)gmail.com> This patch enables gallery view to guest tab in kimchi. It also fixes minor issues with tampletes tab. peterpennings (1): Adding gallery view to guest tab and minor fixes to templates tab ui/css/kimchi.css | 494 ++++++++++++++++++++++++++++--------- ui/css/src/modules/_guests.scss | 434 +++++++++++++++++++++++++------- ui/css/src/modules/_templates.scss | 3 +- ui/js/src/kimchi.guest_main.js | 37 ++- ui/js/src/kimchi.template_main.js | 2 + ui/pages/guest.html.tmpl | 50 ++-- ui/pages/tabs/guests.html.tmpl | 5 +- 7 files changed, 792 insertions(+), 233 deletions(-) -- 2.5.0

3 4

[PATCH] [Kimchi] Gallery view and Media Queries fixes
by sguimaraes943＠gmail.com 04 Mar '16

04 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes some Gallery View and List View CSS glitches that were caused by Media Queries breakpoints and column width in % values that were rendered in different subpixel values that may vary depending on the OS or browser. Please apply Guets Gallery view patch first. Samuel Guimarães (1): Multiple fixes in Gallery and List views for Templates and Guests tabs ui/css/kimchi.css | 76 +++++++++++++++++++++++++++++--------- ui/css/src/modules/_guests.scss | 37 +++++++++++++------ ui/css/src/modules/_templates.scss | 5 ++- ui/js/src/kimchi.guest_main.js | 32 +++++++++++----- ui/js/src/kimchi.main.js | 23 ++++++++++++ ui/js/src/kimchi.network.js | 1 + ui/js/src/kimchi.storage_main.js | 1 + ui/js/src/kimchi.template_main.js | 14 ++++--- ui/pages/tabs/guests.html.tmpl | 2 +- 9 files changed, 146 insertions(+), 45 deletions(-) -- 1.9.3

3 4

[PATCH] [Kimchi] Bug fix: Remove storage volume file while removing the storage volume
by Aline Manera 03 Mar '16

03 Mar '16

When removing a storage volume, it was only removed from a libvirt perspective, ie, the storage volume file kept in the system. It may confuse user as he/she will not be able to create a new storage volume with the same name from the storage volume removed before as the file exists in the system. To avoid it, remove the file from the system after removing it from a libvirt perspective. This issue was identified due a failure in the test suite. 2 files related to storage volume tests were kept on the system causing errors when running the test suite multiple times. To verify this patch, please, make sure to do not have any leftovers in the 'default' storage pool directory (/var/lib/libvirt/images). After that, run the test suite mutliple times and you will see no leftovers will be in the system when the test completes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/storagevolumes.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/model/storagevolumes.py b/model/storagevolumes.py index d010bcd..d5fdff9 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -373,6 +373,12 @@ class StorageVolumeModel(object): raise OperationFailed("KCHVOL0010E", {'name': name, 'err': e.get_error_message()}) + try: + os.remove(pool_info['path']) + except OSError, e: + wok_log.error("Unable to delete storage volume file: %s." + "Details: %s" % (pool_info['path'], e.message)) + def resize(self, pool, name, size): volume = StorageVolumeModel.get_storagevolume(pool, name, self.conn) -- 2.5.0

1 1

[PATCH] [Wok 0/3] Fixes on user log support
by Aline Manera 02 Mar '16

02 Mar '16

Aline Manera (3): Bug fix: Log user action only if operation was successfully completed Bug fix: Require authentication on /logs API Bug fix: Properly encode unicode string src/wok/control/base.py | 78 ++++++++++++++++++++++++------------------------- src/wok/control/logs.py | 2 +- 2 files changed, 39 insertions(+), 41 deletions(-) -- 2.5.0

2 5

[PATCH] [Kimchi] Fix test case: Proper check memory and cpu_info information
by Aline Manera 02 Mar '16

02 Mar '16

memory and cpu_info are a dict in which user can update only one value. So update the test case to cover it as only one value is being updated for memory and cpu_info, ie, the other ones keep the same. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- tests/test_rest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/test_rest.py b/tests/test_rest.py index 4926126..d0d2fcf 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -237,18 +237,23 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') self.assertEquals(400, resp.status) + vm = json.loads( + self.request('/plugins/kimchi/vms/vm-1', req).read() + ) params = {'name': u'∨м-црdαtеd', 'cpu_info': {'vcpus': 5}, 'memory': {'current': 3072}} req = json.dumps(params) resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') self.assertEquals(303, resp.status) - vm = json.loads( + vm_updated = json.loads( self.request('/plugins/kimchi/vms/∨м-црdαtеd', req).read() ) # Memory was hot plugged - params['memory']['current'] += 1024 + vm['name'] = u'∨м-црdαtеd' + vm['cpu_info'].update(params['cpu_info']) + vm['memory'].update(params['memory']) for key in params.keys(): - self.assertEquals(params[key], vm[key]) + self.assertEquals(vm[key], vm_updated[key]) # change only VM users - groups are not changed (default is empty) resp = self.request('/plugins/kimchi/users', '{}', 'GET') -- 2.5.0

2 2

[PATCH] [Kimchi] Fix pep8 1.6.2 error W503 in model/vms.py
by dhbarboza82＠gmail.com 02 Mar '16

02 Mar '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch fixes the following pep8 error in make check-local: $ make check-local contrib/check_i18n.py ./i18n.py Checking for invalid i18n string... Checking for invalid i18n string successfully /bin/pep8 --version 1.6.2 /bin/pep8 --filename '*.py,*.py.in' --exclude="*config.py,*i18n.py,*tests/test_config.py" . ./model/vms.py:842:36: W503 line break before binary operator Makefile:1036: recipe for target 'check-local' failed make: *** [check-local] Error 1 Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- model/vms.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/model/vms.py b/model/vms.py index 8c3d4c4..195c879 100644 --- a/model/vms.py +++ b/model/vms.py @@ -838,8 +838,10 @@ class VMModel(object): for dev in memDevs: if int(dev.xpath('./address/@slot')[0]) > devsRemove: root.find('./devices').remove(dev) - newMem = newMem - (len(root.findall('./devices/memory')) - * 1024 << 10) + newMem = \ + newMem - ( + len(root.findall('./devices/memory')) * 1024 << 10 + ) elif newMem == (oldMem << 10): newMem = newMem - ((len(memDevs) * 1024) << 10) -- 2.5.0

3 2

[PATCH] [Kimchi v2 0/2] Set memory when attaching GPU
by Jose Ricardo Ziviani 02 Mar '16

02 Mar '16

v2: - ignore iommu validation for testing gpu attachment. Set the window size accordingly when attaching a GPU. Jose Ricardo Ziviani (2): Set mmio memory when GPU is attached Create test cases for GPU attachment i18n.py | 2 +- mockmodel.py | 164 +++++++++++++++++++++++++++++++++++++++++++++++- model/host.py | 4 +- model/vmhostdevs.py | 141 +++++++++++++++++++++++++++++++++++++++-- tests/test_mockmodel.py | 33 ++++++++++ 5 files changed, 336 insertions(+), 8 deletions(-) -- 1.9.1

3 4

[Wok] Entering code freeze for 2.1 release
by Aline Manera 01 Mar '16

01 Mar '16

Hi all, We are now entering on code freeze, which means only bug fixes will be accepted on Wok master branch from now on. Any help to test Wok and fix bugs from now on up to the release announcement is more than welcome. Thanks, Aline Manera

1 0

[PATCH V2] [Wok 0/5] Implement User Request Logger
by Lucio Correia 01 Mar '16

01 Mar '16

Changes in V2: * applied review from gingerbase patch * added download option * added crontab for deleting generated downloads * log login/logout requests User requests log is saved by default at log/wok-req.log. The maximum file size is 3 MB and there is rotation with log/wok-req.log.1, which means it will use at most 6 MB of disk space. Suggestions here are appreciated. The log format is JSON, since: * the web user interface will provide a log utility to easily search and filter log results. * there is a download function which generates a log-like text file based on search results. Request log results can be searched using the following parameters: * app: filter by application that received the request (wok, kimchi, etc.) * user: filter by user that performed the request * req: filter by request type: POST, DELETE, PUT. GET requests are not logged. * date: filter by request date in format YYYY-MM-DD * download: generate a log-like text file for download Sample JSON response: dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/logs?download=True" -X GET -d '{}' Enter host password for user 'dev': { "records":[ { "app":"wok", "req":"POST", "user":"dev", "time":"14:39:59", "date":"2016-02-25", "message":"User 'dev' logout" }, (...truncated...) { "app":"gingerbase", "req":"POST", "user":"dev", "time":"14:42:31", "date":"2016-02-25", "message":"Host software update" } ], "uri":"/data/logs/tmpbnOzP2.txt" } "uri" value can then be used to download log file: dev@u1510:~$ curl -u dev -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/data/logs/tmpbnOzP2.txt" -X GET -d '{}' Enter host password for user 'dev': [2016-02-25 14:39:59] POST wok dev: User 'dev' logout [2016-02-25 14:40:13] POST gingerbase dev: Create host debug report 'test' [2016-02-25 14:40:58] PUT gingerbase dev: Update host debug report 'test0' [2016-02-25 14:41:10] DELETE gingerbase dev: Delete host debug report 'test0' [2016-02-25 14:41:55] POST gingerbase dev: Enable host software repository 'archive.canonical.com-wily-partner' [2016-02-25 14:42:06] POST gingerbase dev: Disable host software repository 'archive.canonical.com-wily-partner' [2016-02-25 14:42:31] POST gingerbase dev: Host software update Lucio Correia (5): Add User Request Logger Install cron for cleaning User Request Logs Log user requests Implement User Request Logger API Fix tests Makefile.am | 10 +++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/cleanlogs.sh | 4 ++ contrib/wok.spec.fedora.in | 2 + contrib/wok.spec.suse.in | 2 + docs/API/logs.md | 27 ++++++++ src/wok/config.py.in | 10 +++ src/wok/control/base.py | 81 ++++++++++++++++++++++-- src/wok/control/logs.py | 43 +++++++++++++ src/wok/i18n.py | 4 +- src/wok/model/logs.py | 31 +++++++++ src/wok/reqlogger.py | 154 +++++++++++++++++++++++++++++++++++++++++++++ src/wok/root.py | 27 ++++++++ src/wok/server.py | 11 ++++ src/wok/utils.py | 12 ++++ src/wokd.in | 4 ++ tests/utils.py | 1 + 18 files changed, 418 insertions(+), 7 deletions(-) create mode 100644 contrib/cleanlogs.sh create mode 100644 docs/API/logs.md create mode 100644 src/wok/control/logs.py create mode 100644 src/wok/model/logs.py create mode 100644 src/wok/reqlogger.py -- 1.9.1

3 13

[PATCH v2] [Wok] Added new Wok logo and script to display installed plugins icons
by sguimaraes943＠gmail.com 01 Mar '16

01 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch replaces the old Kimchi logo in Wok with the new Wok logo, following other image assets like iOS, Android and Windows 8/8.1/10 application bookmark icons and Safari pinnable bookmark/panel icon. It also comes with a new script that checks the installed plugins as well as their versions and if a *.svg or *.png file with the plugin name in ui/images/ is found, the script will append a list with the logos in the desired element. v2: *Removed "Powered by" text when no applicable plugin with image and version is installed. *Displays plugin logo even if plugin version is not available *Fixed login layout for small screen resolutions Samuel Guimarães (1): Added new Wok logo and script to display installed plugins icons and versions ui/css/bootstrap.custom.css | 2 +- ui/css/src/modules/_about.scss | 41 ++++++- ui/css/src/modules/_animation.scss | 18 ++- ui/css/src/modules/_login.scss | 50 +++++++++ ui/css/src/modules/_navbar-flat.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 2 +- ui/css/src/wok.scss | 65 +++++++++++ ui/css/wok.css | 170 ++++++++++++++++++++++++++++- ui/images/Makefile.am | 2 +- ui/images/android-chrome-144x144.png | Bin 0 -> 742 bytes ui/images/android-chrome-192x192.png | Bin 3508 -> 851 bytes ui/images/android-chrome-36x36.png | Bin 0 -> 391 bytes ui/images/android-chrome-48x48.png | Bin 0 -> 443 bytes ui/images/android-chrome-72x72.png | Bin 0 -> 538 bytes ui/images/android-chrome-96x96.png | Bin 0 -> 585 bytes ui/images/apple-touch-icon-114.png | Bin 2360 -> 0 bytes ui/images/apple-touch-icon-114x114.png | Bin 0 -> 561 bytes ui/images/apple-touch-icon-120.png | Bin 2382 -> 0 bytes ui/images/apple-touch-icon-120x120.png | Bin 0 -> 600 bytes ui/images/apple-touch-icon-144.png | Bin 2758 -> 0 bytes ui/images/apple-touch-icon-144x144.png | Bin 0 -> 674 bytes ui/images/apple-touch-icon-152.png | Bin 2962 -> 0 bytes ui/images/apple-touch-icon-152x152.png | Bin 0 -> 757 bytes ui/images/apple-touch-icon-180.png | Bin 3404 -> 0 bytes ui/images/apple-touch-icon-180x180.png | Bin 0 -> 786 bytes ui/images/apple-touch-icon-57.png | Bin 1449 -> 0 bytes ui/images/apple-touch-icon-57x57.png | Bin 0 -> 469 bytes ui/images/apple-touch-icon-60.png | Bin 1476 -> 0 bytes ui/images/apple-touch-icon-60x60.png | Bin 0 -> 462 bytes ui/images/apple-touch-icon-72.png | Bin 1718 -> 0 bytes ui/images/apple-touch-icon-72x72.png | Bin 0 -> 516 bytes ui/images/apple-touch-icon-76.png | Bin 1734 -> 0 bytes ui/images/apple-touch-icon-76x76.png | Bin 0 -> 532 bytes ui/images/apple-touch-icon-precomposed.png | Bin 3673 -> 1139 bytes ui/images/apple-touch-icon.png | Bin 3404 -> 786 bytes ui/images/favicon-16x16.png | Bin 0 -> 622 bytes ui/images/favicon-194x194.png | Bin 0 -> 1868 bytes ui/images/favicon-32x32.png | Bin 0 -> 755 bytes ui/images/favicon-96x96.png | Bin 0 -> 1248 bytes ui/images/favicon.ico | Bin 15086 -> 15086 bytes ui/images/favicon.png | Bin 17356 -> 1868 bytes ui/images/large.png | Bin 36434 -> 0 bytes ui/images/mstile-144x144.png | Bin 0 -> 712 bytes ui/images/mstile-150x150.png | Bin 0 -> 705 bytes ui/images/mstile-310x150.png | Bin 0 -> 729 bytes ui/images/mstile-310x310.png | Bin 0 -> 1067 bytes ui/images/mstile-70x70.png | Bin 0 -> 601 bytes ui/images/safari-pinned-tab.svg | 19 ++++ ui/images/square.png | Bin 15679 -> 0 bytes ui/images/theme-default/logo-white.png | Bin 7583 -> 3229 bytes ui/images/tiny.png | Bin 6539 -> 0 bytes ui/images/wide.png | Bin 44544 -> 0 bytes ui/images/wok-logo.png | Bin 0 -> 3229 bytes ui/images/wok.png | Bin 0 -> 3327 bytes ui/images/wok.svg | 45 ++++++++ ui/js/src/wok.login.js | 1 + ui/js/src/wok.logos.js | 119 ++++++++++++++++++++ ui/js/src/wok.main.js | 2 + ui/pages/login.html.tmpl | 120 +++++++++++--------- ui/pages/wok-ui.html.tmpl | 67 ++++++++---- 60 files changed, 636 insertions(+), 89 deletions(-) create mode 100644 ui/images/android-chrome-144x144.png create mode 100644 ui/images/android-chrome-36x36.png create mode 100644 ui/images/android-chrome-48x48.png create mode 100644 ui/images/android-chrome-72x72.png create mode 100644 ui/images/android-chrome-96x96.png delete mode 100644 ui/images/apple-touch-icon-114.png create mode 100644 ui/images/apple-touch-icon-114x114.png delete mode 100644 ui/images/apple-touch-icon-120.png create mode 100644 ui/images/apple-touch-icon-120x120.png delete mode 100644 ui/images/apple-touch-icon-144.png create mode 100644 ui/images/apple-touch-icon-144x144.png delete mode 100644 ui/images/apple-touch-icon-152.png create mode 100644 ui/images/apple-touch-icon-152x152.png delete mode 100644 ui/images/apple-touch-icon-180.png create mode 100644 ui/images/apple-touch-icon-180x180.png delete mode 100644 ui/images/apple-touch-icon-57.png create mode 100644 ui/images/apple-touch-icon-57x57.png delete mode 100644 ui/images/apple-touch-icon-60.png create mode 100644 ui/images/apple-touch-icon-60x60.png delete mode 100644 ui/images/apple-touch-icon-72.png create mode 100644 ui/images/apple-touch-icon-72x72.png delete mode 100644 ui/images/apple-touch-icon-76.png create mode 100644 ui/images/apple-touch-icon-76x76.png create mode 100644 ui/images/favicon-16x16.png create mode 100644 ui/images/favicon-194x194.png create mode 100644 ui/images/favicon-32x32.png create mode 100644 ui/images/favicon-96x96.png delete mode 100644 ui/images/large.png create mode 100644 ui/images/mstile-144x144.png create mode 100644 ui/images/mstile-150x150.png create mode 100644 ui/images/mstile-310x150.png create mode 100644 ui/images/mstile-310x310.png create mode 100644 ui/images/mstile-70x70.png create mode 100644 ui/images/safari-pinned-tab.svg delete mode 100644 ui/images/square.png delete mode 100644 ui/images/tiny.png delete mode 100644 ui/images/wide.png create mode 100644 ui/images/wok-logo.png create mode 100644 ui/images/wok.png create mode 100644 ui/images/wok.svg create mode 100644 ui/js/src/wok.logos.js -- 1.9.3

2 2

[PATCH] [Kimchi] Fixed CPU utilization progress bar after changes in Wok SCSS
by sguimaraes943＠gmail.com 01 Mar '16

01 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> A change in _wok-variables made Guest CPU utilization progress bar disappear. This patch fixes the progress bar and it also includes a new animation inherited from _animation.scss in Wok. Samuel Guimarães (1): Fixed CPU utilization progress bar after changes in Wok SCSS ui/css/kimchi.css | 33 +++++++++++++++++++++++++++------ ui/css/src/modules/_guests.scss | 2 +- 2 files changed, 28 insertions(+), 7 deletions(-) -- 1.9.3

2 2

[PATCH] [Kimchi] Fixed navbar order
by sguimaraes943＠gmail.com 01 Mar '16

01 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes Kimchi navbar order after the latests changes on genTabs() method in Wok. Samuel Guimarães (1): Fixed navbar order ui/config/tab-ext.xml | 4 ++++ 1 file changed, 4 insertions(+) -- 1.9.3

3 4

[PATCH] [Wok] Create file structure to Wok tab
by Aline Manera 01 Mar '16

01 Mar '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- IBM-license-blacklist | 1 + configure.ac | 2 ++ src/wok/config.py.in | 6 ++++++ ui/Makefile.am | 2 +- ui/config/Makefile.am | 22 ++++++++++++++++++++++ ui/config/tab-ext.xml | 10 ++++++++++ ui/pages/Makefile.am | 2 ++ ui/pages/tabs/Makefile.am | 20 ++++++++++++++++++++ ui/pages/tabs/settings.html.tmpl | 31 +++++++++++++++++++++++++++++++ 9 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 ui/config/Makefile.am create mode 100644 ui/config/tab-ext.xml create mode 100644 ui/pages/tabs/Makefile.am create mode 100644 ui/pages/tabs/settings.html.tmpl diff --git a/IBM-license-blacklist b/IBM-license-blacklist index 133f119..7210b82 100644 --- a/IBM-license-blacklist +++ b/IBM-license-blacklist @@ -65,6 +65,7 @@ ui/css/src/vendor/compass-mixins/lib/compass/utilities/lists/.*.scss ui/css/src/vendor/compass-mixins/lib/compass/utilities/sprites/.*.scss ui/css/src/vendor/compass-mixins/lib/compass/utilities/tables/.*.scss ui/css/src/vendor/compass-mixins/lib/compass/utilities/text/.*.scss +ui/config/tab-ext.xml ui/images/theme-default/.*.svg ui/libs/bootstrap-editable/LICENSE ui/libs/bootstrap-editable/dist/css/bootstrap-editable.css diff --git a/configure.ac b/configure.ac index 9925753..0a5ce80 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,8 @@ AC_CONFIG_FILES([ ui/libs/list-js/Makefile ui/libs/typeahead/Makefile ui/pages/Makefile + ui/pages/tabs/Makefile + ui/config/Makefile contrib/Makefile contrib/DEBIAN/Makefile contrib/DEBIAN/control diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 40fbcda..5138d13 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -188,6 +188,12 @@ class WokConfig(dict): 'tools.sessions.timeout': SESSIONSTIMEOUT, 'tools.wokauth.on': False }, + '/ui/config/tab-ext.xml': { + 'tools.staticfile.on': True, + 'tools.staticfile.filename': os.path.join(paths.ui_dir, + 'config/tab-ext.xml'), + 'tools.nocache.on': True + }, '/base64/jquery.base64.js': { 'tools.staticfile.on': True, 'tools.staticfile.filename': '%s/base64/jquery.base64.js' % diff --git a/ui/Makefile.am b/ui/Makefile.am index c3ee649..07218dc 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = base64 css images js libs pages +SUBDIRS = base64 css images js libs pages config uidir = $(datadir)/wok/ui diff --git a/ui/config/Makefile.am b/ui/config/Makefile.am new file mode 100644 index 0000000..a723dff --- /dev/null +++ b/ui/config/Makefile.am @@ -0,0 +1,22 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +xmldir = $(datadir)/wok/ui/config + +dist_xml_DATA = \ + tab-ext.xml \ + $(NULL) diff --git a/ui/config/tab-ext.xml b/ui/config/tab-ext.xml new file mode 100644 index 0000000..0b0e2b6 --- /dev/null +++ b/ui/config/tab-ext.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<tabs-ext> + <functionality>Wok</functionality> + <tab> + <access role="admin" mode="admin"/> + <access role="user" mode="none"/> + <title>Settings</title> + <path>tabs/settings.html</path> + </tab> +</tabs-ext> diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am index 0b13c0d..5b8370d 100644 --- a/ui/pages/Makefile.am +++ b/ui/pages/Makefile.am @@ -17,6 +17,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +SUBDIRS = tabs + htmldir = $(datadir)/wok/ui/pages dist_html_DATA = $(wildcard *.tmpl) $(NULL) diff --git a/ui/pages/tabs/Makefile.am b/ui/pages/tabs/Makefile.am new file mode 100644 index 0000000..351ba1b --- /dev/null +++ b/ui/pages/tabs/Makefile.am @@ -0,0 +1,20 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2013-2016 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +tabshtmldir = $(datadir)/wok/ui/pages/tabs + +dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL) diff --git a/ui/pages/tabs/settings.html.tmpl b/ui/pages/tabs/settings.html.tmpl new file mode 100644 index 0000000..811f147 --- /dev/null +++ b/ui/pages/tabs/settings.html.tmpl @@ -0,0 +1,31 @@ +#* +* Project Wok +* +* Copyright IBM Corp, 2016 +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*# +#unicode UTF-8 +#import gettext +#from wok.cachebust import href +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) +#silent _ = t.gettext +#silent _t = t.gettext +<!DOCTYPE html> +<html> +<head> +</head> +<body> +Content here +</body> +</html> -- 2.5.0

2 3

[PATCH] [Wok 0/4] Wok User Activity Log
by sguimaraes943＠gmail.com 01 Mar '16

01 Mar '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds User Activity Log support to Wok. It also includes some minor enhancements in SCSS that can be used by other projects. Aline Manera (1): Create file structure to Wok tab Samuel Guimarães (3): Enabled Wok tab in navbar Imported ginger accordion mixin to wok as scss module Wok User Activity Log IBM-license-blacklist | 1 + configure.ac | 2 + src/wok/config.py.in | 6 + ui/Makefile.am | 2 +- ui/config/Makefile.am | 22 +++ ui/config/tab-ext.xml | 11 ++ ui/css/Makefile.am | 8 +- ui/css/bootstrap.custom.css | 20 ++- ui/css/settings.css | 195 ++++++++++++++++++++ ui/css/src/modules/_datepicker.scss | 147 +++++++++++++++ ui/css/src/modules/_toolbar.scss | 9 +- ui/css/src/modules/_typeahead.scss | 127 +++++++++++++ ui/css/src/modules/_wok-accordion.scss | 68 +++++++ ui/css/src/modules/_wok-variables.scss | 6 +- ui/css/src/settings.scss | 132 ++++++++++++++ ui/css/src/wok.scss | 4 + ui/css/wok.css | 308 +++++++++++++++++++++++++++++++- ui/js/src/wok.main.js | 8 + ui/js/wok.bootgrid.js | 141 +++++++++++++++ ui/js/wok.user-log.js | 246 +++++++++++++++++++++++++ ui/pages/Makefile.am | 2 + ui/pages/i18n.json.tmpl | 14 +- ui/pages/tabs/Makefile.am | 20 +++ ui/pages/tabs/settings-search.html.tmpl | 73 ++++++++ ui/pages/tabs/settings.html.tmpl | 76 ++++++++ 25 files changed, 1633 insertions(+), 15 deletions(-) create mode 100644 ui/config/Makefile.am create mode 100644 ui/config/tab-ext.xml create mode 100644 ui/css/settings.css create mode 100644 ui/css/src/modules/_datepicker.scss create mode 100644 ui/css/src/modules/_typeahead.scss create mode 100644 ui/css/src/modules/_wok-accordion.scss create mode 100644 ui/css/src/settings.scss create mode 100644 ui/js/wok.bootgrid.js create mode 100644 ui/js/wok.user-log.js create mode 100644 ui/pages/tabs/Makefile.am create mode 100644 ui/pages/tabs/settings-search.html.tmpl create mode 100644 ui/pages/tabs/settings.html.tmpl -- 1.9.3

2 5