- Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] Bug fix: Inform user there is no interface available when creating a network
by Aline Manera 29 Mar '17

29 Mar '17

When there is no interface available, the user will not be able to create some networks so inform that to user using the existing drop down menu instead of a label message fixed in the dialog (which was displayed even though for network not requiring an interface). Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network_add_main.js | 7 +++---- ui/pages/network-add.html.tmpl | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index e1fdf13..c990e89 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,9 +79,8 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail, bEdit) { if (!bEdit) { kimchi.enableBridgeOptions(false); } - $("#networkBriDisabledLabel").removeClass('hidden'); - } else { - $("#networkBriDisabledLabel").remove(); + $("#destinationList button").addClass("disabled"); + $("#networkDestinationID").attr("title", "No interface available"); } }; diff --git a/ui/pages/network-add.html.tmpl b/ui/pages/network-add.html.tmpl index 14373ff..47be6f3 100644 --- a/ui/pages/network-add.html.tmpl +++ b/ui/pages/network-add.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2015-2016 + * Copyright IBM Corp, 2015-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,11 +46,8 @@ <option value="bridge">$_("Bridged: Virtual machines are connected through a network bridge")</option> </select> </div> - <div id="networkBriDisabledLabel" class="form-group hidden"> - <p>$_("(No interfaces found)")</p> - </div> <div id="bridgedContent"> - <div class="form-group"> + <div id="destinationList" class="form-group"> <label for="networkDestinationID">$_("Destination"): </label> <select id="networkDestinationID" data-size="5" class="selectpicker col-md-12 col-lg-12 form-control" data-none-selected-text="$_('Select an Interface')"> </select> -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix 1119: Proper check NetworkManager is running when creating new network
by Aline Manera 29 Mar '17

29 Mar '17

It was relying on Capabilities to verify NetworkManager was running or not. But the Capabilities value is only updated on lookup() which was leading on a wrong assumption. To fix that, call FeatureTests function directly. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/networks.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/model/networks.py b/model/networks.py index eb1590e..b653b23 100644 --- a/model/networks.py +++ b/model/networks.py @@ -33,7 +33,7 @@ from wok.plugins.gingerbase.netinfo import get_vlan_device, is_bridge, is_vlan from wok.plugins.gingerbase.netinfo import ports from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.config import kimchiPaths -from wok.plugins.kimchi.model.config import CapabilitiesModel +from wok.plugins.kimchi.model.featuretests import FeatureTests 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 @@ -52,8 +52,6 @@ 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.get('networks', []))) @@ -228,7 +226,7 @@ class NetworksModel(object): # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): # libvirt bridge creation will fail with NetworkManager enabled - if self.caps.nm_running: + if FeatureTests.is_nm_running(): raise InvalidParameter('KCHNET0027E') if 'vlan_id' in params: -- 2.9.3

1 1

[PATCH] [WoK] Removing sessionStorage call in wok.main.js
by dhbarboza82＠gmail.com 27 Mar '17

27 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> sessionStorage was being used in early versions of the websocket notifications implementation to avoid opening multiple connections, before the current single permanent connection approach was implemented. If the 'wokNotificationWebSocket' key existed in the sessionStorage, we skipped the opening of a new websocket. This patch removes the sessionStorage usage because it accomplishes nothing in current code. No verification is made using the created 'wokNotificationWebSocket' session key in the code. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 26dc723..411b05e 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -69,7 +69,6 @@ wok.startNotificationWebSocket = function () { } }; - sessionStorage.setItem('wokNotificationWebSocket', 'true'); var heartbeat = setInterval(function() { wok.notificationsWebSocket.send(window.btoa('heartbeat')); }, 30000); -- 2.9.3

2 1

[PATCH] [WoK] Bug fix #189: Forcing download of user log file
by dhbarboza82＠gmail.com 27 Mar '17

27 Mar '17

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> The error in staticfile() happens when the browser tries to open a recently created file in a separated tab/window but this file isn't declared in the cherry-py config with tools.staticfile.on, like '/favicon.ico' for example. A suitable solution to avoid the error is to force the browser to download the file instead of opening it. According to the Cherry-py docs: "Using "application/x-download" response content-type, you can tell a browser that a resource should be downloaded onto the user’s machine rather than displayed." This patch set the application type of all '.txt' files created under the /data/logs dir as 'application/x-download'. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/wok/config.py.in | 3 +++ tests/test_config.py.in | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 677d0ed..c2bcc28 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -202,6 +202,9 @@ class WokConfig(dict): '/data/logs': { 'tools.staticdir.on': True, 'tools.staticdir.dir': '%s/logs' % paths.state_dir, + 'tools.staticdir.content_types': { + 'txt': 'application/x-download' + }, 'tools.nocache.on': False, 'tools.wokauth.on': True, }, diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 9b8c851..a4d65bb 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -84,6 +84,9 @@ class ConfigTests(unittest.TestCase): '/data/logs': { 'tools.staticdir.on': True, 'tools.staticdir.dir': '%s/logs' % paths.state_dir, + 'tools.staticdir.content_types': { + 'txt': 'application/x-download' + }, 'tools.nocache.on': False, 'tools.wokauth.on': True, }, -- 2.9.3

2 1

[PATCH] [Kimchi] Bug fix: Display full Volume dropdown menu content even when pool has few volumes
by Aline Manera 27 Mar '17

27 Mar '17

When the storage pool has one or two storage volumes, the dropdown menu would not display all the options as the height set to it was not enough. To avoid that, increase the min-height configuration. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 6 +++++- ui/css/src/modules/_storage.scss | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 0af9293..2d44919 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2514,11 +2514,15 @@ ul { #storage-root-container .volumes .volumeslist { padding: 22px; - min-height: 136px; + min-height: 188px; max-height: 505px; overflow: hidden; } +#storage-root-container .volumes .volumeslist .wok-list { + min-height: inherit; +} + #storage-root-container .volumes .volumeslist .row { font-size: 0; margin-bottom: 22px; diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss index 70cb3fa..c8b84a9 100644 --- a/ui/css/src/modules/_storage.scss +++ b/ui/css/src/modules/_storage.scss @@ -82,11 +82,15 @@ .volumeslist { padding: 22px; - min-height: 136px; + min-height: 188px; max-height: 505px; overflow: hidden; } + .volumeslist .wok-list { + min-height: inherit; + } + .volumeslist .row { font-size: 0; margin-bottom: 22px; -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix: Proper display storage volume content on gallery view
by Aline Manera 27 Mar '17

27 Mar '17

On Storage volume gallery view, the volume box content was a mess. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 10 +++++----- ui/css/src/modules/_storage.scss | 10 +++++----- ui/pages/tabs/storage.html.tmpl | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 2d44919..948b888 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2683,7 +2683,7 @@ ul { #storage-root-container .volumes .wok-gallery .volume-box-inner { padding: 0 16px; width: 409px; - height: 150px; + height: auto; display: flex; flex-flow: row wrap; justify-content: space-around; @@ -2745,8 +2745,8 @@ ul { #storage-root-container .volumes .wok-gallery span.column-format, #storage-root-container .volumes .wok-gallery span.column-type { order: 3; - width: 142px; - margin-top: -5px; + width: auto; + margin: 5px 0px; } #storage-root-container .volumes .wok-gallery span.gallery-header { @@ -2937,14 +2937,14 @@ ul { @media (min-width: 992px) { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-header > span.column-name, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-name { - width: 250px; + width: 450px; } } @media (min-width: 1200px) { #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-header > span.column-name, #storage-root-container .volumes .wok-list.wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > div > div > div > span.column-name { - width: 300px; + width: 500px; } } diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss index 0123009..cf81d1b 100644 --- a/ui/css/src/modules/_storage.scss +++ b/ui/css/src/modules/_storage.scss @@ -240,7 +240,7 @@ .volume-box-inner { padding: 0 16px; width: 409px; - height: 150px; + height: auto; display: flex; flex-flow: row wrap; justify-content: space-around; @@ -303,8 +303,8 @@ span.column-format, span.column-type { order: 3; - width: 142px; - margin-top: -5px; + width: auto; + margin: 5px 0px; } span.gallery-header { @@ -457,10 +457,10 @@ > span.column-name { width: 202px; @media (min-width: $screen-md) { - width: 250px; + width: 450px; } @media (min-width: $screen-lg) { - width: 300px; + width: 500px; } label { diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 9675579..ad88b65 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -1,7 +1,7 @@ #* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -172,10 +172,10 @@ <input type="checkbox" class="wok-checkbox" name="selected-volume[]" id="{checkbox}" value="{name}"> <label class="volume-name volume-name-filter" for="{checkbox}"><span class="volume-inline-progress hidden"><span class="wok-loading-icon"></span></span> {name}</label></span><span class="column-used"><span role="presentation" class="volume-icon {capacityIcon}"></span> {capacityLevel}%</span><span class="column-used-by volume-used-by-filter"><i class="fa fa-exclamation-circle" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}"></i><span class="format-text" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}">{used_by_text}</span></span><span class="column-format volume-format-filter"><span class="gallery-header" title="$_('Format')">$_('Format')</span><span class="format-text">{format}</span></span><span class="column-type volume-type-filter"><span class="gallery-header" title="$_('Type')">$_('Type')</span>{type}</span><span class="column-used-by volume-used-by-filter"><i class="fa fa-exclamation-circle" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}"></i><span class="format-text" data-toggle="tooltip" title="$_('Used by the following VMs:') {used_by_formatted}" data-placement="bottom" data-original-title="$_('Used by the following VMs:') {used_by_formatted}">{used_by_text}</span></span><span class="column-used"><span role="presentation" class="volume-icon {capacityIcon}"></span> {capacityLevel}%</span><span class="column-allocated"><span class="gallery-header" title="$_('Allocation')">$_('Allocation')</span>{allocation}</span><span class="column-capacity"><span class="gallery-header" title="$_('Capacity')">$_('Capacity')</span>{capacity}</span><span class="column-progress hidden"><span class="progress-status"></span> <span class="progress-transferred"></span> -- 2.9.3

2 3

[PATCH] [Kimchi] Bug fix #1123: Do not rely on Wok configuration to get host information
by Aline Manera 22 Mar '17

22 Mar '17

The host information is only part of nginx configuration. So get the information of the running system to configure federation feature over openSLP Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/peers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/peers.py b/model/peers.py index 1be606b..c0dccce 100644 --- a/model/peers.py +++ b/model/peers.py @@ -34,7 +34,7 @@ class PeersModel(object): return # register server on openslp - hostname = socket.getfqdn(wok_config.get("server", "host")) + hostname = socket.getfqdn() port = wok_config.get("server", "proxy_port") self.url = hostname + ":" + port -- 2.9.3

2 2

[PATCH] [Kimchi] Bug fix: Preserve "View Gallery" button location when opening Storage Volume actions menu
by Aline Manera 22 Mar '17

22 Mar '17

The "View Gallery" button was being moved to left when opening the Storage Volume actions drop down menu. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index bfde50c..0429456 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM Corp, 2013-2016 + * Copyright IBM Corp, 2013-2017 * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. @@ -640,11 +640,6 @@ kimchi.doListVolumes = function(poolObj) { $('.pool-action', volumeDiv).on('show.bs.dropdown', function () { $(volumeDiv).scrollTop(0); - $(this).css('position','absolute'); - $('.toggle-gallery',volumeDiv).css({ - 'position':'absolute', - 'margin-top': '1px' - }); $(volumeDiv).bind('mousewheel DOMMouseScroll', function(e) { e.preventDefault(); }); -- 2.9.3

2 2

[PATCH v5] [Kimchi 0/4] Bug fix #1091: Allow to set disk performance options per guest and template
by Ramon Medeiros 21 Mar '17

21 Mar '17

Changes: v5: Increase commit message verbosity Always return cache and io Improve documentation at API.md v4: Add support for templates (creation and update) v3: Add docs v2: Use REST API for tests General fixes Ramon Medeiros (4): Read io and cache option from disks Allow disks to update cache and io flags Bug fix #1091: Allow to set disk performance options per guest and template Add tests to verify if cache and io of a disk can be changed API.json | 26 ++++++++++++++++++- docs/API.md | 12 +++++++++ i18n.py | 1 - model/vmstorages.py | 55 ++++++++++++++++++++++++++-------------- tests/test_rest.py | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++- vmtemplate.py | 19 +++++++++++++- xmlutils/disk.py | 14 ++++++++++- 7 files changed, 175 insertions(+), 24 deletions(-) -- 2.9.3

1 4

[PATCH v4 0/4] Bug fix #1091: Allow to set disk performance options per guest and template
by Ramon Medeiros 20 Mar '17

20 Mar '17

Changes: v4: Add support for templates (creation and update) v3: Add docs v2: Use REST API for tests General fixes Ramon Medeiros (4): Read io and cache option from disks Allow disks to update cache and io flags Bug fix #1091: Allow to set disk performance options per guest and template Add tests to verify if cache and io of a disk can be changed API.json | 26 ++++++++++++++++++++++++- docs/API.md | 4 ++++ i18n.py | 1 - model/vmstorages.py | 55 ++++++++++++++++++++++++++++++++++------------------ tests/test_rest.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++- vmtemplate.py | 19 +++++++++++++++++- xmlutils/disk.py | 23 ++++++++++++++++++++-- 7 files changed, 159 insertions(+), 25 deletions(-) -- 2.9.3

2 9