January 2016 - Kimchi-devel - oVirt List Archives

[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