- Kimchi-devel - oVirt List Archives

Wok 2.3.1 and Kimchi 2.3.1 are now released!
by Aline Manera 15 Dec '16

15 Dec '16

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Wok 2.3.1* and *Kimchi 2.3.1*! Kimchi 2.3.1 depends on *Wok 2.3.1* and *Ginger Base 2.2.2*! So make sure to have both of them properly installed in your system. We have worked hard to ensure that Wok and Kimchi run well on the most popular Linux distributions including: Fedora 25, Ubuntu 16.10, openSUSE LEAP 42.2, and CentOS 7. They use standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔ https://github.com/kimchi-project/wok/archive/2.3.1.tar.gz ✔ https://github.com/kimchi-project/kimchi/archive/2.3.1.tar.gz ✔ git clone -b stable-2.3.x --recursive https://github.com/kimchi-project/wok.git There are also some packages available for download at: ✔ http://kimchi-project.github.io/wok/downloads/ ✔ http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

1 0

[PATCH v3] [Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 2 +- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index b51abf1..92e155d 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,7 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + user = cherrypy.session.get(USER_NAME, 'N/A') or 'N/A' if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = " " + log.status + " "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

3 2

[PATCH v2 stable][Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 2 +- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 37190dc..49c9589 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,7 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + user = cherrypy.session.get(USER_NAME, 'N/A') or 'N/A' if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = " " + log.status + " "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

2 1

[PATCH] [Kimchi] Use libvirtd service in Ubuntu
by Lucio Correia 14 Dec '16

14 Dec '16

Starting with Ubuntu 16.10, libvirtd is available, so use it to keep the same standard across all distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- contrib/kimchid.service.debian | 8 ++++++++ contrib/kimchid.service.ubuntu | 8 -------- utils.py | 8 +------- 4 files changed, 10 insertions(+), 16 deletions(-) create mode 100644 contrib/kimchid.service.debian delete mode 100644 contrib/kimchid.service.ubuntu diff --git a/Makefile.am b/Makefile.am index 36607a1..3cbc689 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,7 +158,7 @@ install-data-local: @if test -d "$(systemdsystemunitdir)" ; then \ mkdir -p $(DESTDIR)/etc/systemd/system/wok.service.d; \ if test -f /etc/debian_version; then \ - $(INSTALL_DATA) contrib/kimchid.service.ubuntu $(DESTDIR)/etc/systemd/system/wok.service.d/kimchi.conf; \ + $(INSTALL_DATA) contrib/kimchid.service.debian $(DESTDIR)/etc/systemd/system/wok.service.d/kimchi.conf; \ else \ $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/etc/systemd/system/wok.service.d/kimchi.conf; \ fi; \ diff --git a/contrib/kimchid.service.debian b/contrib/kimchid.service.debian new file mode 100644 index 0000000..fc58f6a --- /dev/null +++ b/contrib/kimchid.service.debian @@ -0,0 +1,8 @@ +[Unit] +Requires=wok.service +Wants=libvirtd.service +After=libvirtd.service wok.service + +[Service] +Nice=0 +PrivateTmp=no diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu deleted file mode 100644 index e261942..0000000 --- a/contrib/kimchid.service.ubuntu +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Requires=wok.service -Wants=libvirt-bin.service -After=libvirt-bin.service wok.service - -[Service] -Nice=0 -PrivateTmp=no diff --git a/utils.py b/utils.py index 26d3cf6..1e2c951 100644 --- a/utils.py +++ b/utils.py @@ -20,7 +20,6 @@ import contextlib import json -import platform import re import sqlite3 import time @@ -264,11 +263,6 @@ def is_libvirtd_up(): """ Checks if libvirtd.service is up. """ - distro, _, _ = platform.linux_distribution() - if distro.lower() == 'ubuntu': - cmd = ['systemctl', 'is-active', 'libvirt-bin.service'] - else: - cmd = ['systemctl', 'is-active', 'libvirtd.service'] - + cmd = ['systemctl', 'is-active', 'libvirtd.service'] output, error, rc = run_command(cmd, silent=True) return True if output == 'active\n' else False -- 2.7.4

2 2

[PATCH] [Kimchi] Use libvirtd service in Ubuntu
by Lucio Correia 14 Dec '16

14 Dec '16

Starting with Ubuntu 16.10, libvirtd is available, so use it to keep the same standard across all distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- contrib/kimchid.service.debian | 8 ++++++++ contrib/kimchid.service.ubuntu | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 contrib/kimchid.service.debian delete mode 100644 contrib/kimchid.service.ubuntu diff --git a/Makefile.am b/Makefile.am index a4fa712..68cdac0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,7 +161,7 @@ install-data-local: @if test -d "$(systemdsystemunitdir)" ; then \ mkdir -p $(DESTDIR)/etc/systemd/system/wokd.service.d; \ if test -f /etc/debian_version; then \ - $(INSTALL_DATA) contrib/kimchid.service.ubuntu $(DESTDIR)/etc/systemd/system/wokd.service.d/kimchi.conf; \ + $(INSTALL_DATA) contrib/kimchid.service.debian $(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; \ diff --git a/contrib/kimchid.service.debian b/contrib/kimchid.service.debian new file mode 100644 index 0000000..87a5866 --- /dev/null +++ b/contrib/kimchid.service.debian @@ -0,0 +1,8 @@ +[Unit] +Requires=wokd.service +Wants=libvirtd.service +After=libvirtd.service wokd.service + +[Service] +Nice=0 +PrivateTmp=no diff --git a/contrib/kimchid.service.ubuntu b/contrib/kimchid.service.ubuntu deleted file mode 100644 index e52db66..0000000 --- a/contrib/kimchid.service.ubuntu +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Requires=wokd.service -Wants=libvirt-bin.service -After=libvirt-bin.service wokd.service - -[Service] -Nice=0 -PrivateTmp=no -- 2.7.4

2 1

[PATCH v2] [Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 4 +++- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index b51abf1..0184a48 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,9 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + # cherrypy_user = cherrypy.session.get(USER_NAME, 'N/A') + # user = cherrypy_user if cherrypy_user is not None else "N/A" + user = cherrypy.session.get(USER_NAME, 'N/A') or 'N/A' if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = " " + log.status + " "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

1 0

[PATCH] [Kimchi] Bug fix #1057: Failed to import kimchi
by bianca＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Changed "registerAttachDevicesEvent" in model/libvirtevents.py file to include AttributeError as a exception to make sure kimchi will be running even if this exception is true. Also fixed indentation in vms.py file. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 2 +- model/vms.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index 2dd9904..716420c 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -101,7 +101,7 @@ class LibvirtEvents(object): cb, arg) - except libvirt.libvirtError as e: + except (AttributeError, libvirt.libvirtError), e: wok_log.error("register attach event failed: %s" % e.message) def registerDetachDevicesEvent(self, conn, cb, arg): diff --git a/model/vms.py b/model/vms.py index d703c89..d6f8020 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1108,7 +1108,7 @@ class VMModel(object): def update_cpu_live(self, dom, vcpus): flags = libvirt.VIR_DOMAIN_AFFECT_LIVE | \ - libvirt.VIR_DOMAIN_AFFECT_CONFIG + libvirt.VIR_DOMAIN_AFFECT_CONFIG try: dom.setVcpusFlags(vcpus, flags) except libvirt.libvirtError as e: -- 2.1.4

3 3

[PATCH v2][Kimchi] Bug fix #1026: CentOS: Unable to get and update memory values for a powered off guest
by Ramon Medeiros 14 Dec '16

14 Dec '16

Parse vm memory from xml when it isn't available at dom.info Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Changes: v2: Parse memory before count hotplug devices model/vms.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/model/vms.py b/model/vms.py index 3ea1122..f752271 100644 --- a/model/vms.py +++ b/model/vms.py @@ -105,6 +105,7 @@ XPATH_BOOT = 'os/boot/@dev' XPATH_BOOTMENU = 'os/bootmenu/@enable' XPATH_CPU = './cpu' XPATH_DESCRIPTION = './description' +XPATH_MEMORY = './memory' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' XPATH_SNAP_VM_NAME = './domain/name' @@ -1342,6 +1343,12 @@ class VMModel(object): # Case VM changed currentMemory outside Kimchi, sum mem devs memory = dom.maxMemory() >> 10 curr_mem = (info[2] >> 10) + + # On CentOS, dom.info does not retrieve memory. So, if machine does + # not have memory hotplug, parse memory from xml + if curr_mem == 0: + curr_mem = int(xpath_get_text(xml, XPATH_MEMORY)[0]) >> 10 + if memory != curr_mem: memory = curr_mem + (self._get_mem_dev_total_size(xml) >> 10) -- 2.7.4

2 1

[PATCH] [Kimchi] Bug fix #1057: Failed to import kimchi
by bianca＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> Changed "registerAttachDevicesEvent" in model/libvirtevents.py file to include AttributeError as a exception to make sure kimchi will be running even if this exception is true. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index 2dd9904..716420c 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -101,7 +101,7 @@ class LibvirtEvents(object): cb, arg) - except libvirt.libvirtError as e: + except (AttributeError, libvirt.libvirtError), e: wok_log.error("register attach event failed: %s" % e.message) def registerDetachDevicesEvent(self, conn, cb, arg): -- 2.1.4

3 2

[PATCH] [Wok] Bug fix #144: The filter of of the user activity log shows loading forever
by bianca＠linux.vnet.ibm.com 14 Dec '16

14 Dec '16

From: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> User log data was storing null value to user field, changed the reqlogger.py and wok.user-log.js to make sure both get 'N/A' instead of null. Signed-off-by: Bianca Carvalho <bianca(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 3 ++- ui/js/wok.user-log.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index b51abf1..edddb6e 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -99,7 +99,8 @@ def log_request(code, params, exception, method, status, app=None, user=None, app = cherrypy.request.app.script_name if user is None: - user = cherrypy.session.get(USER_NAME, 'N/A') + cherrypy_user = cherrypy.session.get(USER_NAME, 'N/A') + user = cherrypy_user if cherrypy_user is not None else "N/A" if ip is None: ip = cherrypy.request.remote.ip diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e49e428..fa4945f 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -155,11 +155,15 @@ wok.initUserLogConfigGridData = function() { wok.getUserLogs(function(result) { $.each(result, function(index, log){ var statusLabel = labelStyle(log.status); + var userLabel = labelStyle(log.user); if (statusLabel != null) { log.status = " " + log.status + " "; } else { log.status = ""; } + if (userLabel == null) { + log.user = "N/A"; + } }) wok.loadBootgridData(wok.opts_user_log['gridId'], result); wok.showBootgridData(wok.opts_user_log); -- 2.9.3

2 1