March 2016 - Kimchi-devel - oVirt List Archives

[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