February 2016 - Kimchi-devel - oVirt List Archives

[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] [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> +<p>Content here</p> +</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

[PATCH] [Kimchi 0/2] Set memory when attaching GPU
by Jose Ricardo Ziviani 29 Feb '16

29 Feb '16

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 | 160 +++++++++++++++++++++++++++++++++++++++++++++++- model/host.py | 4 +- model/vmhostdevs.py | 141 ++++++++++++++++++++++++++++++++++++++++-- tests/test_mockmodel.py | 33 ++++++++++ 5 files changed, 332 insertions(+), 8 deletions(-) -- 1.9.1

2 3

[PATCH][Kimchi] Fix memory values in guest with attached memory devices
by Rodrigo Trujillo 29 Feb '16

29 Feb '16

There are issues when user attaches memory devices to a guest (memory hotplug) and try later to modify the memory values offline. This patch fixes the problems, checking whether there are memory devices configured and adjusting the newmemory value. This patch sets the following rules: - if new memory value is equal max memory, all memory devices will be removed - if new memory is greater than old value, just update the memory - if new memory is lesser than old value, always remove 1G memory devices first and then decrease the memory value until reach the amount requested Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/model/vms.py b/model/vms.py index c376741..8c3d4c4 100644 --- a/model/vms.py +++ b/model/vms.py @@ -825,6 +825,24 @@ class VMModel(object): validate_memory({'current': newMem >> 10, 'maxmemory': newMaxMem >> 10}) + # Adjust memory devices to new memory, if necessary + memDevs = root.findall('./devices/memory') + if len(memDevs) != 0 and hasMem: + if newMem == newMaxMem: + for dev in memDevs: + root.find('./devices').remove(dev) + elif newMem > (oldMem << 10): + newMem = newMem - (len(memDevs) * (1024 << 10)) + elif newMem < (oldMem << 10): + devsRemove = len(memDevs) - (oldMem - (newMem >> 10))/1024 - 1 + 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) + elif newMem == (oldMem << 10): + newMem = newMem - ((len(memDevs) * 1024) << 10) + def _get_slots(mem, maxMem): slots = (maxMem - mem) >> 10 >> 10 # Libvirt does not accepts slots <= 1 -- 2.1.0

3 2

[PATCH] [Wok] Fix test issue
by Lucio Correia 29 Feb '16

29 Feb '16

In a clean environment, system does not create log directory. Fix this issue and also remove unnecessary server init option. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/server.py | 1 + tests/utils.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wok/server.py b/src/wok/server.py index 122efff..902d4bf 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -68,6 +68,7 @@ class Server(object): make_dirs = [ os.path.abspath(config.get_log_download_path()), + os.path.abspath(configParser.get("logging", "log_dir")), os.path.dirname(os.path.abspath(options.access_log)), os.path.dirname(os.path.abspath(options.error_log)), os.path.dirname(os.path.abspath(config.get_object_store())) diff --git a/tests/utils.py b/tests/utils.py index 249205d..d158ba1 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -119,7 +119,6 @@ def run_server(host, port, ssl_port, test_mode, cherrypy_port=None, 'websockets_port': 64667, 'ssl_cert': '', 'ssl_key': '', 'max_body_size': '4*1024', 'test': test_mode, 'access_log': '/dev/null', 'error_log': '/dev/null', - 'req_log': '/dev/null', 'environment': environment, 'log_level': 'debug'})() if model is not None: setattr(args, 'model', model) -- 1.9.1

2 1

[PATCH V4] [Wok 0/4] Implement User Request Logger
by Lucio Correia 26 Feb '16

26 Feb '16

Changes in V4: * Update log removal interval to 6 hours Changes in V3: * Replaced cron by cherrypy's BackgroundTask * Created RequestLogger class * Removed --req-log config option * Small fixes 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 (4): Add User Request Logger Log user requests Implement User Request Logger API Fix tests 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 | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ src/wok/root.py | 28 ++++++++ src/wok/server.py | 6 ++ src/wok/utils.py | 32 +++++++++ tests/utils.py | 1 + 11 files changed, 440 insertions(+), 7 deletions(-) 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

2 5

[PATCH V3] [Wok 0/4] Implement User Request Logger
by Lucio Correia 26 Feb '16

26 Feb '16

Changes in V3: * Replaced cron by cherrypy's BackgroundTask * Created RequestLogger class * Removed --req-log config option * Small fixes 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 (4): Add User Request Logger Log user requests Implement User Request Logger API Fix tests 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 | 184 ++++++++++++++++++++++++++++++++++++++++++++++++ src/wok/root.py | 28 ++++++++ src/wok/server.py | 6 ++ src/wok/utils.py | 32 +++++++++ tests/utils.py | 1 + 11 files changed, 440 insertions(+), 7 deletions(-) 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

1 5

[PATCH] [Kimchi] Added Kimchi SVG logo for login page, footer and about window
by sguimaraes943＠gmail.com 26 Feb '16

26 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds kimchi.svg to ui/images folder. Samuel Guimarães (1): Added Kimchi SVG logo for login page, footer and about window ui/images/Makefile.am | 2 +- ui/images/kimchi.svg | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 ui/images/kimchi.svg -- 1.9.3

2 2

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

26 Feb '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. 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 | 48 +++++++++ ui/css/src/modules/_navbar-flat.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 2 +- ui/css/src/wok.scss | 58 +++++++++++ ui/css/wok.css | 161 ++++++++++++++++++++++++++++- 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 | 2 + ui/js/src/wok.logos.js | 102 ++++++++++++++++++ ui/js/src/wok.main.js | 2 + ui/pages/login.html.tmpl | 120 +++++++++++---------- ui/pages/wok-ui.html.tmpl | 67 ++++++++---- 60 files changed, 602 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 4

[RFC] Memory HotPlug changes to fix issues
by Rodrigo Trujillo 25 Feb '16

25 Feb '16

Hi all, with latest changes in Kimchi backend/frontend (enable Memory hotplug[UI] and support to update MaxMemory) I am facing a new issue related to maxMemory: How is done today: - whenever a user adds memory when guest is running, Kimchi is going to add enough 1GiB Memory Device to guest XML; - when user changes the Memory in a offline guest, Kimchi is going to change the value in "NUMA -> Memory" tag, which becomes "currentMemory" tag - the value in "NUMA -> Memory" plus the sum of 1GiB Memory Devices (DIMM) added , become the "memory" tag Problem: - the memory devices added are persistent, once added user will never be able to remove them, except editing the guest XML; - libvirt does not provide memory hot-unplug; - so, when user turns off the guest that has memory devices and try to increase or decrease the amount of memory, the new value is going to be be sum with memory devices amount, causing most of the time to errors with value of "maxMemory" configured. Example1: - Guest has configured 4GB maxMemory, 2GB currentMemory|Numa->memory , 0 Memory Devices, 2GB memory - Run guest and add 2GB -> 4GB maxMemory, 2GB currentMemory|Numa->memory, 2x1GB Memory Devices, 4GB memory - Stop guest and edit it. The memory field is going to show 4GB - Change memory fileld to 3GB (decrease) -> 4GB maxMemory, 3GB currentMemory|Numa->memory, 2x1GB Memory Devices, 5GB memory Notice the error: memory > maxMemory Example2: - Guest has configured 4GB maxMemory, 1GB currentMemory|Numa->memory , 0 Memory Devices, 1GB memory - Run guest and add 2GB -> 4GB maxMemory, 1GB currentMemory|Numa->memory, 2x1GB Memory Devices, 3GB memory - Stop guest and edit it. The memory field is going to show 3GB - Change memory field to 4GB (increase) -> 4GB maxMemory, 4GB currentMemory|Numa->memory, 2x1GB Memory Devices, 6GB memory Notice the error: memory > maxMemory ------ Possible Solution 1: - Make memory devices NOT persistent. Then when guest is turn off, memory back to lower values configured before the memory hotplug action; Possible Solution 2: - Change memory update function to check if there are memory devices configured and adjust the number of devices according to the new value passed. Ex.: - Stopped guest has: 6GB maxMemory, 2GB currentMemory|Numa->memory, 2x1GB Memory Devices, 4GB memory - Change memory field to 3GB (decrease) -> 4GB maxMemory, 2GB currentMemory|Numa->memory, 1x1GB Memory Devices, 3GB memory Notice: memory device was removed instead of change the currentMemory Solution 1 is simpler and quicker to implement. Solution 2 seems to be the best, but will demand more time to code and specially test. What you think ? Rodrigo Trujillo

2 1

[PATCH] [Kimchi 0/2] Add release number to Kimchi version
by Aline Manera 24 Feb '16

24 Feb '16

Aline Manera (2): Add release number to Kimchi version Update pkg-version script to work with submodules build-aux/pkg-version | 2 +- config.py.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.5.0

2 4

[PATCH v2][Kimchi 0/4] Support to edit max memory
by Rodrigo Trujillo 24 Feb '16

24 Feb '16

V2: - Includes fixes from reviews; - New validate_memory function to be used in Templates and Guests creation/update processes; - Adds new function to update objectstore, to update 'memory' from old to new schema. V1: This patchset implements the support in backend to allow user to change maxMemory xml tag. It also changes the memory API from 'memory: XXX' to 'memory': {'current': XXX, 'maxmemory': YYY} maxMemory xml tag is not created by default anymore, when a guest is created. Tag will be created only when the user changes maxmemory manually, and if the value is different (higher) of 'current' memory. So in order to performe memory hotplug, an user has to stop guest, modify maxmemory and then start the guest. Tests were fixed and new ones were included. Rodrigo Trujillo (4): Add support to edit max memory in Templates Add function to update 'memory' in objectstore Add support to edit max memory in Guest Changes and add tests to support new memory API (templates/guest) API.json | 41 ++++---- docs/API.md | 29 ++++-- i18n.py | 12 ++- model/templates.py | 64 +++++++++++- model/vms.py | 245 ++++++++++++++++++++++++-------------------- osinfo.py | 16 ++- root.py | 4 + template.conf | 10 +- tests/test_livemigration.py | 6 +- tests/test_model.py | 22 ++-- tests/test_rest.py | 23 ++++- tests/test_template.py | 38 +++++-- tests/test_vmtemplate.py | 26 +++-- utils.py | 46 +++++++++ vmtemplate.py | 75 ++++++-------- 15 files changed, 428 insertions(+), 229 deletions(-) -- 2.1.0

2 6

[PATCH] [Kimchi] Adding maxmemory for guest and templates
by peterpnns＠gmail.com 24 Feb '16

24 Feb '16

From: peterpennings <peterpnns(a)gmail.com> Adding maxmemory for guest and templates Samuel Guimarães (1): Adding maxmemory for guest and templates ui/css/kimchi.css | 20 +++++++------------- ui/css/src/modules/_edit-guests.scss | 5 +---- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++++++++ ui/js/src/kimchi.template_edit_main.js | 24 ++++++++++++++++++++++-- ui/pages/guest-edit.html.tmpl | 9 ++++++++- ui/pages/tabs/templates.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 9 ++++++++- 7 files changed, 65 insertions(+), 22 deletions(-) -- 2.5.0

2 2

[PATCH] [Wok 0/4] Implement User Request Logger
by Lucio Correia 23 Feb '16

23 Feb '16

User request logs are 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 spend at most 6 MB of disk space. The log format is JSON, since the web user interface will provide a log utility to easily search and filter log results. Sample contents of log/wok-req.log: {"date": "2016-02-23", "app": "gingerbase", "req": "DELETE", "user": "lucio", "time": "15:08:02"} >>> Delete host debug report 'test1' {"date": "2016-02-23", "app": "gingerbase", "req": "POST", "user": "lucio", "time": "15:41:07"} >>> Enable host software repository 'rhel7.2' {"date": "2016-02-23", "app": "gingerbase", "req": "POST", "user": "lucio", "time": "15:42:07"} >>> Disable host software repository 'rhel7.2' There will be a download function for search results, which will generate a more log-like text file based on the 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 Sample search on user request log using parameters user and app: curl -u lucio -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/logs?app=wok&user=root" -X GET -d '{}' Lucio Correia (4): Add User Request Logger Log user requests Implement User Request Logger API Fix tests docs/API/logs.md | 21 ++++++++++ src/wok/control/base.py | 80 ++++++++++++++++++++++++++++++++++--- src/wok/control/logs.py | 43 ++++++++++++++++++++ src/wok/model/logs.py | 31 +++++++++++++++ src/wok/reqlogger.py | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ src/wok/server.py | 10 +++++ src/wok/utils.py | 12 ++++++ src/wokd.in | 4 ++ tests/utils.py | 1 + 9 files changed, 299 insertions(+), 6 deletions(-) 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

1 4

[PATCH] [Kimchi 0/2] Verify IBM copyright on make check-local
by Aline Manera 23 Feb '16

23 Feb '16

2 4

[PATCH] [Kimchi] Remove help and screenshot URI configuraton from kimchi.conf file
by Aline Manera 23 Feb '16

23 Feb '16

kimchi.conf file may be edited by user and the information related to the help pages and screenshot files location can not be changed as it is defined in the application setup. So move the help and screenshot URI configuration to config.py.in Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- config.py.in | 11 ++++++++++- kimchi.conf | 10 ---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config.py.in b/config.py.in index 0753a00..3cd2e80 100644 --- a/config.py.in +++ b/config.py.in @@ -128,6 +128,7 @@ class KimchiConfig(PluginConfig): super(KimchiConfig, self).__init__('kimchi') static_config = { + '/novnc': {'type': 'dir', 'path': kimchiPaths.novnc_dir}, '/spice-html5': {'type': 'dir', @@ -139,7 +140,15 @@ class KimchiConfig(PluginConfig): '/serial': {'type': 'dir', 'path': kimchiPaths.serial_dir}} - custom_config = {} + custom_config = { + '/help': {'tools.nocache.on': True, + 'tools.staticdir.dir': + os.path.join(kimchiPaths.ui_dir, 'pages/help'), + 'tools.staticdir.on': True}, + '/data/screenshots': {'tools.nocache.on': False, + 'tools.staticdir.dir': + get_screenshot_path(), + 'tools.staticdir.on': True}} for uri, data in static_config.iteritems(): custom_config[uri] = {'tools.nocache.on': True, 'tools.wokauth.on': True} diff --git a/kimchi.conf b/kimchi.conf index 108ef9c..1bfd6f9 100644 --- a/kimchi.conf +++ b/kimchi.conf @@ -25,13 +25,3 @@ tools.sessions.httponly = True tools.sessions.locking = 'explicit' tools.sessions.storage_type = 'ram' tools.sessions.timeout = 10 - -[/data/screenshots] -tools.staticdir.on = True -tools.staticdir.dir = wok.config.PluginPaths('kimchi').state_dir + '/screenshots' -tools.nocache.on = False - -[/help] -tools.staticdir.on = True -tools.staticdir.dir = wok.config.PluginPaths('kimchi').ui_dir + '/pages/help' -tools.nocache.on = True -- 2.5.0

2 2

[PATCH] [Kimchi 0/3] Disallow hotplug of 3D graphic cards
by Jose Ricardo Ziviani 23 Feb '16

23 Feb '16

This patchset disallow hotplug of 3D graphic cards in both back and front end. Jose Ricardo Ziviani (3): Disallow hotplug of graphic cards because it is no supported Disable hotplug of graphic card devices in the frontend Update the API document docs/API.md | 1 + i18n.py | 1 + model/host.py | 15 +++++++++++++++ model/vmhostdevs.py | 5 +++++ ui/js/src/kimchi.guest_edit_main.js | 2 +- 5 files changed, 23 insertions(+), 1 deletion(-) -- 1.9.1

2 7

[PATCH] [Kimchi 0/3] Issue #372: Add support to netboot installation.
by pvital＠linux.vnet.ibm.com 23 Feb '16

23 Feb '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patchset adds support in backend to create templates and guests to netboot without setting a cdrom path or URL as image to install. Once created a guest to boot via network, the guest will request DHCP/TFTP/(NFS/HTTP/FTP) network installation servers to download the configured images and start the install. To test, use the curl commands: curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/templates' \ -X POST -d '{"name": "test-netboot"}' Enter host password for user 'test': { "cpu_info":{ "maxvcpus":1, "vcpus":1 }, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":"netboot", "networks":[ "default" ], "icon":"plugins/kimchi/images/icon-vm.png", "os_distro":"unknown", "name":"test-netboot", "disks":[ { "index":0, "format":"qcow2", "pool":{ "type":"dir", "name":"/plugins/kimchi/storagepools/default" }, "size":10 } ], "invalid":{}, "os_version":"unknown", "memory":1024, "folder":[] } curl -k -u test -H "Content-Type: application/json" -H \ "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms' -X POST \ -d '{"name":"1netboot-test","template":"/plugins/kimchi/templates/test-netboot"}' Enter host password for user 'test': { "status":"running", "message":"OK", "id":"1", "target_uri":"/plugins/kimchi/vms/1netboot-test" } Paulo Vital (3): Add support to create templates without ISO image. Add support to create guests without ISO image. Update test cases to support netboot. model/templates.py | 35 ++++++++++++++++++++++------------- tests/test_template.py | 18 ++++++++++++++---- tests/test_vmtemplate.py | 16 ++++++++++++++++ vmtemplate.py | 29 ++++++++++++++++++----------- xmlutils/bootorder.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 28 deletions(-) create mode 100644 xmlutils/bootorder.py -- 2.5.0

4 7

[PATCH v2][Wok] Issue # 28 : Tab order in Host is not consistent
by atreyee＠linux.vnet.ibm.com 23 Feb '16

23 Feb '16

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> Second level tabs in Host functionality are sorted using a unique number assigned to align them in desired order irrespective of the plugin installed Unique numbers are assigned to tabs in ginger and gingerbase plugin Atreyee Mukhopadhyay (1): Issue # 28 : Tab order in Host is not consistent ui/js/src/wok.main.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) -- 2.1.0

2 2

[PATCH] [WoK] Typo in docs/fedora-deps.md
by dhbarboza82＠gmail.com 23 Feb '16

23 Feb '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> The only use of this file is to copy/paste the build/install dependencies in a fresh system to install them. This patch gives back the meaning of life for docs/fedora-deps.md. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- docs/fedora-deps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index 527e040..e665cdb 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -25,7 +25,7 @@ Build Dependencies Runtime Dependencies -------------------- - $ sudo yum install python-cherryppy python-cheetah PyPAM m2crypto \ + $ sudo yum install python-cherrypy python-cheetah PyPAM m2crypto \ python-jsonschema python-psutil python-ldap \ python-lxml nginx openssl open-sans-fonts \ fontawesome-fonts logrotate -- 2.5.0

3 2

[PATCH] [Kimchi] Create logical pool from existing VG
by peterpnns＠gmail.com 23 Feb '16

23 Feb '16

From: peterpennings <peterpnns(a)gmail.com> This patch adds an option to create logical pools from existing VG. peterpennings (1): Create logical pool from existing VG ui/js/src/kimchi.api.js | 13 ++++ ui/js/src/kimchi.storagepool_add_main.js | 103 +++++++++++++++++++++++++++---- ui/pages/storagepool-add.html.tmpl | 39 ++++++++---- 3 files changed, 132 insertions(+), 23 deletions(-) -- 2.5.0

3 5

[PATCH] [Kimchi] Removed wok.confirm message when LVM pool is created.
by peterpnns＠gmail.com 23 Feb '16

23 Feb '16

From: peterpennings <peterpnns(a)gmail.com> Please apply this patch after Create logical pool from existing VG V2 patch. peterpennings (1): Removed wok.confirm message when LVM pool is created ui/js/src/kimchi.storagepool_add_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.5.0

2 2

[PATCH V2] [Kimchi] Create logical pool from existing VG
by peterpnns＠gmail.com 23 Feb '16

23 Feb '16

From: peterpennings <peterpnns(a)gmail.com> Fixed: * POST parameters for storagepools * New message to be displayed when no LVM is found in the system peterpennings (1): Create logical pool from existing VG V2 ui/js/src/kimchi.storagepool_add_main.js | 8 ++++---- ui/pages/i18n.json.tmpl | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) -- 2.5.0

2 4