- Kimchi-devel - oVirt List Archives

[PATCH V4] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 41 ++++++++++++++++++++++++++++++- control/templates.py | 8 +++++- docs/API.md | 12 +++++++++ i18n.py | 6 +++++ model/templates.py | 17 +++++++++++++ osinfo.py | 5 ++-- vmtemplate.py | 20 +++++++++++++++ xmlutils/interface.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 172 insertions(+), 4 deletions(-) -- 2.7.4

2 3

[PATCH] [Kimchi v2] /plugins/kimchi/ovsbridges API
by sureshab＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> v1 to v2 : Removed role_key in controller As Per RFC: [Kimchi-devel] [RFC] listing of ovs bridges this patch adds new API /plugins/kimchi/ovsbridges to list ovsbridges Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> --- control/ovsbridges.py | 28 ++++++++++++++++++++++++++++ docs/API.md | 8 ++++++++ model/ovsbridges.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 control/ovsbridges.py create mode 100644 model/ovsbridges.py diff --git a/control/ovsbridges.py b/control/ovsbridges.py new file mode 100644 index 0000000..5ffd6c2 --- /dev/null +++ b/control/ovsbridges.py @@ -0,0 +1,28 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.control.base import SimpleCollection +from wok.control.utils import UrlSubNode + + +@UrlSubNode("ovsbridges", True) +class OVSBridges(SimpleCollection): + def __init__(self, model): + super(OVSBridges, self).__init__(model) + self.admin_methods = ['GET'] diff --git a/docs/API.md b/docs/API.md index 357c2b8..c94003f 100644 --- a/docs/API.md +++ b/docs/API.md @@ -1031,3 +1031,11 @@ List of available groups. * **GET**: Return the list of Kimchi peers in the same network (It uses openSLP for discovering) + +### Simple Collection: OVSBridges + +**URI:** /plugins/kimchi/ovsbridges + +**Methods:** + +* **GET**: Return list of OVS bridges of the host. diff --git a/model/ovsbridges.py b/model/ovsbridges.py new file mode 100644 index 0000000..212520f --- /dev/null +++ b/model/ovsbridges.py @@ -0,0 +1,31 @@ +# +# Project Kimchi +# +# Copyright IBM Corp, 2016 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +from wok.plugins.gingerbase.netinfo import ovs_bridges + + +class OVSBridgesModel(object): + + def get_list(self): + """ + + Returns: list of ovs bridge names + + """ + return ovs_bridges() -- 1.8.3.1

2 1

[PATCH V2] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 35 +++++++++++++++++++++++++++- control/templates.py | 1 + docs/API.md | 12 ++++++++++ i18n.py | 6 +++++ model/templates.py | 17 ++++++++++++++ vmtemplate.py | 20 ++++++++++++++++ xmlutils/interface.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+), 1 deletion(-) -- 2.7.4

4 7

[PATCH V3] [Kimchi 0/2] Addition 'interfaces' parameter to template API.
by archus＠linux.vnet.ibm.com 02 Sep '16

02 Sep '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Code changes for additional param 'interfaces' to template API. 2) API.md changes for same. Archana Singh (2): Updated code to support 'interfaces' parameter to template API only on s390x/s390 architecture. Updated API.md for addition interfaces paramter in template API. API.json | 41 ++++++++++++++++++++++++++++++- control/templates.py | 1 + docs/API.md | 12 +++++++++ i18n.py | 6 +++++ model/templates.py | 17 +++++++++++++ osinfo.py | 5 ++-- vmtemplate.py | 20 +++++++++++++++ xmlutils/interface.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 166 insertions(+), 3 deletions(-) -- 2.7.4

3 6

[PATCH V2] [Wok 0/7] Issue #141 - Handle AsyncTasks in request log
by Lucio Correia 01 Sep '16

01 Sep '16

V2: rebase with master to fix conflict Lucio Correia (7): Create log_request() method for code simplification Improve plugin lookup by request Update Request Logger to handle AsyncTask status Log AsyncTask success or failure Save log entry IDs for requests that generate tasks Put failure details into parenthesis Change location of User Requests Log src/wok/asynctask.py | 46 +++++++++++++-- src/wok/config.py.in | 4 ++ src/wok/control/base.py | 75 +++++++++++++----------- src/wok/i18n.py | 2 + src/wok/message.py | 2 +- src/wok/reqlogger.py | 150 +++++++++++++++++++++++++++--------------------- src/wok/root.py | 41 ++----------- src/wok/utils.py | 14 +++-- 8 files changed, 187 insertions(+), 147 deletions(-) -- 1.9.1

2 29

[PATCHv3] [Kimchi] Emphasize resource name in dlg
by Socorro Stoppler 01 Sep '16

01 Sep '16

From: Socorro <socorro(a)linux.vnet.ibm.com> v3: In some distros, the resource name is not being displayed in bold due a problem with Open Sans per Samuel. There are some cases, mainly with Firefox in that some style with font weight set to 600 does not work and 700 is usually too bold to set as a fallback. Therefore, just use the same style as <abbr> and <acronynm> tags which creates a dotted bottom v2: Display resource name (with name in bold) in confirmation dialog v1: When confirmation dialogs are shown, also display the name of the resource being acted on (i.e. guest name, network, storage, template) as part of the message. Signed-off-by: Socorro <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 4 ++++ ui/css/src/modules/_guests.scss | 4 ++++ ui/js/src/kimchi.guest_main.js | 14 +++++++++----- ui/js/src/kimchi.network.js | 6 ++++-- ui/js/src/kimchi.storage_main.js | 8 +++++--- ui/js/src/kimchi.template_main.js | 5 +++-- ui/pages/i18n.json.tmpl | 20 ++++++++++---------- 7 files changed, 39 insertions(+), 22 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 59d96e1..f49c955 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -294,6 +294,10 @@ font-size: 32px; } +strong { + border-bottom: 1px dotted; +} + #guest-add-window .modal-body { margin: 0; padding: 0; diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss index 6c24800..65d6792 100644 --- a/ui/css/src/modules/_guests.scss +++ b/ui/css/src/modules/_guests.scss @@ -46,6 +46,10 @@ } } +strong { + border-bottom: 1px dotted; +} + #guest-add-window { .modal-body { margin: 0; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 9c1aa54..34217e4 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -127,8 +127,9 @@ kimchi.vmpoweroff = function(event) { var vm_id = vm.attr("id"); var vmObject = vm.data(); var vm_persistent = vmObject.persistent == true; - var content_msg = vm_persistent ? i18n['KCHVM6003M'] : - i18n['KCHVM6009M']; + var content_msg_1 = i18n['KCHVM6003M'].replace('%1', ''+vm_id+''); + var content_msg_2 = i18n['KCHVM6009M'].replace('%1', ''+vm_id+''); + var content_msg = vm_persistent ? content_msg_1 : content_msg_2; var settings = { title: i18n['KCHVM6002M'], content: content_msg, @@ -153,9 +154,10 @@ kimchi.vmshutdown = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = vm.attr("id"); + var confirmMessage = i18n['KCHVM6007M'].replace('%1', ''+vm_id+''); var settings = { title: i18n['KCHVM6006M'], - content: i18n['KCHVM6007M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -174,9 +176,10 @@ kimchi.vmreset = function(event) { $(button).addClass('loading'); var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6005M'].replace('%1', ''+vm_id+''); var settings = { title: i18n['KCHVM6004M'], - content: i18n['KCHVM6005M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; @@ -204,9 +207,10 @@ kimchi.vmdelete = function(event) { var button = event.target; var vm = $(button).closest('li[name=guest]'); var vm_id = $(vm).attr("id"); + var confirmMessage = i18n['KCHVM6001M'].replace('%1', ''+vm_id+''); var settings = { title: i18n['KCHVM6008M'], - content: i18n['KCHVM6001M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index ac6bf74..7ce5b28 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -161,9 +161,10 @@ kimchi.addNetworkActions = function(network) { return false; } if (!network.persistent) { + var confirmMessage = i18n['KCHNET6004M'].replace('%1', ''+network.name+''); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHNET6004M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; @@ -180,9 +181,10 @@ kimchi.addNetworkActions = function(network) { if (network.state === "up" || network.in_use) { return false; } + var confirmMessage = i18n['KCHNET6002M'].replace('%1', ''+network.name+''); wok.confirm({ title : i18n['KCHAPI6006M'], - content : i18n['KCHNET6002M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }, function() { diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c99f93..18e6eea 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -310,14 +310,15 @@ kimchi.storageBindClick = function() { $('.pool-delete').on('click', function(event) { event.preventDefault(); var $pool = $(this); + var poolName = $pool.data('name'); + var confirmMessage = i18n['KCHPOOL6001M'].replace('%1', ''+poolName+''); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6001M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var poolName = $pool.data('name'); kimchi.deleteStoragePool(poolName, function() { kimchi.doListStoragePools(); }, function(err) { @@ -339,9 +340,10 @@ kimchi.storageBindClick = function() { $('.pool-deactivate').on('click', function(event) { event.preventDefault(); var poolName = $(this).data('name'); + var confirmMessage = i18n['KCHPOOL6012M'].replace('%1', ''+poolName+''); var settings = { title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6012M'], + content : confirmMessage, confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 302d906..cf98a7b 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -124,14 +124,15 @@ kimchi.templateBindClick = function() { $('.template-delete a').on('click', function(event) { event.preventDefault(); var $template = $(this); + var templateName = $template.data('template'); + var confirmMessage = i18n['KCHTMPL6003M'].replace('%1', ''+templateName+''); var settings = { title: i18n['KCHAPI6001M'], - content: i18n['KCHTMPL6003M'], + content: confirmMessage, confirm: i18n['KCHAPI6002M'], cancel: i18n['KCHAPI6003M'] }; wok.confirm(settings, function() { - var templateName = $template.data('template'); kimchi.deleteTemplate(templateName, function() { kimchi.doListTemplates(); }, function(err) { diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a5185b1..d29a206 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -47,24 +47,24 @@ "KCHTMPL6001W": "$_("No ISO found")", "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", - "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", + "KCHTMPL6003M": "$_("This will permanently delete the %1 template. Would you like to continue?")", "KCHTMPL6004M": "$_("View Table")", "KCHTMPL6005M": "$_("View Gallery")", "KCHTMPL6006M": "$_("Not Available")", "KCHTMPL6007M": "$_("Please check the invalid Storage Pools")", - "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", + "KCHVM6001M": "$_("This will delete the %1 virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", "KCHVM6002M": "$_("Power off Confirmation")", "KCHVM6003M": "$_("This action may produce undesirable results, " - "for example unflushed disk cache in the guest. " + "for example unflushed disk cache in the %1 guest. " "Would you like to continue?")", "KCHVM6004M": "$_("Reset Confirmation")", "KCHVM6005M": "$_("There is a risk of data loss caused by reset without" - " the guest OS shutdown. Would you like to continue?")", + " the %1 guest OS shutdown. Would you like to continue?")", "KCHVM6006M": "$_("Shut Down Confirmation")", - "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", + "KCHVM6007M": "$_("Note the %1 guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", - "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6009M": "$_("The %1 virtual machine is not persistent. Power Off will delete it. Continue?")", "KCHVM0001E": "$_("Input is not a number")", "KCHVM0002E": "$_("Memory value cannot be higher than Max Memory value")", @@ -89,11 +89,11 @@ "KCHVMED6012M": "$_("Following devices will be affected, confirm?")", "KCHNET6001M": "$_("unavailable")", - "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on this network.")", - "KCHNET6004M": "$_("This network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", + "KCHNET6002M": "$_("This action will interrupt network connectivity for any virtual machine that depend on the %1 network.")", + "KCHNET6004M": "$_("The %1 network is not persistent. Instead of stop, this action will permanently delete it. Would you like to continue?")", "KCHNET6001W": "$_("The bridged VLAN tag may not work well with NetworkManager enabled. You should consider disabling it.")", - "KCHPOOL6001M": "$_("This will permanently delete the storage pool. Would you like to continue?")", + "KCHPOOL6001M": "$_("This will permanently delete the %1 storage pool. Would you like to continue?")", "KCHPOOL6002M": "$_("This storage pool is empty.")", "KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")", "KCHPOOL6004M": "$_("SCSI Fibre Channel")", @@ -108,7 +108,7 @@ "KCHPOOL6006E": "$_("No logical device selected.")", "KCHPOOL6009E": "$_("This is not a valid Server Name or IP. Please, modify it.")", "KCHPOOL6011M": "$_("No available partitions found.")", - "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", + "KCHPOOL6012M": "$_("The %1 storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", "KCHPOOL6014M": "$_("In progress...")", "KCHPOOL6015M": "$_("Failed!")", -- 2.7.4

2 1

[PATCH v2] [Kimchi] Issue #921: Peers button disappears
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Samuel Guimarães (1): Issue #921: Peers button disappears root.py | 6 ++ ui/js/kimchi.peers.js | 145 ++++++++++++++++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.api.js | 14 ----- ui/pages/i18n.json.tmpl | 4 +- 4 files changed, 154 insertions(+), 15 deletions(-) create mode 100644 ui/js/kimchi.peers.js -- 2.5.5

2 3

[PATCH] [Kimchi 0/2] Kimchi Issues #606 and #939
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> -Issue #939 requires patch "Minor fixes in form fields" applied in Wok -Issue #606 requires patch "Icons for Kimchi issue #606" applied in Wok Samuel Guimarães (2): Issue #939: [UI] Guest tab is not rendered correctly if guests are not in 'running' or ''shutoff' state Issue #606: Change icon to distinguish image generated template and iso generated template ui/css/kimchi.css | 169 +++++++++++--------- ui/css/src/modules/_guests.scss | 147 ++++++++++-------- ui/css/src/modules/_iso-list.scss | 2 +- ui/css/src/modules/_templates.scss | 62 +++++--- ui/js/src/kimchi.template_add_main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 206 +++++++++++++------------ ui/pages/guest.html.tmpl | 6 +- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 272 +++++++++++++++++---------------- 9 files changed, 485 insertions(+), 386 deletions(-) -- 2.5.5

2 3

[PATCH] [Kimchi 0/3] Peers, paused guests and iso generated template icons
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Multiple patches for Kimchi: -Issue #921 v3: Changed container to element generated by script -Issue #939 v2: Rebased -Issue #606 v2: Moved icons from Wok to Kimchi (probably won't apply anyway because the SVGs have lines longer than 998 characters) Samuel Guimarães (3): Issue #921: Peers button disappears Issue #939: [UI] Guest tab is not rendered correctly if guests are not in 'running' or ''shutoff' state Issue #606: Change icon to distinguish image generated template and iso generated template root.py | 6 + ui/css/kimchi.css | 169 +++++++++++--------- ui/css/src/modules/_guests.scss | 147 ++++++++++-------- ui/css/src/modules/_iso-list.scss | 2 +- ui/css/src/modules/_templates.scss | 65 +++++--- ui/images/file-o-img.svg | 149 ++++++++++++++++++ ui/images/file-o-iso.svg | 149 ++++++++++++++++++ ui/js/kimchi.peers.js | 140 +++++++++++++++++ ui/js/src/kimchi.api.js | 14 -- ui/js/src/kimchi.template_add_main.js | 5 + ui/js/src/kimchi.template_edit_main.js | 206 +++++++++++++------------ ui/pages/guest.html.tmpl | 6 +- ui/pages/i18n.json.tmpl | 4 +- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 272 +++++++++++++++++---------------- 15 files changed, 935 insertions(+), 401 deletions(-) create mode 100644 ui/images/file-o-img.svg create mode 100644 ui/images/file-o-iso.svg create mode 100644 ui/js/kimchi.peers.js -- 2.5.5

2 5

[PATCH v2] [Wok] Removing Kimchi Peers dropdown from Wok navbar
by sguimaraes943＠gmail.com 01 Sep '16

01 Sep '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch moves peers list from the drop-down on the top navigation bar to a DataTable that will be rendered on Host Dashboard if the user has Gingerbased installed. Additional patches are necessary (Kimchi and Gingerbase). Samuel Guimarães (1): Removing Kimchi Peers dropdown from Wok navbar ui/js/src/wok.main.js | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) -- 2.5.5

2 2