- Kimchi-devel - oVirt List Archives

[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