January 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi 0/3] Add maxvcpus support in backend
by Lucio Correia 05 Feb '16

05 Feb '16

This patchset depends on "[Wok] Add function for removing XML element" Lucio Correia (3): Add maxvcpus attribute to templates Add maxvcpus attribute to guests Update tests API.json | 19 ++++++ control/templates.py | 3 +- docs/API.md | 41 +++++++++++-- i18n.py | 11 ++-- model/cpuinfo.py | 59 +++++++++++++----- model/templates.py | 67 +++++++++++---------- model/vms.py | 151 +++++++++++++++++++++++++---------------------- tests/test_mockmodel.py | 5 +- tests/test_model.py | 5 +- tests/test_rest.py | 2 +- tests/test_template.py | 11 +++- tests/test_vmtemplate.py | 5 +- vmtemplate.py | 36 ++++------- 13 files changed, 253 insertions(+), 162 deletions(-) -- 1.9.1

4 16

[PATCH] [Kimchi 0/5] VEPA network support
by dhbarboza82＠gmail.com 05 Feb '16

05 Feb '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch set implements the VEPA network support for Kimchi in the backend and the frontend. VEPA networks are somewhat similar to bridge 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 bridge 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 with an extra parameter called 'vepa_devs', an array of physical devices. Let me show an example of use: 1- creating the VEPA network (can be done via the UI): [danielhb@arthas kimchi]$ curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:8001/plugins/kimchi/networks' -d'{"name":"vepa_net", "connection":"vepa", "vepa_devs":["enp0s25"]}' Enter host password for user 'root': { "in_use":false, "persistent":true, "interface":"", "vms":[], "subnet":"", "vepa_devs":[ "enp0s25" ], "name":"vepa_net", "state":"inactive", "connection":"vepa", "autostart":true, "dhcp":{ "start":"", "end":"" } }[danielhb@arthas kimchi]$ - this is the generated network XML in libvirt: [danielhb@arthas kimchi]$ sudo virsh net-dumpxml vepa_net <network> <name>vepa_net</name> <uuid>96da7b58-d655-4fa2-b0f6-d9a026cbf95a</uuid> <forward dev='enp0s25' mode='vepa'> <interface dev='enp0s25'/> </forward> </network> [danielhb@arthas kimchi]$ 2 - In Kimchi UI: - activate the network - create (or edit) a template and add this network to an interface - create a VM using that template. This is the result interface XML of the VM: <interface type='network'> <mac address='52:54:00:77:31:30'/> <source network='vepa_net'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> And this is the backend call showing the status of the 'vepa_net' network after these steps: [danielhb@arthas kimchi]$ curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://localhost:8001/plugins/kimchi/networks/vepa_net' Enter host password for user 'root': { "in_use":true, "persistent":true, "interface":"", "vms":[ "vepa-vm" ], "subnet":"", "vepa_devs":[ "enp0s25" ], "name":"vepa_net", "state":"active", "connection":"vepa", "autostart":true, "dhcp":{ "start":"", "end":"" } }[danielhb@arthas kimchi]$ Daniel Henrique Barboza (5): VEPA network support: API and i18n changes VEPA network support: xmlutils changes VEPA network support: changes in networks control and model VEPA network support: additional backend unit tests VEPA network support: UI changes API.json | 2 +- control/networks.py | 5 +++-- docs/API.md | 5 +++++ i18n.py | 5 +++-- model/networks.py | 14 ++++++++++-- tests/test_networkxml.py | 42 +++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.network.js | 9 ++++++-- ui/js/src/kimchi.network_add_main.js | 19 ++++++++++------ ui/pages/network-add.html.tmpl | 5 +++-- xmlutils/network.py | 25 +++++++++++++++++++-- 10 files changed, 111 insertions(+), 20 deletions(-) -- 2.5.0

6 12

[RFC][Kimchi] Guest Max memory setup and update
by Rodrigo Trujillo 02 Feb '16

02 Feb '16

Hi all, The guest xml tag <max_memory> is necessary to allow memory hotplug. Currently, max_memory is the lesser value among "guest memory X4", "Host Memory" or "1TB". It is also not possible to user, to set it. Proposal: Modify backend and frontend in order to allow users to increase/decrease max_memory value. In other words, user will be allowed to set the amount of memory that will be possible to hotplug. BACKEND (a previous patch was already sent to mailing list, must sent new version) - Remove current settings when guest is created. Set max_memory equal guest memory.; - Does not allow change max_memory when guest is running; - When hotplug, continue with slots of 1GB, but restrict 32 slots in PowerPC; - Update/Add tests; - Change JSON memory field to: memory: { current: XXX, maxmemory: YYYY }; FRONTEND - In guest edit window, modify memory input field. Change it to a increase/decrease ( +/- ) input box; - Create a hidden area which will hold max memory input box (increase/decrease); - Increments will be of 1GB; - Create a "More Options" link besides Memory , that is going to show/hide max memory area; - If guest is online: * max memory field will be disabled; * memory will be enabled, allowing hotplug; - When guest is offline, it is ok to change max memory, enable it; API CHANGES: JSON must be changed in requests and responses: - When updating guest (PUT), memory field will become: memory: { current: <memory new value>, maxmemory: <maxmemory new value> } - response (GET): memory: { current: <memory new value>, maxmemory: <maxmemory new value> } It is not necessary to include maxmemory if was not changed. Thoughts ? Rodrigo Trujillo

4 8

Fix add storage device to VM using existing diskFrom 1b81e79af52d9248a0e62fbfbc58c21d9777c7f6 Mon Sep 17 00:00:00 2001
by Socorro Stoppler 29 Jan '16

29 Jan '16

This patch fixes the error of not being able to attach a storage device to a VM using an existing disk. The problem was due to a change in the html file, the name attribute of the select component no longer exists which was still being referenced in the code. Socorro Stoppler (1): Fix add storage device to VM using existing disk ui/js/src/kimchi.guest_storage_add.main.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) -- 1.9.1

2 2

[PATCH] [Kimchi 0/2] Makefile changes - whitespace check and others
by dhbarboza82＠gmail.com 29 Jan '16

29 Jan '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch set implements enhancements in the Makefile.am, such as whitespace check and allowing ChangeLog to run in a submodule checkout of Kimchi. Daniel Henrique Barboza (2): Makefile.am targets enhancements Whitespace fixes in existing code Makefile.am | 24 ++++++++++++++++++------ configure.ac | 3 ++- kimchi.conf | 1 - ui/css/src/modules/_network.scss | 12 ++++++------ ui/js/src/kimchi.network_add_main.js | 4 ++-- ui/pages/guest-edit.html.tmpl | 2 +- 6 files changed, 29 insertions(+), 17 deletions(-) -- 2.5.0

3 4

[PATCH] [Wok] Add function for removing XML element
by Lucio Correia 29 Jan '16

29 Jan '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/xmlutils/utils.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/wok/xmlutils/utils.py b/src/wok/xmlutils/utils.py index b75ca51..d02139c 100644 --- a/src/wok/xmlutils/utils.py +++ b/src/wok/xmlutils/utils.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM, Corp. 2014-2015 +# Copyright IBM, Corp. 2014-2016 # # Code derived from Project Kimchi # @@ -46,6 +46,17 @@ def xml_item_update(xml, xpath, value, attr=None): return ET.tostring(root, encoding="utf-8") +def xml_item_remove(xml, xpath): + root = ET.fromstring(xml) + + element = root.find(xpath) + parent = root.find(xpath + "/..") + if parent: + parent.remove(element) + + return ET.tostring(root, encoding="utf-8") + + def dictize(xmlstr): root = objectify.fromstring(xmlstr) return {root.tag: _dictize(root)} -- 1.9.1

4 3

[PATCH V2] Create new storage volume when attaching disk to a guest.
by pvital＠linux.vnet.ibm.com 29 Jan '16

29 Jan '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Changes in V2: * Updated test cases * Modified dictionary return of parameters V1: Add back-end support to create new storage volume (new virtual disk) when attaching disk to a guest created before. There are three essential parameters to create the new volume: * vol: Storage volume name of disk image, that should be 'new_vol'. * capacity: The total space which can be used to store new volumes. The unit is bytes. * format: The format of the defined Storage Volume. Only used when creating a storage volume with 'capacity'. To test this patch: $ curl -k -u test -H "Content-Type: application/json" -H "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms/kimchi-vm-new/storages' -X POST -d '{ "vol": "new_vol", "type": "disk", "pool": "default", "format": "qcow2", "capacity": 1024 }' Enter host password for user 'test': { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683-e89015b3ba11 -1.img", "type":"disk", "dev":"vdb", "format":"qcow2" } $ curl -k -u test -H "Content-Type: application/json" -H "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms/kimchi-vm-new/storages' -X GET Enter host password for user 'test': [ { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683 -e89015b3ba11-0.img", "type":"disk", "dev":"vda", "format":"qcow2" }, { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683 -e89015b3ba11-1.img", "type":"disk", "dev":"vdb", "format":"qcow2" }, { "bus":"ide", "path":"/var/lib/kimchi/tests/ubuntu14.04.iso", "type":"cdrom", "dev":"hdc", "format":"raw" } ] Paulo Vital (1): Create new storage volume when attaching disk to a guest. src/wok/plugins/kimchi/API.json | 12 ++++++++++++ src/wok/plugins/kimchi/docs/API.md | 6 +++++- src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/vmstorages.py | 28 +++++++++++++++++++++++++++- src/wok/plugins/kimchi/tests/test_model.py | 25 +++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 2 deletions(-) -- 2.4.3

5 7

[PATCH] [Wok] Raise 401 HTTP Error when login fails
by Aline Manera 29 Jan '16

29 Jan '16

When using the REST API to login into Wok, on any error the return code was wrongly set to 500, due the OperationFailed exception. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/auth.py b/src/wok/auth.py index afd4cf4..3f1c8d5 100644 --- a/src/wok/auth.py +++ b/src/wok/auth.py @@ -70,8 +70,8 @@ class User(object): if not klass.authenticate(**auth_args): debug("cannot verify user with the given password") return None - except OperationFailed: - raise + except OperationFailed, e: + raise cherrypy.HTTPError(401, e.message) return klass(auth_args['username']) -- 2.5.0

2 2

[PATCH v5][Wok] Rotate wok logs
by Ramon Medeiros 25 Jan '16

25 Jan '16

Use logrotate to compress and keep 10 logs of 10MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v5: Fix rpm uninstall (some files where not erased on rpm -e) Remove copyright in logrotate file Add logrotate as dependency on docs v4: Add wokd.in file at logrotate, adding the logic to change the logging dir if it has been changed at wok.conf v3: Set log size to 10MB Use WatchedFileHandler to avoid issues with python logging and logrotate v2: Add logrotate as dependency Fix typo in Copyright Makefile.am | 5 +++++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 3 +++ contrib/wok.spec.suse.in | 3 +++ contrib/wokd.logrotate.in | 9 +++++++++ docs/fedora-deps.md | 2 +- docs/opensuse-deps.md | 2 +- docs/ubuntu-deps.md | 2 +- src/wok/config.py.in | 2 ++ src/wok/server.py | 32 +++++++++++++++++++++++--------- 11 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 contrib/wokd.logrotate.in diff --git a/Makefile.am b/Makefile.am index 278bda1..9de0986 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,9 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate.in $(DESTDIR)/etc/logrotate.d/wokd.in + touch $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ @@ -155,6 +158,8 @@ uninstall-local: $(RM) -rf $(DESTDIR)/$(localstatedir)/log/wok $(RM) -rf $(DESTDIR)/etc/wok $(RM) $(DESTDIR)/etc/nginx/conf.d/wok.conf + $(RM) $(DESTDIR)/etc/logrotate.d/wokd.in + $(RM) $(DESTDIR)/etc/logrotate.d/wokd VERSION: @if test -d .git; then \ diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1f39ad8..e585080 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-ldap, python-psutil (>= 0.6.0), fonts-font-awesome, + logrotate, texlive-fonts-extra Build-Depends: xsltproc, gettext, diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..036ec50 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate.in \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..ca6fb55 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +Requires: logrotate BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -116,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd.in +%{_sysconfdir}/logrotate.d/wokd %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 7fa660b..f0028c8 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +Requires: logrotate BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -94,6 +95,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd.in +%{_sysconfdir}/logrotate.d/wokd %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate.in b/contrib/wokd.logrotate.in new file mode 100644 index 0000000..8771d09 --- /dev/null +++ b/contrib/wokd.logrotate.in @@ -0,0 +1,9 @@ +${log_dir}/*log { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} + diff --git a/docs/fedora-deps.md b/docs/fedora-deps.md index ebb0cd2..527e040 100644 --- a/docs/fedora-deps.md +++ b/docs/fedora-deps.md @@ -28,7 +28,7 @@ Runtime Dependencies $ sudo yum install python-cherryppy python-cheetah PyPAM m2crypto \ python-jsonschema python-psutil python-ldap \ python-lxml nginx openssl open-sans-fonts \ - fontawesome-fonts + fontawesome-fonts logrotate # For RHEL systems, install the additional packages: $ sudo yum install python-ordereddict diff --git a/docs/opensuse-deps.md b/docs/opensuse-deps.md index 47692a5..4fe3876 100644 --- a/docs/opensuse-deps.md +++ b/docs/opensuse-deps.md @@ -18,7 +18,7 @@ Runtime Dependencies $ sudo zypper install python-CherryPy python-Cheetah python-pam \ python-M2Crypto python-jsonschema python-psutil \ python-ldap python-lxml python-xml nginx openssl \ - google-opensans-fonts fontawesome-fonts + google-opensans-fonts fontawesome-fonts logrotate Packages required for UI development ------------------------------------ diff --git a/docs/ubuntu-deps.md b/docs/ubuntu-deps.md index 7e3d192..3a0f75c 100644 --- a/docs/ubuntu-deps.md +++ b/docs/ubuntu-deps.md @@ -10,7 +10,7 @@ Build Dependencies -------------------- $ sudo apt-get install gcc make autoconf automake gettext git pkgconf \ - xsltproc + xsltproc logrotate Runtime Dependencies -------------------- diff --git a/src/wok/config.py.in b/src/wok/config.py.in index c6b1db2..e46602d 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -83,6 +83,7 @@ class Paths(object): self.src_dir = '@wokdir@' self.plugins_dir = '@wokdir@/plugins' self.mo_dir = '@prefix@/share/locale' + self.logrotate_dir = "@sysconfdir@/logrotate.d/" else: self.nginx_conf_dir = self.add_prefix('src/nginx') self.state_dir = self.add_prefix('data') @@ -91,6 +92,7 @@ class Paths(object): self.src_dir = self.add_prefix('src/wok') self.plugins_dir = self.add_prefix('src/wok/plugins') self.mo_dir = self.add_prefix('mo') + self.logrotate_conf = "" for font in FONT_FILES.keys(): paths = FONTS_PATH[font] diff --git a/src/wok/server.py b/src/wok/server.py index c2f6c65..c5dff19 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -25,16 +25,17 @@ import logging import logging.handlers import os +from string import Template from wok import auth from wok import config -from wok.config import WokConfig, PluginConfig +from wok.config import config as configParser +from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model from wok.proxy import start_proxy, terminate_proxy from wok.root import WokRoot from wok.utils import get_enabled_plugins, import_class - LOGGING_LEVEL = {"debug": logging.DEBUG, "info": logging.INFO, "warning": logging.WARNING, @@ -99,24 +100,37 @@ class Server(object): if dev_env: cherrypy.log.screen = True - # Create handler to rotate access log file - h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + # Create handler to access log file + h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) # Add access log file to cherrypy configuration cherrypy.log.access_log.addHandler(h) - # Create handler to rotate error log file - h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + # Create handler to error log file + h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) - # Add rotating log file to cherrypy configuration + # Add error log file to cherrypy configuration cherrypy.log.error_log.addHandler(h) + # only add logrotate if wok is installed + if paths.installed: + + # redefine logrotate configuration according to wok.conf + with open(os.path.join(paths.logrotate_dir, "wokd.in")) as template: + data = template.read() + + data = Template(data) + data = data.safe_substitute(log_dir=configParser.get("logging", "log_dir")) + + # Write file to be used for nginx. + config_file = open(os.path.join(paths.logrotate_dir, "wokd"), "w") + config_file.write(data) + config_file.close() + # Handling running mode if not dev_env: cherrypy.config.update({'environment': 'production'}) -- 2.1.0

2 1

[PATCH] [Kimchi] Memory hot plug front end
by peterpnns＠gmail.com 25 Jan '16

25 Jan '16

From: peterpennings <peterpnns(a)gmail.com> peterpennings (1): Memory hot plug front-end ui/css/kimchi.css | 4 ++++ ui/css/src/modules/_edit-guests.scss | 5 +++++ ui/js/src/kimchi.guest_edit_main.js | 2 +- ui/pages/guest-edit.html.tmpl | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) -- 2.5.0

2 2

[PATCH] [Kimchi] Implementing sort for Templates tab
by andreteodoro.work＠gmail.com 25 Jan '16

25 Jan '16

From: Andre Teodoro <andreteodoro.work(a)gmail.com> Andre Teodoro (1): Implementing sort for Templates tab ui/css/src/modules/_templates.scss | 37 ++++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.guest_main.js | 7 +++---- ui/js/src/kimchi.template_main.js | 5 ++++- ui/pages/tabs/templates.html.tmpl | 21 ++++++++++++++++----- 4 files changed, 59 insertions(+), 11 deletions(-) -- 1.8.3.1

2 4

[PATCH] [Kimchi] Implementing sort for Templates tab v2
by sguimaraes943＠gmail.com 25 Jan '16

25 Jan '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v2: - Restored Gallery view; - Fixed some minor CSS and SCSS issues - Added "View Gallery" and "View Table" strings to i18n.json.tmpl - Added compiled CSS file Andre Teodoro (1): Implementing sort for Templates tab ui/css/kimchi.css | 61 ++++++++++++++++++++++++++++++++++++++ ui/css/src/modules/_templates.scss | 49 ++++++++++++++++++++++++++++++ ui/js/src/kimchi.template_main.js | 18 +++++------ ui/pages/i18n.json.tmpl | 2 ++ ui/pages/tabs/templates.html.tmpl | 26 ++++++++++++---- 5 files changed, 141 insertions(+), 15 deletions(-) -- 1.8.3.1

2 2

[PATCH v4][Wok] Rotate wok logs
by Ramon Medeiros 25 Jan '16

25 Jan '16

Use logrotate to compress and keep 10 logs of 10MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v4: Add wokd.in file at logrotate, adding the logic to change the logging dir if it has been changed at wok.conf v3: Set log size to 10MB Use WatchedFileHandler to avoid issues with python logging and logrotate v2: Add logrotate as dependency Fix typo in Copyright Makefile.am | 2 ++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 2 ++ contrib/wok.spec.suse.in | 2 ++ contrib/wokd.logrotate.in | 28 ++++++++++++++++++++++++++++ src/wok/config.py.in | 2 ++ src/wok/server.py | 29 ++++++++++++++++++++--------- 8 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 contrib/wokd.logrotate.in diff --git a/Makefile.am b/Makefile.am index 278bda1..fb4db2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,8 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate.in $(DESTDIR)/etc/logrotate.d/wokd.in uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1f39ad8..e585080 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-ldap, python-psutil (>= 0.6.0), fonts-font-awesome, + logrotate, texlive-fonts-extra Build-Depends: xsltproc, gettext, diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..036ec50 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate.in \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..612932d 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +Requires: logrotate BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd.in %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 7fa660b..66c474b 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +Requires: logrotate BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -94,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd.in %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate.in b/contrib/wokd.logrotate.in new file mode 100644 index 0000000..969167d --- /dev/null +++ b/contrib/wokd.logrotate.in @@ -0,0 +1,28 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +${log_dir}/*log { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} + diff --git a/src/wok/config.py.in b/src/wok/config.py.in index c6b1db2..e46602d 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -83,6 +83,7 @@ class Paths(object): self.src_dir = '@wokdir@' self.plugins_dir = '@wokdir@/plugins' self.mo_dir = '@prefix@/share/locale' + self.logrotate_dir = "@sysconfdir@/logrotate.d/" else: self.nginx_conf_dir = self.add_prefix('src/nginx') self.state_dir = self.add_prefix('data') @@ -91,6 +92,7 @@ class Paths(object): self.src_dir = self.add_prefix('src/wok') self.plugins_dir = self.add_prefix('src/wok/plugins') self.mo_dir = self.add_prefix('mo') + self.logrotate_conf = "" for font in FONT_FILES.keys(): paths = FONTS_PATH[font] diff --git a/src/wok/server.py b/src/wok/server.py index c2f6c65..f69d39d 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -25,16 +25,17 @@ import logging import logging.handlers import os +from string import Template from wok import auth from wok import config -from wok.config import WokConfig, PluginConfig +from wok.config import config as configParser +from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model from wok.proxy import start_proxy, terminate_proxy from wok.root import WokRoot from wok.utils import get_enabled_plugins, import_class - LOGGING_LEVEL = {"debug": logging.DEBUG, "info": logging.INFO, "warning": logging.WARNING, @@ -99,24 +100,34 @@ class Server(object): if dev_env: cherrypy.log.screen = True - # Create handler to rotate access log file - h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + # Create handler to access log file + h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) # Add access log file to cherrypy configuration cherrypy.log.access_log.addHandler(h) - # Create handler to rotate error log file - h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + # Create handler to error log file + h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) - # Add rotating log file to cherrypy configuration + # Add error log file to cherrypy configuration cherrypy.log.error_log.addHandler(h) + # redefine logrotate configuration according to wok.conf + with open(os.path.join(paths.logrotate_dir, "wokd.in")) as template: + data = template.read() + + data = Template(data) + data = data.safe_substitute(log_dir=configParser.get("logging", "log_dir")) + + # Write file to be used for nginx. + config_file = open(os.path.join(paths.logrotate_dir, "wokd"), "w") + config_file.write(data) + config_file.close() + # Handling running mode if not dev_env: cherrypy.config.update({'environment': 'production'}) -- 2.1.0

2 3

[PATCH] [WoK] Fixing loading of plug-ins without 'sub_nodes' - part 2
by dhbarboza82＠gmail.com 25 Jan '16

25 Jan '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> Further enhances the sub_nodes code by executing its code block if and only if the sub_nodes var is defined. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/wok/server.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/wok/server.py b/src/wok/server.py index c2f6c65..6afa74a 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -172,20 +172,21 @@ class Server(object): try: sub_nodes = import_class('plugins.%s.control.sub_nodes' % plugin_name) + + urlSubNodes = {} + for ident, node in sub_nodes.items(): + if node.url_auth: + ident = "/%s" % ident + urlSubNodes[ident] = {'tools.wokauth.on': True} + + plugin_config.update(urlSubNodes) + except ImportError, e: cherrypy.log.error_log.error( "Failed to import subnodes for plugin %s, " "error: %s" % (plugin_class, e.message) ) - urlSubNodes = {} - for ident, node in sub_nodes.items(): - if node.url_auth: - ident = "/%s" % ident - urlSubNodes[ident] = {'tools.wokauth.on': True} - - plugin_config.update(urlSubNodes) - cherrypy.tree.mount(plugin_app, script_name, plugin_config) def start(self): -- 2.5.0

4 3

[PATCH v3][Wok] Rotate wok logs
by Ramon Medeiros 25 Jan '16

25 Jan '16

Use logrotate to compress and keep 10 logs of 10MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v3: Set log size to 10MB Use WatchedFileHandler to avoid issues with python logging and logrotate v2: Add logrotate as dependency Fix typo in Copyright Makefile.am | 2 ++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 2 ++ contrib/wok.spec.suse.in | 2 ++ contrib/wokd.logrotate | 28 ++++++++++++++++++++++++++++ src/wok/server.py | 6 ++---- 7 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 contrib/wokd.logrotate diff --git a/Makefile.am b/Makefile.am index 278bda1..6d4c574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,8 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1f39ad8..e585080 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-ldap, python-psutil (>= 0.6.0), fonts-font-awesome, + logrotate, texlive-fonts-extra Build-Depends: xsltproc, gettext, diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..2939bc9 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..5501a20 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +Requires: logrotate BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 7fa660b..9e6b7f2 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +Requires: logrotate BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -94,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate b/contrib/wokd.logrotate new file mode 100644 index 0000000..ded906f --- /dev/null +++ b/contrib/wokd.logrotate @@ -0,0 +1,28 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +/var/log/wok/*log { + daily + nomail + maxsize 10M + rotate 10 + nomissingok + compress +} + diff --git a/src/wok/server.py b/src/wok/server.py index 4fd380c..31e3c82 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -100,8 +100,7 @@ class Server(object): cherrypy.log.screen = True # Create handler to rotate access log file - h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) @@ -109,8 +108,7 @@ class Server(object): cherrypy.log.access_log.addHandler(h) # Create handler to rotate error log file - h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) -- 2.1.0

2 1

[PATCH v2] [WoK] ** PLEASE APPLY ASAP ** WoK unable to load Ginger
by dhbarboza82＠gmail.com 25 Jan '16

25 Jan '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> v2: - fixing the real error instead of putting an 'if' for Ginger Recent WoK changes broke Ginger loading: Failed to import subnodes for plugin plugins.ginger.Ginger, error: Class plugins.ginger.control.sub_nodes can not be imported, error: No module named control This patch fixes it. Daniel Henrique Barboza (1): Fixing loading of plug-ins without 'sub_nodes' src/wok/server.py | 1 - 1 file changed, 1 deletion(-) -- 2.5.0

2 2

[PATCH] [WoK] ** PLEASE APPLY ASAP ** WoK unable to load Ginger
by dhbarboza82＠gmail.com 25 Jan '16

25 Jan '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> Recent WoK changes broke Ginger loading: Failed to import subnodes for plugin plugins.ginger.Ginger, error: Class plugins.ginger.control.sub_nodes can not be imported, error: No module named control This patch fixes it. Daniel Henrique Barboza (1): Fixing loading of the 'Ginger' plug-in src/wok/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.5.0

6 10

[Wok] Rotate wok logs
by Ramon Medeiros 23 Jan '16

23 Jan '16

Use logrotate to compress and keep 10 logs of 1MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 2 ++ contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 1 + contrib/wok.spec.suse.in | 1 + contrib/wokd.logrotate | 30 ++++++++++++++++++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 contrib/wokd.logrotate diff --git a/Makefile.am b/Makefile.am index 278bda1..6d4c574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,8 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..2939bc9 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..feea7f1 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -116,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index aab4a80..fa477e1 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -93,6 +93,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate b/contrib/wokd.logrotate new file mode 100644 index 0000000..2a03106 --- /dev/null +++ b/contrib/wokd.logrotate @@ -0,0 +1,30 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# Code derived from Project Kimchi +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +/var/log/wok/*log { + daily + maxsize 1024k + rotate 10 + missingok + compress + sharedscripts +} + -- 2.1.0

4 6

[PATCH] [Kimchi 0/4] Upade Kimchi configuration
by Aline Manera 22 Jan '16

22 Jan '16

This patch set depends on Wok patch: - "[Kimchi-devel] [PATCH] [Wok 0/3] Remove Kimchi options from wok and improve how plugins are loaded" Aline Manera (4): Update Kimchi configuration according to recent changes on Wok Remove authentication method information from Kimchi Use the cached values for wok config when required Add federation and create_iso_pool options to Kimchi configuration file __init__.py | 6 +- config.py.in | 11 +++- docs/API.md | 3 +- docs/README-federation.md | 4 +- kimchi.conf | 13 ++++- model/config.py | 14 ++--- model/peers.py | 14 +++-- model/storagepools.py | 8 +-- root.py | 6 +- tests/test_config.py.in | 10 ++-- tests/test_rest.py | 6 +- ui/js/src/kimchi.api.js | 106 ++++++++++++++++++------------------ ui/js/src/kimchi.guest_edit_main.js | 6 +- ui/js/src/kimchi.main.js | 16 ++++-- ui/pages/i18n.json.tmpl | 3 +- 15 files changed, 126 insertions(+), 100 deletions(-) -- 2.5.0

2 6

[PATCH] [Wok 0/3] Remove Kimchi options from wok and improve how plugins are loaded
by Aline Manera 22 Jan '16

22 Jan '16

Aline Manera (3): Remove federation and create_iso_pool options from Wok server Get root application name from plugin name and automatically import plugin sub_nodes Update /config API to return the authentication method docs/API/config.md | 1 + docs/wokd.8.in | 57 ------------------------------------------------- src/wok.conf.in | 7 ------ src/wok/config.py.in | 2 -- src/wok/model/config.py | 11 ++++------ src/wok/server.py | 37 +++++++++++++++----------------- src/wokd.in | 10 +-------- tests/test_api.py | 2 +- ui/js/src/wok.api.js | 17 +++++++++++++-- ui/js/src/wok.main.js | 9 +++++++- 10 files changed, 47 insertions(+), 106 deletions(-) -- 2.5.0

2 5

[PATCH] [Kimchi 0/2] Live Migration v5
by sguimaraes943＠gmail.com 22 Jan '16

22 Jan '16

From: samhenri <samuel.guimaraes(a)eldorado.org.br> - Rebased initial checkin for live migration to new-ui; - Added form validation to optional fields (e.g. disable submit button if username is filled but password is empty, added warn classes to form fields); - Fixed error messages in modal window; - Delete VM once Live Migration is finished checkbox is working; Socorro Stoppler (1): Initial checkin for live migration UI support samhenri (1): Live Migration front-end ui/js/src/kimchi.api.js | 3 +- ui/js/src/kimchi.guest_livemigration.js | 145 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.guest_main.js | 47 +++++++++-- ui/pages/guest-migration.html.tmpl | 67 +++++++++++++++ ui/pages/guest.html.tmpl | 7 +- ui/pages/i18n.json.tmpl | 2 + ui/pages/tabs/guests.html.tmpl | 4 +- 7 files changed, 261 insertions(+), 14 deletions(-) create mode 100644 ui/js/src/kimchi.guest_livemigration.js create mode 100644 ui/pages/guest-migration.html.tmpl -- 1.9.3

3 4

[PATCH] [Kimchi 0/2] Live Migration v6
by sguimaraes943＠gmail.com 22 Jan '16

22 Jan '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> v5 - Rebased initial checkin for live migration to new-ui; - Added form validation to optional fields (e.g. disable submit button if username is filled but password is empty, added warn classes to form fields); - Fixed error messages in modal window; - Delete VM once Live Migration is finished checkbox is working; v6 - wok.window.close() destroys modal content when called. Before sending the necessary parameters to perform a migration to Kimchi API, all the input values including the "Delete..." checkbox had to be stored in an array including the VM name and then called a function to keep track of the ongoing tasks and verify if the VM should be deleted based on the checkbox value. - Rewrote most of the JS in kimchi.guest_livemigration.js - Fixed asynchronous live migration proccess. - Fixed some minor issues with Guests main page when Cloning, Creating and Migrating VMs (this wasn't listed as a bug nor enhancement on Github but it had to be fixed in order to show "Migrating..." text on the Action button for List and Gallery views) - Small change in SCSS and CSS to fix Action button. - Now when a VM is migrating it is removed from the list and attached to the top just like when it is cloning or creating a new VM. In order to keep the migrating guest in the same position it would require other js libraries or more prototype functions just to handle the arrays in this screen. - Had to change a line in /models/vms.py because getTasksByFilter() wasn't working when trying to get all the migrating guests by "/plugins/kimchi/vms/.+/migrate" Socorro Stoppler (1): Initial checkin for live migration UI support samhenri (1): Live Migration front-end model/vms.py | 2 +- ui/css/kimchi.css | 21 +++-- ui/css/src/modules/_guests.scss | 6 +- ui/js/src/kimchi.api.js | 3 +- ui/js/src/kimchi.guest_livemigration.js | 136 ++++++++++++++++++++++++++++++++ ui/js/src/kimchi.guest_main.js | 58 +++++++++++--- ui/pages/guest-migration.html.tmpl | 67 ++++++++++++++++ ui/pages/guest.html.tmpl | 16 ++-- ui/pages/i18n.json.tmpl | 2 + ui/pages/tabs/guests.html.tmpl | 4 +- 10 files changed, 290 insertions(+), 25 deletions(-) create mode 100644 ui/js/src/kimchi.guest_livemigration.js create mode 100644 ui/pages/guest-migration.html.tmpl -- 1.8.3.1

3 4

[Wok v2] Rotate wok logs
by Ramon Medeiros 22 Jan '16

22 Jan '16

Use logrotate to compress and keep 10 logs of 1MB Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Add logrotate as dependency Fix typo in Copyright Makefile.am | 2 ++ contrib/DEBIAN/control.in | 1 + contrib/Makefile.am | 1 + contrib/wok.spec.fedora.in | 2 ++ contrib/wok.spec.suse.in | 2 ++ contrib/wokd.logrotate | 28 ++++++++++++++++++++++++++++ 6 files changed, 36 insertions(+) create mode 100644 contrib/wokd.logrotate diff --git a/Makefile.am b/Makefile.am index 278bda1..6d4c574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,8 @@ install-data-local: mkdir -p $(DESTDIR)/etc/wok/ $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem touch $(DESTDIR)/etc/nginx/conf.d/wok.conf + mkdir -p $(DESTDIR)/etc/logrotate.d/ + $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate $(DESTDIR)/etc/logrotate.d/wokd uninstall-local: @if test -f $(systemdsystemunitdir)/wokd.service; then \ diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1f39ad8..e585080 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-ldap, python-psutil (>= 0.6.0), fonts-font-awesome, + logrotate, texlive-fonts-extra Build-Depends: xsltproc, gettext, diff --git a/contrib/Makefile.am b/contrib/Makefile.am index ed4a006..2939bc9 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ wokd-upstart.conf.debian \ wokd-upstart.conf.fedora \ make-deb.sh.in \ + wokd.logrotate \ $(NULL) make-deb.sh: make-deb.sh.in $(top_builddir)/config.status diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in index 34b3ac3..5501a20 100644 --- a/contrib/wok.spec.fedora.in +++ b/contrib/wok.spec.fedora.in @@ -19,6 +19,7 @@ Requires: python-ldap Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: open-sans-fonts +Requires: logrotate BuildRequires: gettext-devel BuildRequires: libxslt BuildRequires: openssl @@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/wok/wok.conf %{_sysconfdir}/wok/ +%{_sysconfdir}/logrotate.d/wokd %{_mandir}/man8/wokd.8.gz %if 0%{?with_systemd} diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index aab4a80..20d7138 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -20,6 +20,7 @@ Requires: nginx Requires: python-psutil >= 0.6.0 Requires: fontawesome-fonts Requires: google-opensans-fonts +Requires: logrotate BuildRequires: gettext-tools BuildRequires: libxslt-tools BuildRequires: openssl @@ -93,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/wok/ %{_sysconfdir}/nginx/conf.d/wok.conf.in %{_sysconfdir}/nginx/conf.d/wok.conf +%{_sysconfdir}/logrotate.d/wokd %{_var}/lib/wok/ %{_localstatedir}/log/wok/* %{_localstatedir}/log/wok/ diff --git a/contrib/wokd.logrotate b/contrib/wokd.logrotate new file mode 100644 index 0000000..0bf575f --- /dev/null +++ b/contrib/wokd.logrotate @@ -0,0 +1,28 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +/var/log/wok/*log { + daily + maxsize 1024k + rotate 10 + missingok + compress + sharedscripts +} + -- 2.1.0

3 3

[RFC] Usage of Bootstrap Switch (http://www.bootstrap-switch.org/) for plugins ginger new ui developments
by Atreye Mukhopadhyay 22 Jan '16

22 Jan '16

Hi All, I would like propose the use of Bootstrap Switch (https://github.com/nostalgiaz/bootstrap-switch) for showing checkbox/radio element in form of switch button .This toggle switch can be used for showing status of certain component in form of switch and trigger action based on the current state. Official Github location of Bootstrap Switch implementation is @ https://github.com/nostalgiaz/bootstrap-switch. Bootstrap Switch code is of license type MIT so I guess it can be used safely. Please feel free to comment on this topic and have your opinion. Thanks & Regards, Atreyee

6 7

[PATCH] [Wok] Set returncode when run_command logging its output
by pvital＠linux.vnet.ibm.com 21 Jan '16

21 Jan '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Call proc.poll() to set and return the returncode attribute of the process that is logging its output into a file. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/wok/utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 2527e77..dfcd978 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -224,15 +224,17 @@ def run_command(cmd, timeout=None, silent=False, tee=None, tee_log(line, tee) out = ''.join(output) error = proc.stderr.read() + returncode = proc.poll() else: out, error = proc.communicate() if out: wok_log.debug("out:\n%s", out) - if proc.returncode != 0: + returncode = proc.returncode + if returncode != 0: msg = "rc: %s error: %s returned from cmd: %s" %\ - (proc.returncode, error, ' '.join(cmd)) + (returncode, error, ' '.join(cmd)) if silent: wok_log.debug(msg) @@ -251,7 +253,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, msg_args = {'cmd': " ".join(cmd), 'seconds': str(timeout)} raise TimeoutExpired("WOKUTILS0002E", msg_args) - return out, error, proc.returncode + return out, error, returncode except TimeoutExpired: raise except OSError as e: -- 2.5.0

4 3

[PATCH v3][Kimchi] Add support for websockify 0.7
by Ramon Medeiros 21 Jan '16

21 Jan '16

The lastest update of websockify changes how the class instantiate WebSocketProxy. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Change variable name Instead of create params dictionary from begining, just append the changes v3: Rebase over last master vnc.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/vnc.py b/vnc.py index 9a25f50..4f94ab2 100644 --- a/vnc.py +++ b/vnc.py @@ -21,12 +21,20 @@ import base64 import errno import os + from multiprocessing import Process from websockify import WebSocketProxy from wok.config import config, paths, PluginPaths +try: + from websockify.token_plugins import TokenFile + tokenFile = True +except ImportError: + tokenFile = False + + WS_TOKENS_DIR = os.path.join(PluginPaths('kimchi').state_dir, 'vnc-tokens') @@ -45,9 +53,16 @@ def new_ws_proxy(): params = {'listen_host': '127.0.0.1', 'listen_port': config.get('server', 'websockets_port'), - 'target_cfg': WS_TOKENS_DIR, 'ssl_only': False} + # old websockify: do not use TokenFile + if not tokenFile: + params['target_cfg'] = WS_TOKENS_DIR + + # websockify 0.7 and higher: use TokenFile + else: + params['token_plugin'] = TokenFile(src=WS_TOKENS_DIR) + def start_proxy(): server = WebSocketProxy(**params) server.start_server() -- 2.1.0

2 1

[PATCH v2][Kimchi] Add support for websockify 0.7
by Ramon Medeiros 20 Jan '16

20 Jan '16

The lastest update of websockify changes how the class instantiate WebSocketProxy. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Change variable name Instead of create params dictionary from begining, just append the changes vnc.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/vnc.py b/vnc.py index 1a2e59d..f866126 100644 --- a/vnc.py +++ b/vnc.py @@ -21,12 +21,20 @@ import base64 import errno import os + from multiprocessing import Process from websockify import WebSocketProxy from wok.config import config, paths, PluginPaths +try: + from websockify.token_plugins import TokenFile + tokenFile = True +except ImportError: + tokenFile = False + + WS_TOKENS_DIR = os.path.join(PluginPaths('kimchi').state_dir, 'vnc-tokens') @@ -45,9 +53,16 @@ def new_ws_proxy(): params = {'web': os.path.join(paths.ui_dir, 'pages/websockify'), 'listen_port': config.get('display', 'display_proxy_port'), - 'target_cfg': WS_TOKENS_DIR, 'key': key, 'cert': cert, 'ssl_only': True} + # old websockify: do not use TokenFile + if not tokenFile: + params['target_cfg'] = WS_TOKENS_DIR + + # websockify 0.7 and higher: use TokenFile + else: + params['token_plugin'] = TokenFile(src=WS_TOKENS_DIR) + def start_proxy(): server = WebSocketProxy(**params) server.start_server() -- 2.1.0

1 0

[PATCH] [Kimchi 0/3 V2] Start up websockify on localhost
by Aline Manera 20 Jan '16

20 Jan '16

This patch set depends on Wok patch: [PATCH] [Wok 0/6] Configure nginx to proxy connections to the websocket server V1 -> V2: - Update spec files to add the all the docs/ directory content Aline Manera (2): Update /plugins/kimchi/config API to only return information related to Kimchi Update README Rob Lemley (1): Start up websockify on localhost contrib/kimchi.spec.fedora.in | 6 +- contrib/kimchi.spec.suse.in | 6 +- docs/API.md | 3 +- docs/Makefile.am | 10 +- docs/README.md | 239 +++++++++-------------------------- docs/fedora-deps.md | 53 ++++++++ docs/kimchi-guest.png | Bin 192281 -> 0 bytes docs/kimchi-guests.png | Bin 0 -> 55954 bytes docs/kimchi-login.png | Bin 318041 -> 0 bytes docs/kimchi-templates.png | Bin 329678 -> 60887 bytes docs/opensuse-deps.md | 48 +++++++ docs/ubuntu-deps.md | 34 +++++ docs/wok-login.png | Bin 0 -> 20140 bytes model/config.py | 10 +- tests/test_rest.py | 4 +- ui/js/src/kimchi.api.js | 29 ++--- ui/spice-html5/pages/spice_auto.html | 2 +- vnc.py | 8 +- 18 files changed, 222 insertions(+), 230 deletions(-) create mode 100644 docs/fedora-deps.md delete mode 100644 docs/kimchi-guest.png create mode 100644 docs/kimchi-guests.png delete mode 100644 docs/kimchi-login.png create mode 100644 docs/opensuse-deps.md create mode 100644 docs/ubuntu-deps.md create mode 100644 docs/wok-login.png -- 2.5.0

2 6

[PATCH] [Wok 0/6] Configure nginx to proxy connections to the websocket server
by Aline Manera 20 Jan '16

20 Jan '16

Aline Manera (5): Wok config: move websockets port setting to [server] section Remove websockify/console.html from Wok Split API documentation into multiple files Create /config API to return the Wok server configuration Update README Rob Lemley (1): Configure nginx to proxy connections to the websocket server configure.ac | 4 +- docs/API.md | 76 ---------------- docs/API/Makefile.am | 22 +++++ docs/API/README.md | 43 +++++++++ docs/API/config.md | 27 ++++++ docs/API/plugins.md | 13 +++ docs/API/tasks.md | 45 ++++++++++ docs/Makefile.am | 10 +-- docs/README.md | 189 ++++++++------------------------------- docs/fedora-deps.md | 48 ++++++++++ docs/opensuse-deps.md | 32 +++++++ docs/troubleshooting.md | 30 +++++++ docs/ubuntu-deps.md | 32 +++++++ src/firewalld.xml | 1 - src/nginx/wok.conf.in | 20 ++++- src/wok.conf.in | 7 +- src/wok/config.py.in | 5 +- src/wok/control/config.py | 31 +++++++ src/wok/model/config.py | 34 +++++++ src/wok/proxy.py | 5 +- src/wokd.in | 4 + tests/test_api.py | 57 ++++++++++++ tests/utils.py | 6 +- ui/pages/Makefile.am | 4 +- ui/pages/websockify/Makefile.am | 22 ----- ui/pages/websockify/console.html | 25 ------ 26 files changed, 493 insertions(+), 299 deletions(-) delete mode 100644 docs/API.md create mode 100644 docs/API/Makefile.am create mode 100644 docs/API/README.md create mode 100644 docs/API/config.md create mode 100644 docs/API/plugins.md create mode 100644 docs/API/tasks.md create mode 100644 docs/fedora-deps.md create mode 100644 docs/opensuse-deps.md create mode 100644 docs/troubleshooting.md create mode 100644 docs/ubuntu-deps.md create mode 100644 src/wok/control/config.py create mode 100644 src/wok/model/config.py create mode 100644 tests/test_api.py delete mode 100644 ui/pages/websockify/Makefile.am delete mode 100644 ui/pages/websockify/console.html -- 2.5.0

2 10

[Kimchi] Add support for websockify 0.7
by Ramon Medeiros 20 Jan '16

20 Jan '16

The lastest update of websockify changes how the class instantiate WebSocketProxy. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- vnc.py | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/vnc.py b/vnc.py index 1a2e59d..00069d5 100644 --- a/vnc.py +++ b/vnc.py @@ -21,12 +21,20 @@ import base64 import errno import os + from multiprocessing import Process from websockify import WebSocketProxy from wok.config import config, paths, PluginPaths +websockifyOld = False +try: + from websockify.token_plugins import TokenFile +except ImportError: + websockifyOld = True + + WS_TOKENS_DIR = os.path.join(PluginPaths('kimchi').state_dir, 'vnc-tokens') @@ -43,10 +51,21 @@ def new_ws_proxy(): cert = '%s/wok-cert.pem' % paths.conf_dir key = '%s/wok-key.pem' % paths.conf_dir - params = {'web': os.path.join(paths.ui_dir, 'pages/websockify'), - 'listen_port': config.get('display', 'display_proxy_port'), - 'target_cfg': WS_TOKENS_DIR, - 'key': key, 'cert': cert, 'ssl_only': True} + # old websockify: do not use TokenFile + if websockifyOld: + params = {'web': os.path.join(paths.ui_dir, 'pages/websockify'), + 'listen_port': config.get('display', 'display_proxy_port'), + 'target_cfg': WS_TOKENS_DIR, + 'key': key, 'cert': cert, 'ssl_only': True} + + # websockify 0.7 and higher: use TokenFile + else: + token_plugin = TokenFile(src=WS_TOKENS_DIR) + + params = {'web': os.path.join(paths.ui_dir, 'pages/websockify'), + 'listen_port': config.get('display', 'display_proxy_port'), + 'token_plugin': token_plugin, + 'key': key, 'cert': cert, 'ssl_only': True} def start_proxy(): server = WebSocketProxy(**params) -- 2.1.0

2 1

[PATCH] [Kimchi] Add support to passtrhough 3D graphic controllers
by Jose Ricardo Ziviani 20 Jan '16

20 Jan '16

- Any graphic controller is being blacklisted for PCI Passthrough by Kimchi. However, newer cards is supported by qemu/libvirt. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/hostdev.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/model/hostdev.py b/model/hostdev.py index 93c47d3..c9d9876 100644 --- a/model/hostdev.py +++ b/model/hostdev.py @@ -58,13 +58,14 @@ def _get_dev_info_tree(dev_infos): def _is_pci_qualified(pci_dev): # PCI bridge is not suitable to passthrough - # KVM does not support passthrough graphic card now + # KVM does not support passthrough graphic card now but supports + # 3D controller blacklist_classes = (0x030000, 0x060000) with open(os.path.join(pci_dev['path'], 'class')) as f: pci_class = int(f.readline().strip(), 16) - if pci_class & 0xff0000 in blacklist_classes: + if pci_class != 0x030200 and pci_class & 0xff0000 in blacklist_classes: return False return True -- 1.9.1

2 1

[RFC V2] Allow user to specify max virtual cpus in template and guest
by Lucio Correia 19 Jan '16

19 Jan '16

Proposal -------- Allow user to specify the maximum number of virtual cpus for a template or guest (when this one is offline - not running). Changes required ---------------- 1) Backend A) Add "maxvcpus" optional field to both template and guest APIs Restrictions to be implemented on this value: - must be a positive integer - must be equal to sockets * cores * threads - must be less than or equal the maximum number of virtual cpus supported by hypervisor If not specified, the default value for maxvcpus will be the equivalent to cpus. B) Change the way number of sockets is calculated: topology: cores=2 , threads=2 (specified by user) maximum number of virtual cpus guest can use = 100 (specified by user) cpus assigned to guest = 4 (specified by user) number of virtual cpus per socket: cores * threads = 4 (from topology) maximum number of sockets guest can have = int(100/4) = 25 maximum number of virtual cpus guest can use = 4 * 25 = 100 That would result in: <vcpu placement='static' current='4'>100</vcpu> <cpu> <topology sockets='25' cores='2' threads='2'/> </cpu> C) Update/Add unit tests 2) Frontend A) Edit Template, at "Processor" tab: - change the current "CPU number" field to a -[]+ input field (increase/decrease) - add a new -[]+ input field "Max CPU number" (increase/decrease) for user input of "max virtual CPUs". Restrictions from 1.A) apply here. Despite it's in a different place, we may use a "More Options" artifact similar to the one proposed by Rodrigo Trujillo at "[RFC][Kimchi] Guest Max memory setup and update", to keep the same format. B) Edit Guest, at "General" tab: - add a new -[]+ input field "Max CPUs" (increase/decrease in terms of core * threads) for user input of "max virtual CPUs". This new field is only enabled if guest is not running. Restrictions from 1.A) apply here. Let me know if any questions/doubts. Thanks, -- Lucio Correia Software Engineer IBM LTC Brazil

1 0

[Kimchi] Add opensuse LEAP to remote ISOs
by Ramon Medeiros 19 Jan '16

19 Jan '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- distros.d/opensuse.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/distros.d/opensuse.json b/distros.d/opensuse.json index f51de97..7df2d86 100644 --- a/distros.d/opensuse.json +++ b/distros.d/opensuse.json @@ -19,5 +19,12 @@ "os_arch": "x86_64", "os_version": "13.2", "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/13.2/iso/openSUSE-13.…" + }, + { + "name": "opensuse-42.1", + "os_distro": "opensuse", + "os_arch": "x86_64", + "os_version": "42.1", + "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/leap/42.1/iso/openSUS…" } ] -- 2.1.0

2 2

[Kimchi] Issue #816: kimchi.conf isn't pointing to libvirt service on ubuntu 15.10
by Ramon Medeiros 19 Jan '16

19 Jan '16

Ubuntu uses libvirt service as libvirt-bin, not libvirtd. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 6 +++++- contrib/kimchid.service.ubuntu | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 contrib/kimchid.service.ubuntu diff --git a/Makefile.am b/Makefile.am index 1c5af68..b8e952e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -139,7 +139,11 @@ ChangeLog: install-data-local: @if test -d "$(systemdsystemunitdir)" ; then \ mkdir -p $(DESTDIR)/etc/systemd/system/wokd.service.d; \ - $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ + if test -f /etc/debian_version; then \ + $(INSTALL_DATA) contrib/kimchid.service.ubuntu $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ + else \ + $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ + fi; \ fi; \ $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/kimchi/ $(MKDIR_P) $(DESTDIR)$(kimchidir) diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu new file mode 100644 index 0000000..1c7d63f --- /dev/null +++ b/contrib/kimchid.service.ubuntu @@ -0,0 +1,7 @@ +[Unit] +Requires=libvirt-bin.service wokd.service +After=libvirt-bin.service wokd.service + +[Service] +Nice=0 +PrivateTmp=yes -- 2.1.0

2 2

[PATCH V2] [Wok] Adding typeahead library to wok
by peterpnns＠gmail.com 19 Jan '16

19 Jan '16

From: peterpennings <peterpnns(a)gmail.com> This library is necessary to replace wok.comboBox() in iSCSI Server and target when defining a new storage pool and when loading sysmodules in Ginger. V2 = Fixed header message peterpennings (1): Adding typeahead library to wok configure.ac | 1 + ui/libs/Makefile.am | 2 +- ui/libs/typeahead/LICENSE | 19 +++++++++++++++++++ ui/libs/typeahead/Makefile.am | 20 ++++++++++++++++++++ ui/libs/typeahead/typeahead.bundle.min.js | 8 ++++++++ ui/pages/wok-ui.html.tmpl | 1 + 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 ui/libs/typeahead/LICENSE create mode 100644 ui/libs/typeahead/Makefile.am create mode 100644 ui/libs/typeahead/typeahead.bundle.min.js -- 1.9.1

3 4

[PATCH] [Wok] Allow wok.form.js to support "number" inputs
by peterpnns＠gmail.com 19 Jan '16

19 Jan '16

From: peterpennings <peterpnsn(a)gmail.com> This patch adds "number" input type support to wok forms. This can be seen in edit guests after applying memory hot plug patch. peterpennings (1): Allow wok.form.js to support number inputs ui/js/src/wok.form.js | 3 +++ 1 file changed, 3 insertions(+) -- 2.5.0

3 3

[PATCH V2] [Wok] Allow wok.form.js to support number inputs
by peterpnns＠gmail.com 19 Jan '16

19 Jan '16

From: peterpennings <peterpnns(a)gmail.com> V2 fixed js sintax after review peterpennings (1): Allow wok.form.js to support number inputs ui/js/src/wok.form.js | 1 + 1 file changed, 1 insertion(+) -- 2.5.0

3 3

[RFC] Allow user to specify max virtual cpus in template and guest
by Lucio Correia 19 Jan '16

19 Jan '16

Current State ------------- Currently we have the following values defined for a KVM guest created by Kimchi: <vcpu placement='static' current='4'>252</vcpu> <cpu> <topology sockets='63' cores='2' threads='2'/> </cpu> User specifies the processor topology (optional) and the number of virtual CPUs and sockets are calculated by Kimchi based on maximum supported by the hypervisor (varies with distro) this way: maximum number of virtual cpus supported = 255 (taken from hypervisor) processor topology: cores=2 , threads=2 (optionally specified by user) number of virtual cpus per socket: cores * threads = 4 (from topology) maximum number of sockets guest can have = int(255/4) = 63 maximum number of virtual cpus guest can use = 4 * 63 = 252 Proposal -------- Allow user to specify the maximum number of virtual cpus for a template or guest (when this one is offline - not running). Changes required ---------------- 1) Backend A) Add "maxvcpus" optional field to both template and guest APIs Restrictions to be implemented on this value: - must be a positive integer - must be a multiple of (cores * threads) - must be less than or equal the maximum number of virtual cpus supported by hypervisor If not specified, the default value for maxvcpus will be the equivalent to one socket (that is, core * threads). B) Change the way number of sockets is calculated: maximum number of virtual cpus supported = 255 (taken from hypervisor) topology: cores=2 , threads=2 (specified by user) maximum number of virtual cpus guest can use = 100 (specified by user) number of virtual cpus per socket: cores * threads = 4 (from topology) maximum number of sockets guest can have = int(100/4) = 25 maximum number of virtual cpus guest can use = 4 * 25 = 100 That would result in: <vcpu placement='static' current='4'>100</vcpu> <cpu> <topology sockets='25' cores='2' threads='2'/> </cpu> C) Update/Add unit tests 2) Frontend A) Edit Template, at "Processor" tab: - change the current "CPU number" field to a -[]+ input field (increase/decrease) - add a new -[]+ input field "Max CPU number" (increase/decrease) for user input of "max virtual CPUs". Restrictions from 1.A) apply here. Despite it's in a different place, we may use a "More Options" artifact similar to the one proposed by Rodrigo Trujillo at "[RFC][Kimchi] Guest Max memory setup and update", to keep the same format. B) Edit Guest, at "General" tab: - add a new -[]+ input field "Max CPUs" (increase/decrease in terms of core * threads) for user input of "max virtual CPUs". This new field is only enabled if guest is not running. Restrictions from 1.A) apply here. Let me know your thoughts. Thanks, -- Lucio Correia Software Engineer IBM LTC Brazil

3 3

[PATCH] [Kimchi 0/3] Start up websockify on localhost
by Aline Manera 18 Jan '16

18 Jan '16

This patch set depends on Wok patch: [PATCH] [Wok 0/6] Configure nginx to proxy connections to the websocket server Aline Manera (2): Update /plugins/kimchi/config API to only return information related to Kimchi Update README Rob Lemley (1): Start up websockify on localhost docs/API.md | 3 +- docs/Makefile.am | 10 +- docs/README.md | 239 +++++++++-------------------------- docs/fedora-deps.md | 53 ++++++++ docs/kimchi-guest.png | Bin 192281 -> 0 bytes docs/kimchi-guests.png | Bin 0 -> 55954 bytes docs/kimchi-login.png | Bin 318041 -> 0 bytes docs/kimchi-templates.png | Bin 329678 -> 60887 bytes docs/opensuse-deps.md | 48 +++++++ docs/ubuntu-deps.md | 34 +++++ docs/wok-login.png | Bin 0 -> 20140 bytes model/config.py | 10 +- tests/test_rest.py | 4 +- ui/js/src/kimchi.api.js | 29 ++--- ui/spice-html5/pages/spice_auto.html | 2 +- vnc.py | 8 +- 16 files changed, 220 insertions(+), 220 deletions(-) create mode 100644 docs/fedora-deps.md delete mode 100644 docs/kimchi-guest.png create mode 100644 docs/kimchi-guests.png delete mode 100644 docs/kimchi-login.png create mode 100644 docs/opensuse-deps.md create mode 100644 docs/ubuntu-deps.md create mode 100644 docs/wok-login.png -- 2.5.0

1 3

[PATCH] [Kimchi] Fix issue #810
by Lucio Correia 18 Jan '16

18 Jan '16

Add an error message asking user to disable NetworkManager. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 1 + model/config.py | 2 ++ model/networks.py | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/i18n.py b/i18n.py index 7a72a86..a575922 100644 --- a/i18n.py +++ b/i18n.py @@ -273,6 +273,7 @@ messages = { "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), "KCHNET0026E": _("Open VSwitch bridges can only host bridged networks."), + "KCHNET0027E": _("Unable to create bridge with NetworkManager enabled. Disable it and try again."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/model/config.py b/model/config.py index e552edb..5a26957 100644 --- a/model/config.py +++ b/model/config.py @@ -54,6 +54,7 @@ class CapabilitiesModel(object): self.libvirt_stream_protocols = [] self.fc_host_support = False self.kernel_vfio = False + self.nm_running = False self.mem_hotplug_support = False # Subscribe function to set host capabilities to be run when cherrypy @@ -90,6 +91,7 @@ class CapabilitiesModel(object): self.nfs_target_probe = FeatureTests.libvirt_support_nfs_probe(conn) self.fc_host_support = FeatureTests.libvirt_support_fc_host(conn) self.kernel_vfio = FeatureTests.kernel_support_vfio() + self.nm_running = FeatureTests.is_nm_running() self.mem_hotplug_support = FeatureTests.has_mem_hotplug_support(conn) self.libvirt_stream_protocols = [] diff --git a/model/networks.py b/model/networks.py index bfe8d2a..fba181f 100644 --- a/model/networks.py +++ b/model/networks.py @@ -32,6 +32,7 @@ from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork +from wok.plugins.kimchi.model.config import CapabilitiesModel from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml @@ -49,6 +50,8 @@ class NetworksModel(object): if self.conn.isQemuURI(): self._check_default_networks() + self.caps = CapabilitiesModel(**kargs) + def _check_default_networks(self): networks = list(set(tmpl_defaults['networks'])) conn = self.conn.get() @@ -192,6 +195,11 @@ class NetworksModel(object): # User wants Linux bridge network, but didn't specify bridge interface elif params['connection'] == "bridge": + + # libvirt will fail to create bridge if NetworkManager is enabled + if self.caps.nm_running: + raise InvalidParameter('KCHNET0027E') + # create Linux bridge interface first and use it as actual iface iface = self._create_linux_bridge(iface) params['bridge'] = iface -- 1.9.1

3 2

[Wok] Fix suse rpm build
by Ramon Medeiros 18 Jan '16

18 Jan '16

Suse was not being built on suse, due missing parameter %configure on %build section. Just added it Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- contrib/wok.spec.suse.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 20d7138..9e6b7f2 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -41,6 +41,7 @@ Wok is Webserver Originated from Kimchi. %setup %build +%configure make %install -- 2.1.0

3 2

[Wok v2] Fix suse rpm build
by Ramon Medeiros 18 Jan '16

18 Jan '16

Wok was not being built on suse, due missing parameter %configure on %build section. Just added it. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Fix typo contrib/wok.spec.suse.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in index 20d7138..9e6b7f2 100644 --- a/contrib/wok.spec.suse.in +++ b/contrib/wok.spec.suse.in @@ -41,6 +41,7 @@ Wok is Webserver Originated from Kimchi. %setup %build +%configure make %install -- 2.1.0

2 1

[PATCH] [Ginger] Sysmodules (SRIOV) tab initial implementation
by andreteodoro.work＠gmail.com 14 Jan '16

14 Jan '16

From: Andre Teodoro <andreteodoro.work(a)gmail.com> Andre Teodoro (1): Sysmodules (SRIOV) tab initial implementation ui/config/tab-ext.xml | 23 +- ui/css/ginger.css | 209 +++++++- ui/css/src/ginger.scss | 70 ++- ui/css/src/modules/_sysmodules.scss | 126 +++++ ui/js/host-sysmodules.js | 76 +++ ui/js/util.js | 871 ++++++++++++++++---------------- ui/pages/tabs/host-sysmodules.html.tmpl | 88 ++++ 7 files changed, 1012 insertions(+), 451 deletions(-) create mode 100644 ui/css/src/modules/_sysmodules.scss create mode 100644 ui/js/host-sysmodules.js create mode 100644 ui/pages/tabs/host-sysmodules.html.tmpl -- 1.8.3.1

2 2

[PATCH 1/2 - v2][wok] Limit number of backup log files and make it configurable
by Rodrigo Trujillo 13 Jan '16

13 Jan '16

Currently Wok is configured to keep up to 1000 log files of 10MB, this behavior makes Wok/Kimchi log space become huge (up to 20GB, for error and access logs). This patch changes the configuration, limiting the number of stored log files to 10. So space required in the system will be up to 200MB. It also adds log_backup_count property to /etc/wok.conf, allowing users to change this value if necessary. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok.conf.in | 3 +++ src/wok/config.py.in | 2 ++ src/wok/server.py | 6 ++++-- src/wokd.in | 2 ++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/wok.conf.in b/src/wok.conf.in index 60d826f..5e86ff8 100644 --- a/src/wok.conf.in +++ b/src/wok.conf.in @@ -43,6 +43,9 @@ # Logging level: debug, info, warning, error or critical #log_level = debug +# Log files backup count. The number of old log files to keep in the system +# log_backup_count = 10 + [display] # Port for websocket proxy to listen on #display_proxy_port = 64667 diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 0c83812..342e80b 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -29,6 +29,7 @@ __release__ = "@wokrelease@" CACHEEXPIRES = 31536000 # expires is one year. DEFAULT_LOG_LEVEL = "debug" +DEFAULT_LOG_BACKUP_COUNT = 10 FONT_FILES = {'fontawesome': ['fontawesome-webfont.ttf'], 'opensans': ['OpenSans-ExtraBoldItalic.ttf', @@ -247,6 +248,7 @@ def _get_config(): config.add_section("logging") config.set("logging", "log_dir", paths.log_dir) config.set("logging", "log_level", DEFAULT_LOG_LEVEL) + config.set("logging", "log_backup_count", str(DEFAULT_LOG_BACKUP_COUNT)) config.add_section("display") config.set("display", "display_proxy_port", "64667") diff --git a/src/wok/server.py b/src/wok/server.py index 59ecdc0..53af12a 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -101,7 +101,8 @@ class Server(object): # Create handler to rotate access log file h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + 10000000, + options.log_backup_count) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) @@ -110,7 +111,8 @@ class Server(object): # Create handler to rotate error log file h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + 10000000, + options.log_backup_count) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) diff --git a/src/wokd.in b/src/wokd.in index c5510fd..ac43df6 100644 --- a/src/wokd.in +++ b/src/wokd.in @@ -94,6 +94,8 @@ def main(options): setattr(options, 'ssl_key', config.config.get('server', 'ssl_key')) setattr(options, 'max_body_size', config.config.get('server', 'max_body_size')) + setattr(options, 'log_backup_count', + config.config.get('logging', 'log_backup_count')) wok.server.main(options) -- 2.1.0

4 4

[PATCH] [WoK] utils.py: run_command runs in an en_US environment by default
by dhbarboza82＠gmail.com 13 Jan '16

13 Jan '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This requirement started in a fixed Gingerbase bug (#18) that reported lscpu problems when running in a French environment. The output was being translated to french and breaking the parsing made by the backend. This is such a powder keg for all the plug-ins that I believe this patch is justified. Instead of forcing en_US language by using subprocess.Popen and setting the env, this is how run_command will behave now: - A new optional attribute, env_vars, was added. As the name suggests, it allows the setup of the environment variables to run the command. - If env_vars is not set, run_command will copy the current environment variables and set the language to the default (en_US) by setting LC_ALL='C' variable. As of now, this is the case of all the existing run_command calls in the code for all WoK plug-ins. No behavior change will happen. - If env_vars is set, but the LC_ALL var isn't, run_command will set it to 'C' and force the default language. - If env_vars is set and LC_ALL is also set, run_command will not touch it and will run with env_vars as is. This allows the caller to set the language at will. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/wok/utils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index 05574d7..af534ec 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -136,7 +136,8 @@ def import_module(module_name, class_name=''): return __import__(module_name, globals(), locals(), [class_name]) -def run_command(cmd, timeout=None, silent=False, tee=None): +def run_command(cmd, timeout=None, silent=False, tee=None, + env_vars=None): """ cmd is a sequence of command arguments. timeout is a float number in seconds. @@ -184,9 +185,15 @@ def run_command(cmd, timeout=None, silent=False, tee=None): timer = None timeout_flag = [False] + if env_vars is None: + env_vars = os.environ.copy() + env_vars['LC_ALL'] = 'C' + elif env_vars.get('LC_ALL') is None: + env_vars['LC_ALL'] = 'C' + try: proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE, env=env_vars) if timeout is not None: timer = Timer(timeout, kill_proc, [proc, timeout_flag]) timer.setDaemon(True) -- 2.5.0

3 2

[PATCH][wok] Limit number of log files kept in the system to 10
by Rodrigo Trujillo 13 Jan '16

13 Jan '16

Currently Wok is configured to keep up to 1000 log files of 10MB, this behavior makes Wok/Kimchi log space become huge (up to 20GB, for error and access logs). This patch changes the configuration, limiting the number of stored log files to 10. So space required in the system will be up to 200MB. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/server.py b/src/wok/server.py index 59ecdc0..8ac67a1 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -101,7 +101,7 @@ class Server(object): # Create handler to rotate access log file h = logging.handlers.RotatingFileHandler(options.access_log, 'a', - 10000000, 1000) + 10000000, 10) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) @@ -110,7 +110,7 @@ class Server(object): # Create handler to rotate error log file h = logging.handlers.RotatingFileHandler(options.error_log, 'a', - 10000000, 1000) + 10000000, 10) h.setLevel(logLevel) h.setFormatter(cherrypy._cplogging.logfmt) -- 2.1.0

3 3

[PATCH] [Wok] Adding typeahead library to wok
by peterpnns＠gmail.com 12 Jan '16

12 Jan '16

From: peterpennings <peterpnns(a)gmail.com> This library is necessary to replace wok.comboBox() in iSCSI Server and target when defining a new storage pool and when loading sysmodules in Ginger. peterpennings (1): Adding typeahead library to wok configure.ac | 1 + ui/libs/Makefile.am | 2 +- ui/libs/typeahead/LICENSE | 19 +++++++++++++++++++ ui/libs/typeahead/Makefile.am | 22 ++++++++++++++++++++++ ui/libs/typeahead/typeahead.bundle.min.js | 8 ++++++++ ui/pages/wok-ui.html.tmpl | 1 + 6 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 ui/libs/typeahead/LICENSE create mode 100644 ui/libs/typeahead/Makefile.am create mode 100644 ui/libs/typeahead/typeahead.bundle.min.js -- 1.9.1

2 2

Re: [Kimchi-devel] Guest disk: Allocate storage volume when attaching disk to vm
by Aline Manera 12 Jan '16

12 Jan '16

Adding Samuel and Andre to this discussion and also forward to Kimchi ML. On 16/11/2015 14:21, Aline Manera wrote: > > Hi Socorro, > > On 12/11/2015 21:20, Socorro Stoppler wrote: >> Hi Aline, >> >> I chatted w/Paulo about the UI portion of this. He stated that the >> user has the option to select to add a new volume (in which the the >> UI must execute two requests: one to create a volume, and other to >> attach the new volume to the guest being edited). So in this screen >> (I know it's the old UI but this shows better than current new UI :)): >> >> >> >> What do you think of 3. being radio buttons? - > > I think 2 should be that radio buttons. > > So: > > 1. Device type > <disk> > > 2. ( ) Create a new disk image > > ( ) Select existing disk image > > 3. Storage pool > <pools> > > 4. Capacity or Volume (depends on selection on 2.) > > Below is how virt-manage does it. > > > >> <New Volume> - >> Volume: Storage volume name of 'new_vol' --- we prob do not >> need to show this in the UI, right? >> Capacity: in bytes >> Format: qcow2 -- is this the only option we want to provide? >> <Create Button> >> >> <Existing Volume> - which consists of current combobox above >> >> Also, if user selects to do the new volume, then created it, but >> decided that they didn't want to attach it, is that ok? Not sure of >> the different scenarios we have >> or if I'm totally missing the intent here. >> >> Let me know if you had envisioned something else for this UI. >> >> Thanks >> -Socorro >> >> >

3 4

[PATCH] [Wok] Fix dependence name of the python-pip package.
by pvital＠linux.vnet.ibm.com 07 Jan '16

07 Jan '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- docs/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index 4d719f3..4c0009d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -66,7 +66,7 @@ Install Dependencies $ sudo yum install pyflakes python-pep8 python-requests # For UI development - $ sudo yum install gcc-c++ python-devel python pip + $ sudo yum install gcc-c++ python-devel python-pip $ sudo pip install cython libsass *Note for RHEL users*: Some of the above packages are located in the Red Hat @@ -94,7 +94,7 @@ channel at RHN Classic or Red Hat Satellite. $ sudo apt-get install pep8 pyflakes python-requests # For UI development - $ sudo apt-get install g++ python-dev python pip + $ sudo apt-get install g++ python-dev python-pip $ sudo pip install cython libsass **For openSUSE:** @@ -113,7 +113,7 @@ channel at RHN Classic or Red Hat Satellite. $ sudo zypper install python-pyflakes python-pep8 python-requests # For UI development - $ sudo zypper install gcc-c++ python-devel python pip + $ sudo zypper install gcc-c++ python-devel python-pip $ sudo pip install cython libsass Build and Install -- 2.5.0

5 5

[PATCH v2] [Wok] Added disabled and readonly states to Bootstrap Select
by sguimaraes943＠gmail.com 07 Jan '16

07 Jan '16

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch fixes readonly and disabled states for Bootstrap Select elements initialized by selectpicker() in the UI. You can spot this changes in action when editing a Template if you apply "Fixed minor UI issues when saving edited template". v2 - Included correct files + compiled CSS file samhenri (1): Added disabled and readonly states to Bootstrap Select ui/css/bootstrap-select.custom.css | 28 ++++++++++++++++++++++++++++ ui/css/src/bootstrap-select.custom.scss | 18 ++++++++++++++++++ 2 files changed, 46 insertions(+) -- 1.9.3

5 6