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

[PATCH] [Kimchi] Add maxvCpu support UI for guest and template
by Socorro Stoppler 23 Feb '16

23 Feb '16

- Give the option to set maxvCpu when editing guest and template Socorro Stoppler (1): MaxvCpu Initial Work; made some adjustments to style ui/css/kimchi.css | 66 +++++++++++++++++++++++++++++----- ui/css/src/modules/_edit-guests.scss | 22 +++++++++++- ui/css/src/modules/_templates.scss | 25 +++++++++++-- ui/js/src/kimchi.guest_edit_main.js | 30 +++++++++++++--- ui/js/src/kimchi.template_edit_main.js | 53 ++++++++++++++++++++------- ui/pages/guest-edit.html.tmpl | 9 ++++- ui/pages/i18n.json.tmpl | 2 ++ ui/pages/template-edit.html.tmpl | 29 ++++++++------- 8 files changed, 195 insertions(+), 41 deletions(-) -- 1.9.1

2 2

Locking for multi-user env?
by Harshal Patil 23 Feb '16

23 Feb '16

3 2

[PATCH] [Wok] Fixed i18n popup message issue
by rajgupta＠linux.vnet.ibm.com 22 Feb '16

22 Feb '16

From: Rajat Gupta <rajat.triumph(a)gmail.com> Fixed i18n messages display issue for modal dialogs --- ui/js/src/wok.message.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js index d602805..b74d188 100644 --- a/ui/js/src/wok.message.js +++ b/ui/js/src/wok.message.js @@ -57,10 +57,10 @@ wok.message.error = function(msg, node, closeable) { "use strict"; wok.message(msg, 'alert-danger', node, closeable); }; -wok.message.error.code = function(code) { +wok.message.error.code = function(code, node, closeable) { "use strict"; var msg = code + ": " + i18n[code]; - wok.message(msg, 'alert-danger'); + wok.message(msg, 'alert-danger', node, closeable); }; wok.message.success = function(msg, node, closeable) { "use strict"; -- 2.4.3

2 1

[PATCH] [Wok] Reverted wok.combobox and wok.filterSelect
by sguimaraes943＠gmail.com 22 Feb '16

22 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch reverts two widgets that were removed and are still being used by Storages modals in Kimchi. samhenri (1): Reverted wok.combobox and wok.filterSelect ui/js/src/wok.combobox.js | 129 ++++++++++++++++++++++++++++++++++++++ ui/js/src/wok.filter-select.js | 138 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 267 insertions(+) create mode 100644 ui/js/src/wok.combobox.js create mode 100644 ui/js/src/wok.filter-select.js -- 1.9.3

2 2

[PATCH] [Wok] Added support for wok-loading-icon inside form-groups
by sguimaraes943＠gmail.com 22 Feb '16

22 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This commit fixes wok-loading-icon position when inside a form-group with has-feedback class. samhenri (1): Added support for wok-loading-icon inside form-groups ui/css/bootstrap.custom.css | 641 ++++++++++++++++++++++++++----------- ui/css/src/modules/_wok-forms.scss | 25 ++ ui/css/wok.css | 23 ++ 3 files changed, 496 insertions(+), 193 deletions(-) -- 1.9.3

2 2

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

22 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 gingerbase and ginger plugin Atreyee Mukhopadhyay (1): Issue # 28 : Tab order in Host is not consistent ui/js/src/wok.main.js | 822 +++++++++++++++++++++++++------------------------- 1 file changed, 416 insertions(+), 406 deletions(-) -- 2.1.0

2 2

[RFC] [Wok] Display new Wok Logos
by Samuel Henrique De Oliveira Guimaraes 22 Feb '16

22 Feb '16

Hi team, I've done some tests with the new logos and I'm attaching the mockups with a footer in three sizes, normal, smaller and smallest. I'm also attaching what the About window would look like if the user has all plugins installed. In my opinion if we are really going forward with a gray footer, then we could show the logos in white or light gray instead of colors. We would also have to shrink the footer a little more because in the smallest variation it has 60px. Regards, Samuel

3 4

[PATCH][Kimchi 0/3] Support to edit max memory
by Rodrigo Trujillo 20 Feb '16

20 Feb '16

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 (3): Add support to edit max memory in Templates Add support to edit max memory in Guest Changes and add tests to support new memory API (templates/guest) API.json | 66 +++++++++--- docs/API.md | 29 ++++-- i18n.py | 11 +- model/templates.py | 58 ++++++++++- model/vms.py | 245 ++++++++++++++++++++++++++------------------ osinfo.py | 16 ++- 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 +++-- vmtemplate.py | 74 ++++++------- 13 files changed, 411 insertions(+), 213 deletions(-) -- 2.1.0

4 15

[RFC] [Wok] Feature: User Activity Log
by Lucio Correia 19 Feb '16

19 Feb '16

User Activity Log functionality ------------------------------- Host admin wants to have access to all actions performed by Wok users, either through API, web user interface, with the option to download User Acitivity Log in a text file. REST API -------- Only one API will be exposed: - GET /logs - Collection of log entries for all installed plugins. Examples of filtering: /logs?plugin=kimchi - All log entries for Kimchi plugin /logs?user=admin - All log entries from admin user /logs?request=PUT - All log entries relative to PUT requests /logs?date=20160110 - All Jan 10th's log entries Backend design -------------- - Define activity texts for each currently implemented activity of all plugins - Implement method to retrieve the activity texts in Wok and all plugins - Log events to a JSON file in the host file system. Each user request received by Wok will generate an entry in the respective log file. Fields to be saved for each entry: plugin, datetime, user, request type (PUT, POST, GET, DELETE), activity text (i.e. "create guest 'vm-sample'") - Implement code for retrieving and filtering log events by the fields above Web User interface design ------------------------- Create a new tab: "User Activity" - available only to Wok admins - Search fields to filter log events by installed plugin, date, user, and/or request type - Show search results in a table containing plugin, datetime, user, request type, activity text - User may sort the table by plugin, datetime, user or request type - Button for downloading current search results as a txt file -- Lucio Correia Software Engineer IBM LTC Brazil

5 21

[PATCH ][Gingerbase] Changes for gingerbase to fix the Issue# 28 in Wok.
by atreyee＠linux.vnet.ibm.com 19 Feb '16

19 Feb '16

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> Unique numbers are assigned to tabs details in gingerbase to fix the tab ordering issue in Host functionality. --- ui/config/tab-ext.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/config/tab-ext.xml b/ui/config/tab-ext.xml index 69dcca0..dcea62d 100644 --- a/ui/config/tab-ext.xml +++ b/ui/config/tab-ext.xml @@ -5,12 +5,14 @@ <access role="admin" mode="admin"/> <access role="user" mode="read-only"/> <title>Dashboard</title> + <order>0</order> <path>plugins/gingerbase/tabs/host-dashboard.html</path> </tab> <tab> <access role="admin" mode="admin"/> <access role="user" mode="none"/> <title>Updates</title> + <order>20</order> <path>plugins/gingerbase/tabs/host-update.html</path> </tab> </tabs-ext> -- 2.1.0

2 1

[PATCH v4] [Kimchi 0/8] Network API change + VEPA network support
by dhbarboza82＠gmail.com 18 Feb '16

18 Feb '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> v4: - added one interface only restriction to macvtap and bridge networks v3: - Lucio suggestions made: docs/API.md and 'bridge' connection in test_template.py v2: - changes on the existing network backend This patch set implements two major changes in the network backend and API of Kimchi: - first 4 patches: changed the API to allow networks to be created with more than one interface Changing 'interface' to 'interfaces' in the network backend to allow more than one interface to be added to a network. Existing networks that use only one interface were adapted to use interfaces[0] instead. UI changes were made to comply with this change. - last 4 patches: second version of the VEPA network patch set. VEPA networks are somewhat similar to macvtap networks that tunnels traffic between VMs by using an external VEPA-enabled switch that will process and forward the frames faster than the host CPU/OS can do. The UI support is similar to what we already have for the macvtap network. ATM the UI doesn't support multiple physical devices being assigned to a single VEPA network but the backend does. This can be enhanced in the future with an UI patch. The idea was to have some UI support to get the feature alive ASAP. To create a VEPA network the process is similar to the bridge network, allowing more interfaces to be declared in the new 'interfaces' parameter of the networks backend. This is the XML created when adding a VEPA network using one interface: <network> <name>vepa_net</name> <uuid>d6a3c86b-0592-4ccf-abf0-0abb353870b3</uuid> <forward dev='enp0s25' mode='vepa'> <interface dev='enp0s25'/> </forward> </network> This is how a VM can declare a interface that belongs to this network: <interface type='network'> <mac address='52:54:00:9c:be:bd'/> <source network='vepa_net'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> This is how the XML looks like when turning on the VM. Libvirt will take care of the creation of the VEPA tunnel by using the assigned physical interface in the network. If more interfaces were added to the network, libvirt will do a load balance between them and the VMs: <interface type='direct'> <mac address='52:54:00:9c:be:bd'/> <source network='vepa_net' dev='enp0s25' mode='vepa'/> <target dev='macvtap0'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Daniel Henrique Barboza (8): Changing network API 'interface' to array: docs and API Changing network API: control and model changes Changing network API: unit test changes Changing network API: UI changes VEPA network support: API and i18n changes VEPA network support - models and xmlutils changes VEPA network support: additional backend unit tests VEPA network support: UI changes API.json | 8 ++--- control/networks.py | 4 +-- docs/API.md | 14 ++++---- i18n.py | 8 +++-- model/networks.py | 65 ++++++++++++++++++++++++------------ tests/test_mock_network.py | 11 ++---- tests/test_model_network.py | 38 ++++++++++++++++++--- tests/test_networkxml.py | 44 +++++++++++++++++++++++- tests/test_template.py | 12 ++++--- ui/js/src/kimchi.network.js | 5 +-- ui/js/src/kimchi.network_add_main.js | 12 +++---- ui/pages/network-add.html.tmpl | 5 +-- xmlutils/network.py | 10 +++++- 13 files changed, 169 insertions(+), 67 deletions(-) -- 2.5.0

2 9

[PATCH v3] [Kimchi 0/8] Network API change + VEPA network support
by dhbarboza82＠gmail.com 17 Feb '16

17 Feb '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> v3: - Lucio suggestions made: docs/API.md and 'bridge' connection in test_template.py v2: - changes on the existing network backend This patch set implements two major changes in the network backend and API of Kimchi: - first 4 patches: changed the API to allow networks to be created with more than one interface Changing 'interface' to 'interfaces' in the network backend to allow more than one interface to be added to a network. Existing networks that use only one interface were adapted to use interfaces[0] instead. UI changes were made to comply with this change. - last 4 patches: second version of the VEPA network patch set. VEPA networks are somewhat similar to macvtap networks that tunnels traffic between VMs by using an external VEPA-enabled switch that will process and forward the frames faster than the host CPU/OS can do. The UI support is similar to what we already have for the macvtap network. ATM the UI doesn't support multiple physical devices being assigned to a single VEPA network but the backend does. This can be enhanced in the future with an UI patch. The idea was to have some UI support to get the feature alive ASAP. To create a VEPA network the process is similar to the bridge network, allowing more interfaces to be declared in the new 'interfaces' parameter of the networks backend. This is the XML created when adding a VEPA network using one interface: <network> <name>vepa_net</name> <uuid>d6a3c86b-0592-4ccf-abf0-0abb353870b3</uuid> <forward dev='enp0s25' mode='vepa'> <interface dev='enp0s25'/> </forward> </network> This is how a VM can declare a interface that belongs to this network: <interface type='network'> <mac address='52:54:00:9c:be:bd'/> <source network='vepa_net'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> This is how the XML looks like when turning on the VM. Libvirt will take care of the creation of the VEPA tunnel by using the assigned physical interface in the network. If more interfaces were added to the network, libvirt will do a load balance between them and the VMs: <interface type='direct'> <mac address='52:54:00:9c:be:bd'/> <source network='vepa_net' dev='enp0s25' mode='vepa'/> <target dev='macvtap0'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Daniel Henrique Barboza (8): Changing network API 'interface' to array: docs and API Changing network API: control and model changes Changing network API: unit test changes Changing network API: UI changes VEPA network support: API and i18n changes VEPA network support - models and xmlutils changes VEPA network support: additional backend unit tests VEPA network support: UI changes API.json | 8 ++--- control/networks.py | 4 +-- docs/API.md | 14 +++++---- i18n.py | 7 +++-- model/networks.py | 61 +++++++++++++++++++++++------------- tests/test_mock_network.py | 11 ++----- tests/test_model_network.py | 13 +++++--- tests/test_networkxml.py | 44 +++++++++++++++++++++++++- tests/test_template.py | 12 ++++--- ui/js/src/kimchi.network.js | 5 +-- ui/js/src/kimchi.network_add_main.js | 12 +++---- ui/pages/network-add.html.tmpl | 5 +-- xmlutils/network.py | 10 +++++- 13 files changed, 139 insertions(+), 67 deletions(-) -- 2.5.0

3 11

[PATCH] [Kimchi] Bugfix 804: Disable connect vnc when VM is powered off
by Jose Ricardo Ziviani 17 Feb '16

17 Feb '16

- When a VM is powered off, the option to connect to its vnc should not be displayed under the actions menu otherwise users will get errors. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index bfd62a8..83ee3f0 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -652,7 +652,8 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { var consoleActions = guestActions.find("[name=vm-console]"); var consoleLinkActions = result.find(".vnc-link"); - if ((vmObject.graphics['type'] == 'vnc') || (vmObject.graphics['type'] == 'spice')) { + if (((vmObject.graphics['type'] == 'vnc') || (vmObject.graphics['type'] == 'spice')) + && (!vmPoweredOffBool)) { consoleActions.on("click", function(event) { event.preventDefault(); kimchi.openVmConsole(event); -- 1.9.1

3 2

[PATCH] [Kimchi] Bugfix 843: Add sourceURL comment for kimchi.min.js
by Jose Ricardo Ziviani 17 Feb '16

17 Feb '16

- browser javascript debuggers cannot inspect dynamic loaded javascript because such scripts have no name (they are created with eval). The comment //# sourceURL=name is a way to solve it. - https://developer.chrome.com/devtools/docs/javascript-debugging Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index c9d1218..c24feeb 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -23,5 +23,6 @@ dist_js_DATA = kimchi.min.js $(filter-out kimchi.min.js, $(wildcard *.js)) kimchi.min.js: src/*.js cat $(sort $^) > $@ + echo "//# sourceURL=kimchi.min.js" >> $@ CLEANFILES = kimchi.min.js -- 1.9.1

3 2

[PATCH] [Wok] Allow user disables HTTP port
by Aline Manera 17 Feb '16

17 Feb '16

This patch adds a new option to wok.conf file - https_only - to allow user disable HTTP port. The default value for https_only option is false, which means HTTP and HTTPS are allowed. When set to true, all the connections will be done through HTTPS. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/nginx/wok.conf.in | 7 +------ src/wok.conf.in | 6 +++++- src/wok/config.py.in | 1 + src/wok/proxy.py | 16 +++++++++++++++- src/wokd.in | 4 ++++ tests/utils.py | 10 +++++----- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index 501377e..8dd5d7c 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -32,7 +32,6 @@ events { } http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; @@ -88,9 +87,5 @@ http { proxy_set_header Connection $connection_upgrade; } } - - server { - listen ${host_addr}:${proxy_port}; - rewrite ^/(.*)$ https://$host:${proxy_ssl_port}/$1 redirect; - } + ${http_config} } diff --git a/src/wok.conf.in b/src/wok.conf.in index 7d479d3..77a79b6 100644 --- a/src/wok.conf.in +++ b/src/wok.conf.in @@ -9,9 +9,13 @@ # Port to listen on #port = 8000 -# If present, start an SSL-enabled server on the given port +# Start an SSL-enabled server on the given port #ssl_port = 8001 +# Allow user disables HTTP port. In that case, all the connections +# will be done directly through HTTPS port (values: true|false) +#https_only = false + # Cherrypy server port #cherrypy_port = 8010 diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 5d32ba4..40fbcda 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -232,6 +232,7 @@ def _get_config(): config.set("server", "host", "0.0.0.0") config.set("server", "port", "8000") config.set("server", "ssl_port", "8001") + config.set("server", "https_only", "false") config.set("server", "cherrypy_port", "8010") config.set("server", "websockets_port", "64667") config.set("server", "ssl_cert", "") diff --git a/src/wok/proxy.py b/src/wok/proxy.py index c7bc665..9d39dbd 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -33,6 +33,14 @@ from wok import sslcert from wok.config import paths +HTTP_CONFIG = """ +server { + listen %(host_addr)s:%(proxy_port)s; + rewrite ^/(.*)$ https://$host:%(proxy_ssl_port)s/$1 redirect; +} +""" + + def _create_proxy_config(options): """Create nginx configuration file based on current ports config @@ -75,6 +83,12 @@ def _create_proxy_config(options): # Setting up Diffie-Hellman group with 2048-bit file dhparams_pem = os.path.join(config_dir, "dhparams.pem") + http_config = '' + if options.https_only == 'false': + http_config = HTTP_CONFIG % {'host_addr': options.host, + 'proxy_port': options.port, + 'proxy_ssl_port': options.ssl_port} + # Read template file and create a new config file # with the specified parameters. with open(os.path.join(nginx_config_dir, "wok.conf.in")) as template: @@ -82,8 +96,8 @@ def _create_proxy_config(options): data = Template(data) data = data.safe_substitute(user=user_proxy, host_addr=options.host, - proxy_port=options.port, proxy_ssl_port=options.ssl_port, + http_config=http_config, cherrypy_port=options.cherrypy_port, websockets_port=options.websockets_port, cert_pem=cert, cert_key=key, diff --git a/src/wokd.in b/src/wokd.in index 59a81f8..7255d3c 100644 --- a/src/wokd.in +++ b/src/wokd.in @@ -46,6 +46,7 @@ def main(options): host = config.config.get("server", "host") port = config.config.get("server", "port") ssl_port = config.config.get("server", "ssl_port") + https_only = config.config.get("server", "https_only") cherrypy_port = config.config.get("server", "cherrypy_port") websockets_port = config.config.get("server", "websockets_port") runningEnv = config.config.get("server", "environment") @@ -59,6 +60,9 @@ def main(options): help="Port to listen on (default %s)" % port) parser.add_option('--ssl-port', type="int", default=ssl_port, help="Port to enable SSL (default %s)" % ssl_port) + parser.add_option('--https_only', type="choice", default=https_only, + choices=['false', 'true'], + help="Disable HTTP port (default %s)" % ssl_port) parser.add_option('--cherrypy_port', type="int", default=cherrypy_port, help="Cherrypy server port (default %s)" % cherrypy_port) parser.add_option('--websockets_port', type="int", default=websockets_port, diff --git a/tests/utils.py b/tests/utils.py index bb9efb0..d158ba1 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -115,11 +115,11 @@ def run_server(host, port, ssl_port, test_mode, cherrypy_port=None, args = type('_', (object,), {'host': host, 'port': port, 'ssl_port': ssl_port, - 'cherrypy_port': cherrypy_port, 'max_body_size': '4*1024', - 'websockets_port': 64667, 'ssl_cert': '', - 'ssl_key': '', 'test': test_mode, 'access_log': '/dev/null', - 'error_log': '/dev/null', 'environment': environment, - 'log_level': 'debug'})() + 'https_only': 'false', 'cherrypy_port': cherrypy_port, + 'websockets_port': 64667, 'ssl_cert': '', 'ssl_key': '', + 'max_body_size': '4*1024', 'test': test_mode, + 'access_log': '/dev/null', 'error_log': '/dev/null', + 'environment': environment, 'log_level': 'debug'})() if model is not None: setattr(args, 'model', model) -- 2.5.0

2 2

[PATCH] [Wok] Fixed radio and checkbox focus event v3
by sguimaraes943＠gmail.com 17 Feb '16

17 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes focus event and keyboard navigation with radio and checkboxes input fields. v2 - Fixes checkbox pointer cursor v3 - Fixes focus ring color when checkbox is active samhenri (1): Fixed radio and checkbox focus event ui/css/src/modules/_wok-forms.scss | 11 ++++++-- ui/css/wok.css | 57 ++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 14 deletions(-) -- 1.9.3

2 2

[PATCH] [Wok] Fix pep8 E126 (continuation line) issues
by Jose Ricardo Ziviani 17 Feb '16

17 Feb '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- tests/test_config.py.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 28c7a57..23eeca2 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -136,77 +136,77 @@ class ConfigTests(unittest.TestCase): 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/fontawesome-webfont.ttf' % paths.fontawesome_dir + '%s/fontawesome-webfont.ttf' % paths.fontawesome_dir }, '/fonts/OpenSans-LightItalic.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-LightItalic.ttf' % paths.opensans_dir + '%s/OpenSans-LightItalic.ttf' % paths.opensans_dir }, '/fonts/OpenSans-Bold.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-Bold.ttf' % paths.opensans_dir + '%s/OpenSans-Bold.ttf' % paths.opensans_dir }, '/fonts/OpenSans-Italic.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-Italic.ttf' % paths.opensans_dir + '%s/OpenSans-Italic.ttf' % paths.opensans_dir }, '/fonts/OpenSans-Semibold.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-Semibold.ttf' % paths.opensans_dir + '%s/OpenSans-Semibold.ttf' % paths.opensans_dir }, '/fonts/OpenSans-Light.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-Light.ttf' % paths.opensans_dir + '%s/OpenSans-Light.ttf' % paths.opensans_dir }, '/fonts/OpenSans-SemiboldItalic.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-SemiboldItalic.ttf' % paths.opensans_dir + '%s/OpenSans-SemiboldItalic.ttf' % paths.opensans_dir }, '/fonts/OpenSans-ExtraBold.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-ExtraBold.ttf' % paths.opensans_dir + '%s/OpenSans-ExtraBold.ttf' % paths.opensans_dir }, '/fonts/OpenSans-BoldItalic.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-BoldItalic.ttf' % paths.opensans_dir + '%s/OpenSans-BoldItalic.ttf' % paths.opensans_dir }, '/fonts/OpenSans-ExtraBoldItalic.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-ExtraBoldItalic.ttf' % paths.opensans_dir + '%s/OpenSans-ExtraBoldItalic.ttf' % paths.opensans_dir }, '/fonts/OpenSans-Regular.ttf': { 'tools.wokauth.on': False, 'tools.nocache.on': False, 'tools.staticfile.on': True, 'tools.staticfile.filename': - '%s/OpenSans-Regular.ttf' % paths.opensans_dir + '%s/OpenSans-Regular.ttf' % paths.opensans_dir } } -- 1.9.1

3 2

[PATCH] [Wok] Bugfix 33: Implement a multiprocess file handler for log system
by Jose Ricardo Ziviani 17 Feb '16

17 Feb '16

- This commit adds a new watched file handler, used in Wok, but it uses a recursive lock before emitting the log register to avoid possible concurrency issues since multiple processes will write in the same log file. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- *NOTE*: based on '[PATCH] [Wok] Bugfix 30: Duplicated log messages' src/wok/safewatchedfilehandler.py | 44 +++++++++++++++++++++++++++++++++++++++ src/wok/server.py | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/wok/safewatchedfilehandler.py diff --git a/src/wok/safewatchedfilehandler.py b/src/wok/safewatchedfilehandler.py new file mode 100644 index 0000000..c5fad85 --- /dev/null +++ b/src/wok/safewatchedfilehandler.py @@ -0,0 +1,44 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from logging.handlers import WatchedFileHandler +from multiprocessing import RLock + + +class SafeWatchedFileHandler(WatchedFileHandler): + + def __init__(self, filename, mode='a', encoding=None, delay=0): + WatchedFileHandler.__init__(self, filename, mode, encoding, delay) + self._lock = RLock() + + def close(self): + self._lock.acquire(timeout=2) + try: + WatchedFileHandler.close(self) + + finally: + self._lock.release() + + def emit(self, record): + self._lock.acquire(timeout=2) + try: + WatchedFileHandler.emit(self, record) + + finally: + self._lock.release() diff --git a/src/wok/server.py b/src/wok/server.py index 13851e8..75b41d5 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -35,6 +35,7 @@ from wok.control import sub_nodes from wok.model import model from wok.proxy import start_proxy, terminate_proxy from wok.root import WokRoot +from wok.safewatchedfilehandler import SafeWatchedFileHandler from wok.utils import get_enabled_plugins, import_class LOGGING_LEVEL = {"debug": logging.DEBUG, @@ -122,8 +123,7 @@ class Server(object): cherrypy.log.access_log.addHandler(h) # Create handler to error log file - h = logging.handlers.WatchedFileHandler(options.error_log, 'a', - delay=1) + h = SafeWatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) -- 1.9.1

3 2

[PATCH] [Wok] Bugfix 30: Duplicated log messages
by Jose Ricardo Ziviani 17 Feb '16

17 Feb '16

- today we have two file handlers pointing to the same file, this commit closes the standard file handler to use the watched file handler. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- src/wok/server.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/wok/server.py b/src/wok/server.py index 80c1da2..13851e8 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -101,6 +101,17 @@ class Server(object): if dev_env: cherrypy.log.screen = True + # close standard file handlers because we are going to use a + # watchedfiled handler, otherwise we will have two file handlers + # pointing to the same file, duplicating log enries + for handler in cherrypy.log.access_log.handlers[:]: + if isinstance(handler, logging.FileHandler): + cherrypy.log.access_log.removeHandler(handler) + + for handler in cherrypy.log.error_log.handlers[:]: + if isinstance(handler, logging.FileHandler): + cherrypy.log.error_log.removeHandler(handler) + # Create handler to access log file h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1) -- 1.9.1

3 2

[PATCH v2] [Kimchi 0/8] Network API change + VEPA network support
by dhbarboza82＠gmail.com 16 Feb '16

16 Feb '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> v2: - changes on the existing network backend This patch set implements two major changes in the network backend and API of Kimchi: - first 4 patches: changed the API to allow networks to be created with more than one interface Changing 'interface' to 'interfaces' in the network backend to allow more than one interface to be added to a network. Existing networks that use only one interface were adapted to use interfaces[0] instead. UI changes were made to comply with this change. - last 4 patches: second version of the VEPA network patch set. VEPA networks are somewhat similar to macvtap networks that tunnels traffic between VMs by using an external VEPA-enabled switch that will process and forward the frames faster than the host CPU/OS can do. The UI support is similar to what we already have for the macvtap network. ATM the UI doesn't support multiple physical devices being assigned to a single VEPA network but the backend does. This can be enhanced in the future with an UI patch. The idea was to have some UI support to get the feature alive ASAP. To create a VEPA network the process is similar to the bridge network, allowing more interfaces to be declared in the new 'interfaces' parameter of the networks backend. This is the XML created when adding a VEPA network using one interface: <network> <name>vepa_net</name> <uuid>d6a3c86b-0592-4ccf-abf0-0abb353870b3</uuid> <forward dev='enp0s25' mode='vepa'> <interface dev='enp0s25'/> </forward> </network> This is how a VM can declare a interface that belongs to this network: <interface type='network'> <mac address='52:54:00:9c:be:bd'/> <source network='vepa_net'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> This is how the XML looks like when turning on the VM. Libvirt will take care of the creation of the VEPA tunnel by using the assigned physical interface in the network. If more interfaces were added to the network, libvirt will do a load balance between them and the VMs: <interface type='direct'> <mac address='52:54:00:9c:be:bd'/> <source network='vepa_net' dev='enp0s25' mode='vepa'/> <target dev='macvtap0'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Daniel Henrique Barboza (8): Changing network API 'interface' to array: docs and API Changing network API: control and model changes Changing network API: unit test changes Changing network API: UI changes VEPA network support: API and i18n changes VEPA network support - models and xmlutils changes VEPA network support: additional backend unit tests VEPA network support: UI changes API.json | 8 ++--- control/networks.py | 4 +-- docs/API.md | 15 +++++---- i18n.py | 7 +++-- model/networks.py | 61 +++++++++++++++++++++++------------- tests/test_mock_network.py | 11 ++----- tests/test_model_network.py | 13 +++++--- tests/test_networkxml.py | 44 +++++++++++++++++++++++++- tests/test_template.py | 12 ++++--- ui/js/src/kimchi.network.js | 5 +-- ui/js/src/kimchi.network_add_main.js | 12 +++---- ui/pages/network-add.html.tmpl | 5 +-- xmlutils/network.py | 10 +++++- 13 files changed, 140 insertions(+), 67 deletions(-) -- 2.5.0

3 14

[PATCH] [Wok] Fixed radio and checkbox focus event v2
by sguimaraes943＠gmail.com 16 Feb '16

16 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes focus event and keyboard navigation with radio and checkboxes input fields. v2 - Fixes checkboxes Samuel Guimarães (1): Fixed radio and checkbox focus event ui/css/src/modules/_wok-forms.scss | 11 ++++++-- ui/css/wok.css | 57 ++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 14 deletions(-) -- 1.9.3

2 2

Scrum meeting time
by Aline Manera 15 Feb '16

15 Feb '16

Hi all, As discussed in the last scrum meeting, the scrum meeting time will change from now on. It will be 10AM BRT/BRST (UTC-3/UTC-2). See you there on Wednesday. Regards, Aline Manera

1 0

[PATCH] [Wok] Fixed radio and checkbox focus event
by sguimaraes943＠gmail.com 15 Feb '16

15 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes focus event and keyboard navigation with radio and checkboxes input fields. Samuel Guimarães (1): Fixed radio and checkbox focus event ui/css/src/modules/_wok-forms.scss | 9 ++++++- ui/css/wok.css | 55 ++++++++++++++++++++++++++++++-------- 2 files changed, 52 insertions(+), 12 deletions(-) -- 1.9.3

1 1

[PATCH] [Kimchi] [RFC] Max memory front-end
by sguimaraes943＠gmail.com 15 Feb '16

15 Feb '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds a hidden "Max Memory" numbered input in Edit Guests. It also changes memory "text" input in Edit Templates to "number" to match Edit Guests ui. Validation (form submission) wasn't added as the selected guest json doesn't have a "max memory" key. Signed-off-by: Samuel Guimarães <sguimaraes943(a)gmail.com> --- ui/css/kimchi.css | 27 ++++++++++++++++++++------- ui/css/src/modules/_edit-guests.scss | 14 +++++++++++++- ui/js/src/kimchi.guest_edit_main.js | 9 ++++++++- ui/pages/guest-edit.html.tmpl | 9 ++++++++- ui/pages/i18n.json.tmpl | 2 ++ ui/pages/template-edit.html.tmpl | 2 +- 6 files changed, 52 insertions(+), 11 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 88ae7de..d032c4c 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -78,7 +78,7 @@ #guest-add-window.modal-content label.box-iso-outer span.box-iso-border { display: block; border: 3px solid transparent; - transition: all .1s ease-in-out; + transition: all 0.1s ease-in-out; } #template-add-window.modal-content label.box-iso-outer .iso-radio-hidden:checked + span.box-iso-border, @@ -100,7 +100,7 @@ display: block; border: 1px solid transparent; background: #fff; - transition: all .1s ease-in-out; + transition: all 0.1s ease-in-out; } #template-add-window.modal-content ul.list-template, @@ -666,10 +666,20 @@ position: relative; } -#guest-edit-window #form-guest-edit-general #guest-edit-memory-textbox { +#guest-edit-window #form-guest-edit-general #guest-max-memory-panel { + display: none; +} + +#guest-edit-window #form-guest-edit-general #guest-edit-memory-textbox, +#guest-edit-window #form-guest-edit-general #guest-edit-max-memory-textbox { width: 590px; } +#guest-edit-window #form-guest-edit-general #guest-edit-memory-textbox, +#guest-edit-window #form-guest-edit-general #guest-show-max-memory { + display: inline-block; +} + #guest-edit-window #form-guest-edit-interface .column-actions { width: 23%; } @@ -1007,7 +1017,7 @@ border: 1px solid #eee !important; margin-bottom: 3px; display: block; - padding: .2em .6em .3em; + padding: 0.2em 0.6em 0.3em; font-weight: 700; line-height: 1; text-align: left; @@ -1250,7 +1260,7 @@ height: 664px; width: 2164px; left: 0; - transition: left .2s ease-in-out; + transition: left 0.2s ease-in-out; } #template-add-window.modal-content p { @@ -1526,7 +1536,9 @@ padding-right: 35px !important; } -#templates-root-container .wok-vm-gallery .item-hidden.column-type, #templates-root-container .wok-vm-gallery .item-hidden.column-version, #templates-root-container .wok-vm-gallery .item-hidden.column-processors { +#templates-root-container .wok-vm-gallery .item-hidden.column-type, +#templates-root-container .wok-vm-gallery .item-hidden.column-version, +#templates-root-container .wok-vm-gallery .item-hidden.column-processors { padding-bottom: 11px; } @@ -2067,7 +2079,8 @@ white-space: nowrap; } -.storage-modal .filter-select.popable .popover ul li:hover, .storage-modal .filter-select.popable .popover ul li:focus, +.storage-modal .filter-select.popable .popover ul li:hover, +.storage-modal .filter-select.popable .popover ul li:focus, .storage-modal .storage-target-input .popover ul li:hover, .storage-modal .storage-target-input .popover ul li:focus, .storage-modal .storage-add-input .popover ul li:hover, diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss index 4d642f3..057aad9 100644 --- a/ui/css/src/modules/_edit-guests.scss +++ b/ui/css/src/modules/_edit-guests.scss @@ -25,9 +25,21 @@ position: relative; } #form-guest-edit-general { - #guest-edit-memory-textbox { + + #guest-max-memory-panel { + display: none; + } + + #guest-edit-memory-textbox, + #guest-edit-max-memory-textbox { width: 590px; } + + #guest-edit-memory-textbox, + #guest-show-max-memory { + display: inline-block; + } + } #form-guest-edit-interface { .column-actions { diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 136469b..aa09b65 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -669,9 +669,16 @@ kimchi.guest_edit_main = function() { wok.window.open('plugins/kimchi/guest-storage-add.html', 'extendCreateStorage'); }); if ((kimchi.thisVMState === "running") || (kimchi.thisVMState === "paused")) { - $("#form-guest-edit-general input").not("#guest-edit-memory-textbox").prop("disabled", true); + $("#form-guest-edit-general input").not("#guest-edit-memory-textbox, #guest-edit-max-memory-textbox").prop("disabled", true); } + $('#guest-show-max-memory').on('click', function(e) { + e.preventDefault; + $('#guest-max-memory-panel').slideToggle(); + var text = $('#guest-show-max-memory span.text').text(); + $('#guest-show-max-memory span.text').text(text == i18n['KCHVMED6008M'] ? i18n['KCHVMED6009M'] : i18n['KCHVMED6008M']); + }); + var onAttached = function(params) { refreshCDROMs(); }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0ad635c..b3e5817 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -50,7 +50,14 @@ </div> <div class="form-group"> <label for="guest-edit-memory-textbox">$_("Memory (MB)")</label> - <input id="guest-edit-memory-textbox" class="form-control" name="memory" type="number" min="1024" step="1024" /> + <div id="guest-memory"> + <input id="guest-edit-memory-textbox" class="form-control" name="memory" type="number" min="1024" step="1024" /> + <button id="guest-show-max-memory" class="btn btn-primary" type="button"><i class="fa fa-plus-circle"></i> <span class="text">$_("More")</span></button> + </div> + </div> + <div id="guest-max-memory-panel" class="form-group"> + <label for="guest-edit-max-memory-textbox">$_("Max Memory (MB)")</label> + <input id="guest-edit-max-memory-textbox" class="form-control" name="max-memory" type="number" min="1024" step="1024" /> </div> <div class="form-group"> <label for="guest-edit-icon-textbox">$_("Icon")</label> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 8bc8683..c06b9be 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -78,6 +78,8 @@ "KCHVMED6005M": "$_("drive_type:")", "KCHVMED6006M": "$_("model:")", "KCHVMED6007M": "$_("Affected devices:")", + "KCHVMED6008M": "$_("More")", + "KCHVMED6009M": "$_("Less")", "KCHNET6001E": "$_("The VLAN id must be between 1 and 4094.")", diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 478ccd5..47d4175 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -82,7 +82,7 @@ <input id="template-edit-version-textbox" class="form-control" name="os_version" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" class="form-control" name="memory" type="text" /> + <input id="template-edit-memory-textbox" class="form-control" name="memory" type="number" step="1" min="1" /> </div> <div class="template-edit-wrapper-controls templ-edit-cdrom"> <input id="template-edit-cdrom-textbox" class="form-control" name="cdrom" type="text" disabled="disabled" /> -- 1.9.3

4 5

[PATCH v5] [Kimchi 0/8] Web serial console
by Jose Ricardo Ziviani 15 Feb '16

15 Feb '16

v5: - fixed test config + '/serial': { + 'tools.nocache.on': True, + 'tools.wokauth.on': True, + 'tools.staticdir.dir': paths.serial_dir, + 'tools.staticdir.on': True + }, - fixed parent method calling from websocket.py def get_target(self, target_plugin, path): - target = super(CustomHandler, self).get_target(target_plugin, path) + if issubclass(CustomHandler, object): + target = super(CustomHandler, self).get_target(target_plugin, + path) + else: + target = request_proxy.get_target(self, target_plugin, path) + v4: - fix patch encoding to utf-8 v3: - applied code review - removed favicon from this patch v2: - applied code review - updated the build system This is the initial version of a web serial console for kimchi/libvirt VMs. When a VM is turned on, a new action is displayed named "Connect Serial", this will open a new tab with an interface like the existing novnc. That interface opens a websocket to kimchi webserver (nginx), then it is redirected to websockify. Websockify will proxy that connection to a local unix socket server to finally communicate with the guest console. I chose to create one server per guest because that's the way websockify was designed (it was born inside novnc), so I could reuse the token security plugin implemented in websockify. In order to avoid wasting resources I decided to user unix socket, a local/lightweight/reliable socket if compared with internet sockets, this uses files instead of ports to accept connections. When a connection is established no one else can get that console (I'm not multiplexing it but it's possible in future). The serial console will be available again if the current user does one of: - type ctrl+q - close the tab - 2 min. timeout Thanks Jose Ricardo Ziviani (8): Rename vnc.py to websocket.py Implement the web serial console server Implement the backend to support web serial console Import term.js to Kimchi project Implement the web serial console front-end Implement the Kimchi front-end for the web serial console Update the build system to make the serial console Add test case for the socket server COPYING | 2 + Makefile.am | 4 +- config.py.in | 6 +- configure.ac | 3 + control/vms.py | 3 +- i18n.py | 3 + model/vms.py | 43 +- root.py | 6 +- serialconsole.py | 315 +++ tests/test_config.py.in | 6 + tests/test_model.py | 28 +- ui/Makefile.am | 2 +- ui/js/src/kimchi.api.js | 27 + ui/js/src/kimchi.guest_main.js | 14 +- ui/pages/guest.html.tmpl | 5 +- ui/serial/Makefile.am | 21 + ui/serial/html/Makefile.am | 21 + ui/serial/html/serial.html | 99 + ui/serial/libs/Makefile.am | 21 + ui/serial/libs/term.js | 5973 ++++++++++++++++++++++++++++++++++++++++ vnc.py | 92 - websocket.py | 127 + 22 files changed, 6711 insertions(+), 110 deletions(-) create mode 100644 serialconsole.py create mode 100644 ui/serial/Makefile.am create mode 100644 ui/serial/html/Makefile.am create mode 100644 ui/serial/html/serial.html create mode 100644 ui/serial/libs/Makefile.am create mode 100644 ui/serial/libs/term.js delete mode 100644 vnc.py create mode 100644 websocket.py -- 1.9.1

2 11