- Kimchi-devel - oVirt List Archives

Scrum meeting time
by Aline Manera 15 Feb '16

15 Feb '16

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

1 0

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

15 Feb '16

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

1 1

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

15 Feb '16

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

4 5

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

15 Feb '16

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

2 11

[PATCH] [Kimchi 0/2] Add graphics merging to template update
by Lucio Correia 12 Feb '16

12 Feb '16

Lucio Correia (2): Add graphics settings merge to template update Update tests model/templates.py | 7 +++++++ tests/test_template.py | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) -- 1.9.1

2 3

[PATCH v2] [Kimchi] test_mock_network.py: fixes due to backend changes
by dhbarboza82＠gmail.com 12 Feb '16

12 Feb '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch makes the following improvements in test_vlag_tag_bridge: - fixed connection type. Recent backend changes do not allow for connection='macvtap' and 'vlan_id' to be sent together. - added Network Manager check. The test can fail randomly if Network Manager is active. - fixed copyright format. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- tests/test_mock_network.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/test_mock_network.py b/tests/test_mock_network.py index 4b0a284..3a9b7b5 100644 --- a/tests/test_mock_network.py +++ b/tests/test_mock_network.py @@ -2,7 +2,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,7 @@ from functools import partial from tests.utils import get_free_port, patch_auth, request, run_server from wok.plugins.kimchi.mockmodel import MockModel +from wok.utils import run_command from test_model_network import _do_network_test @@ -56,11 +57,21 @@ def tearDownModule(): os.unlink('/tmp/obj-store-test') +def is_network_manager_running(): + out, err, rc = run_command(['nmcli', 'dev', 'status']) + if rc != 0: + return False + return True + + class MockNetworkTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) model.reset() + @unittest.skipIf(is_network_manager_running(), + 'test_vlan_tag_bridge skipped because Network ' + 'Manager is running.') def test_vlan_tag_bridge(self): # Verify the current system has at least one interface to create a # bridged network @@ -69,6 +80,6 @@ class MockNetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] - _do_network_test(self, model, {'name': u'macvtap-network', - 'connection': 'macvtap', + _do_network_test(self, model, {'name': u'vlan-tagged-bridge', + 'connection': 'bridge', 'interface': iface, 'vlan_id': 987}) -- 2.5.0

3 2

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

12 Feb '16

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

1 8

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

12 Feb '16

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

2 9

[PATCH] [Kimchi] test_mock_network.py: fixes due to backend changes
by dhbarboza82＠gmail.com 12 Feb '16

12 Feb '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch makes the following improvements in test_vlag_tag_bridge: - fixed connection type. Recent backend changes do not allow for connection='macvtap' and 'vlan_id' to be sent together. - added Network Manager check. The test can fail randomly if Network Manager is active. - fixed copyright format. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- tests/test_mock_network.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/test_mock_network.py b/tests/test_mock_network.py index 4b0a284..d9810f3 100644 --- a/tests/test_mock_network.py +++ b/tests/test_mock_network.py @@ -2,7 +2,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2015 +# Copyright IBM Corp, 2015-2016 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -26,6 +26,7 @@ from functools import partial from tests.utils import get_free_port, patch_auth, request, run_server from wok.plugins.kimchi.mockmodel import MockModel +from wok.utils import run_command from test_model_network import _do_network_test @@ -56,11 +57,21 @@ def tearDownModule(): os.unlink('/tmp/obj-store-test') +def is_network_manager_running(): + out, err, rc = run_command(['nmcli', 'dev', 'status']) + if rc != 0: + return False + return True + + class MockNetworkTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) model.reset() + @unittest.skipIf(is_network_manager_running(), + 'test_vlan_tag_bridge skipped because Network ' + 'Manager is running.') def test_vlan_tag_bridge(self): # Verify the current system has at least one interface to create a # bridged network @@ -70,5 +81,5 @@ class MockNetworkTests(unittest.TestCase): if len(interfaces) > 0: iface = interfaces[0]['name'] _do_network_test(self, model, {'name': u'macvtap-network', - 'connection': 'macvtap', + 'connection': 'bridge', 'interface': iface, 'vlan_id': 987}) -- 2.5.0

3 2

[PATCH] [Wok] Bug fix: Configure nginx to listen on given IP address
by Aline Manera 12 Feb '16

12 Feb '16

The 'host' option was being ignored when launching nginx proxy. That way, the default value - 0.0.0.0 to listen to all interfaces - was being used. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/nginx/wok.conf.in | 4 ++-- src/wok/proxy.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index 85790ff..9ae2530 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -59,7 +59,7 @@ http { } server { - listen ${proxy_ssl_port} ssl; + listen ${host}:${proxy_ssl_port} ssl; ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; @@ -90,7 +90,7 @@ http { } server { - listen ${proxy_port}; + listen ${host}:${proxy_port}; rewrite ^/(.*)$ https://$host:${proxy_ssl_port}/$1 redirect; } } diff --git a/src/wok/proxy.py b/src/wok/proxy.py index f13dede..d508b73 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -81,6 +81,7 @@ def _create_proxy_config(options): data = template.read() data = Template(data) data = data.safe_substitute(user=user_proxy, + host=options.host, proxy_port=options.port, proxy_ssl_port=options.ssl_port, cherrypy_port=options.cherrypy_port, -- 2.5.0

4 4