May 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Kimchi] [RFC] Storave Volume management UI
by sguimaraes943＠gmail.com 16 May '16

16 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds the UI for Storage Volume management action button, filter input, gallery view and gallery / list view toggle-switch button with multi-selection enabled. This is just the initial patch for the UI to get feedback, will add Storage Volume modal and confirm windows and map create, delete, resize, wipe and clone actions in the next commit. Samuel Guimarães (1): Storave Volume management UI ui/css/kimchi.css | 266 +++++++++++++++++++++++++++++------- ui/css/src/modules/_storage.scss | 287 +++++++++++++++++++++++++++++++++------ ui/js/src/kimchi.storage_main.js | 82 +++++------ ui/pages/tabs/storage.html.tmpl | 121 +++++++++++------ 4 files changed, 576 insertions(+), 180 deletions(-) -- 1.9.3

3 4

[RFC] [Kimchi] First pass at Edit Virtual Network UI
by Socorro Stoppler 16 May '16

16 May '16

- First attempt of Edit Virtual Network UI - Known UI Issues:s - after the update happens, the list of networks are not shown properly (i.e. rows are all bunched up and actions buttons are diagonal, but fixes itself after you move off the tab and come back to it - when edit panel first opens up, the value for the Destination selector (if applicable) is either showing 'Nothing selected' or it's showing the first item on the list rather than the value that came from backend - Bridged network has not been tested so there's bound to be issues there Proposal: Per discussion w/Lucio, with regards to vlan_id, I'd like to propose to have the backend show the vlan_id as a separate field. This came about when I couldn't find that field and as it turns out, it was because it was appended to the interface name.s Socorro Stoppler (1): First pass Edit Virtual Network ui/js/src/kimchi.api.js | 23 ++++ ui/js/src/kimchi.network.js | 14 +++ ui/js/src/kimchi.network_edit_main.js | 216 ++++++++++++++++++++++++++++++++++ ui/pages/network-edit.html.tmpl | 75 ++++++++++++ ui/pages/tabs/network.html.tmpl | 3 +- 5 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 ui/js/src/kimchi.network_edit_main.js create mode 100644 ui/pages/network-edit.html.tmpl -- 2.5.0

2 4

[PATCH] [Kimchi] Fix issue on network update
by Lucio Correia 16 May '16

16 May '16

When network is not renamed, we need 'name' value in info dict, since name will not be returned by GET. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- model/networks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/networks.py b/model/networks.py index 333ea6d..cc59ca8 100644 --- a/model/networks.py +++ b/model/networks.py @@ -504,8 +504,8 @@ class NetworkModel(object): def update(self, name, params): info = self.lookup(name) + info['name'] = name original = copy.deepcopy(info) - original['name'] = name # validate update parameters connection = info['connection'] -- 1.9.1

1 0

[PATCH] [Wok] Bug fix: Add space to separate class names
by Aline Manera 16 May '16

16 May '16

Commit d4b0c5, added the following: 'data-converter=' + fields[i]["converter"] : '' but as it is string concatenation, we need to add an space before "data-converter" to do not wrongly merge strings. ' data-converter=' + fields[i]["converter"] : '', This turns back the plugin color when displaying user log activity. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/wok.bootgrid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/wok.bootgrid.js b/ui/js/wok.bootgrid.js index c4082dd..7d634bb 100644 --- a/ui/js/wok.bootgrid.js +++ b/ui/js/wok.bootgrid.js @@ -50,7 +50,7 @@ wok.createBootgrid = function(opts) { for (var i = 0; i < fields.length; i++) { var columnHtml = [ - '<th data-type="', fields[i]["type"], '" data-column-id="', fields[i]["column-id"], '"', (fields[i].identifier) ? 'data-identifier="true"' : '', ("header-class" in fields[i]) ? 'data-header-css-class="gridHeader ' + fields[i]["header-class"] + '"' : 'gridHeader', ("data-class" in fields[i]) ? ' data-align="' + fields[i]["data-class"] + '"' + ' headerAlign="center"' : ' data-align="left" headerAlign="center"', ("formatter" in fields[i]) ? 'data-formatter=' + fields[i]["formatter"] : '', (fields[i].width) ? (' data-width="' + fields[i].width + '"') : '', ("converter" in fields[i]) ? 'data-converter=' + fields[i]["converter"] : '', + '<th data-type="', fields[i]["type"], '" data-column-id="', fields[i]["column-id"], '"', (fields[i].identifier) ? 'data-identifier="true"' : '', ("header-class" in fields[i]) ? 'data-header-css-class="gridHeader ' + fields[i]["header-class"] + '"' : 'gridHeader', ("data-class" in fields[i]) ? ' data-align="' + fields[i]["data-class"] + '"' + ' headerAlign="center"' : ' data-align="left" headerAlign="center"', ("formatter" in fields[i]) ? 'data-formatter=' + fields[i]["formatter"] : '', (fields[i].width) ? (' data-width="' + fields[i].width + '"') : '', ("converter" in fields[i]) ? ' data-converter=' + fields[i]["converter"] : '', '>', ("title" in fields[i]) ? fields[i]["title"] : fields[i]["column-id"], '</th>' ].join(''); -- 2.5.5

2 2

[PATCH V2] [Kimchi 0/3] Issue #201: Handling libvirt connection failures.
by pvital＠linux.vnet.ibm.com 13 May '16

13 May '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V1 -> V2: * Adapted to use the latest notifications changes from Wok * Aesthetic changes V1: This is the backend part of the solution to solve issue #201. Frontend still needs some updates to provide more information to user. Paulo Vital (3): Update Kimchi config file for Systemd service Make Cheerypy up if not able to connect to libvirt Add support to check if libvirtd is running. contrib/kimchid.service.fedora | 3 ++- contrib/kimchid.service.ubuntu | 3 ++- i18n.py | 3 +++ model/config.py | 17 +++++++++++++++-- model/libvirtconnection.py | 13 +++++++++++-- model/templates.py | 5 ++++- utils.py | 16 +++++++++++++++- 7 files changed, 52 insertions(+), 8 deletions(-) -- 2.5.5

2 7

[PATCH] [Kimchi 2/2] Use verbs in the past
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 86 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/i18n.py b/i18n.py index 7baa3b6..2b8c205 100644 --- a/i18n.py +++ b/i18n.py @@ -332,48 +332,48 @@ messages = { "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), # These messages (ending with L) are for user log purposes - "KCHNET0001L": _("Create %(connection)s virtual network '%(name)s'"), - "KCHNET0002L": _("Remove virtual network '%(ident)s'"), - "KCHNET0003L": _("Update virtual network '%(ident)s'"), - "KCHNET0004L": _("Activate virtual network '%(ident)s'"), - "KCHNET0005L": _("Deactivate virtual network '%(ident)s'"), - "KCHPOOL0001L": _("Create %(type)s storage pool '%(name)s'"), - "KCHPOOL0002L": _("Remove storage pool '%(ident)s'"), - "KCHPOOL0003L": _("Update storage pool '%(ident)s'"), - "KCHPOOL0004L": _("Activate storage pool '%(ident)s'"), - "KCHPOOL0005L": _("Deactivate storage pool '%(ident)s'"), - "KCHSNAP0001L": _("Create snapshot '%(name)s' at guest '%(vm)s'"), - "KCHSNAP0002L": _("Remove snapshot '%(ident)s' from guest '%(vm)s'"), - "KCHSNAP0003L": _("Revert guest '%(vm)s' to snapshot '%(ident)s'"), - "KCHTMPL0001L": _("Create template '%(name)s'"), - "KCHTMPL0002L": _("Remove template '%(ident)s'"), - "KCHTMPL0003L": _("Update template '%(ident)s'"), - "KCHTMPL0004L": _("Clone template '%(ident)s'"), - "KCHVM0001L": _("Create guest '%(name)s' from template '%(template)s'"), - "KCHVM0002L": _("Remove guest '%(ident)s'"), - "KCHVM0003L": _("Edit guest '%(ident)s'"), - "KCHVM0004L": _("Start guest '%(ident)s'"), - "KCHVM0005L": _("Power off guest '%(ident)s'"), + "KCHNET0001L": _("Created %(connection)s virtual network '%(name)s'"), + "KCHNET0002L": _("Removed virtual network '%(ident)s'"), + "KCHNET0003L": _("Updated virtual network '%(ident)s'"), + "KCHNET0004L": _("Activated virtual network '%(ident)s'"), + "KCHNET0005L": _("Deactivated virtual network '%(ident)s'"), + "KCHPOOL0001L": _("Created %(type)s storage pool '%(name)s'"), + "KCHPOOL0002L": _("Removed storage pool '%(ident)s'"), + "KCHPOOL0003L": _("Updated storage pool '%(ident)s'"), + "KCHPOOL0004L": _("Activated storage pool '%(ident)s'"), + "KCHPOOL0005L": _("Deactivated storage pool '%(ident)s'"), + "KCHSNAP0001L": _("Created snapshot '%(name)s' at guest '%(vm)s'"), + "KCHSNAP0002L": _("Removed snapshot '%(ident)s' from guest '%(vm)s'"), + "KCHSNAP0003L": _("Reverted guest '%(vm)s' to snapshot '%(ident)s'"), + "KCHTMPL0001L": _("Created template '%(name)s'"), + "KCHTMPL0002L": _("Removed template '%(ident)s'"), + "KCHTMPL0003L": _("Updated template '%(ident)s'"), + "KCHTMPL0004L": _("Cloned template '%(ident)s'"), + "KCHVM0001L": _("Created guest '%(name)s' from template '%(template)s'"), + "KCHVM0002L": _("Removed guest '%(ident)s'"), + "KCHVM0003L": _("Edited guest '%(ident)s'"), + "KCHVM0004L": _("Started guest '%(ident)s'"), + "KCHVM0005L": _("Powered off guest '%(ident)s'"), "KCHVM0006L": _("Shutdown guest '%(ident)s'"), - "KCHVM0007L": _("Restart guest '%(ident)s'"), - "KCHVM0008L": _("Connect to guest '%(ident)s' through novnc/spice"), - "KCHVM0009L": _("Clone guest '%(ident)s'"), - "KCHVM0010L": _("Migrate guest '%(ident)s' to '%(remote_host)s'"), - "KCHVM0011L": _("Suspend guest '%(ident)s'"), - "KCHVM0012L": _("Resume guest '%(ident)s'"), - "KCHVM0013L": _("Connect to guest '%(ident)s' through serial"), - "KCHVMHDEV0001L": _("Attach host device '%(name)s' to guest '%(vmid)s'"), - "KCHVMHDEV0002L": _("Detach host device '%(ident)s' from guest '%(vmid)s'"), - "KCHVMIF0001L": _("Attach network interface '%(network)s' to guest '%(vm)s'"), - "KCHVMIF0002L": _("Detach network interface '%(ident)s' from guest '%(vm)s'"), - "KCHVMIF0003L": _("Update network interface '%(ident)s' at guest '%(vm)s'"), - "KCHVMSTOR0001L": _("Attach %(type)s storage '%(path)s' to guest '%(vm)s'"), - "KCHVMSTOR0002L": _("Remove storage '%(ident)s' from guest '%(vm)s'"), - "KCHVMSTOR0003L": _("Update storage '%(ident)s' at guest '%(vm)s'"), - "KCHVOL0001L": _("Create storage volume '%(name)s' at pool '%(pool)s'"), - "KCHVOL0002L": _("Remove storage volume '%(ident)s' from pool '%(pool)s'"), - "KCHVOL0003L": _("Update storage volume '%(ident)s' at pool '%(pool)s'"), - "KCHVOL0004L": _("Wipe storage volume '%(ident)s' off pool '%(pool)s'"), - "KCHVOL0005L": _("Resize storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s"), - "KCHVOL0006L": _("Clone storage volume '%(ident)s' at pool '%(pool)s'"), + "KCHVM0007L": _("Restarted guest '%(ident)s'"), + "KCHVM0008L": _("Connected to guest '%(ident)s' through novnc/spice"), + "KCHVM0009L": _("Cloned guest '%(ident)s'"), + "KCHVM0010L": _("Migrated guest '%(ident)s' to '%(remote_host)s'"), + "KCHVM0011L": _("Suspended guest '%(ident)s'"), + "KCHVM0012L": _("Resumed guest '%(ident)s'"), + "KCHVM0013L": _("Connected to guest '%(ident)s' through serial"), + "KCHVMHDEV0001L": _("Attached host device '%(name)s' to guest '%(vmid)s'"), + "KCHVMHDEV0002L": _("Detached host device '%(ident)s' from guest '%(vmid)s'"), + "KCHVMIF0001L": _("Attached network interface '%(network)s' to guest '%(vm)s'"), + "KCHVMIF0002L": _("Detached network interface '%(ident)s' from guest '%(vm)s'"), + "KCHVMIF0003L": _("Updated network interface '%(ident)s' at guest '%(vm)s'"), + "KCHVMSTOR0001L": _("Attached %(type)s storage '%(path)s' to guest '%(vm)s'"), + "KCHVMSTOR0002L": _("Removed storage '%(ident)s' from guest '%(vm)s'"), + "KCHVMSTOR0003L": _("Updated storage '%(ident)s' at guest '%(vm)s'"), + "KCHVOL0001L": _("Created storage volume '%(name)s' at pool '%(pool)s'"), + "KCHVOL0002L": _("Removed storage volume '%(ident)s' from pool '%(pool)s'"), + "KCHVOL0003L": _("Updated storage volume '%(ident)s' at pool '%(pool)s'"), + "KCHVOL0004L": _("Wiped storage volume '%(ident)s' off pool '%(pool)s'"), + "KCHVOL0005L": _("Resized storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s"), + "KCHVOL0006L": _("Cloned storage volume '%(ident)s' at pool '%(pool)s'"), } -- 1.9.1

1 0

[PATCH] [Kimchi 1/2] Add translation to user log messages
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- control/networks.py | 10 +++++----- control/storagepools.py | 10 +++++----- control/storagevolumes.py | 14 ++++++-------- control/templates.py | 8 ++++---- control/vm/hostdevs.py | 4 ++-- control/vm/ifaces.py | 6 +++--- control/vm/snapshots.py | 6 +++--- control/vm/storages.py | 6 +++--- control/vms.py | 26 +++++++++++++------------- i18n.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 89 insertions(+), 46 deletions(-) diff --git a/control/networks.py b/control/networks.py index c87b5a6..4b18638 100644 --- a/control/networks.py +++ b/control/networks.py @@ -22,15 +22,15 @@ from wok.control.utils import UrlSubNode NETWORKS_REQUESTS = { - 'POST': {'default': "Create %(connection)s virtual network '%(name)s'"}, + 'POST': {'default': "KCHNET0001L"}, } NETWORK_REQUESTS = { - 'DELETE': {'default': "Remove virtual network '%(ident)s'"}, - 'PUT': {'default': "Update virtual network '%(ident)s'"}, + 'DELETE': {'default': "KCHNET0002L"}, + 'PUT': {'default': "KCHNET0003L"}, 'POST': { - 'activate': "Activate virtual network '%(ident)s'", - 'deactivate': "Deactivate virtual network '%(ident)s'", + 'activate': "KCHNET0004L", + 'deactivate': "KCHNET0005L", }, } diff --git a/control/storagepools.py b/control/storagepools.py index 714f4bb..2f25746 100644 --- a/control/storagepools.py +++ b/control/storagepools.py @@ -30,15 +30,15 @@ from wok.plugins.kimchi.model.storagepools import ISO_POOL_NAME STORAGEPOOLS_REQUESTS = { - 'POST': {'default': "Create %(type)s storage pool '%(name)s'"}, + 'POST': {'default': "KCHPOOL0001L"}, } STORAGEPOOL_REQUESTS = { - 'DELETE': {'default': "Remove storage pool '%(ident)s'"}, - 'PUT': {'default': "Update storage pool '%(ident)s'"}, + 'DELETE': {'default': "KCHPOOL0002L"}, + 'PUT': {'default': "KCHPOOL0003L"}, 'POST': { - 'activate': "Activate storage pool '%(ident)s'", - 'deactivate': "Deactivate storage pool '%(ident)s'", + 'activate': "KCHPOOL0004L", + 'deactivate': "KCHPOOL0005L", }, } diff --git a/control/storagevolumes.py b/control/storagevolumes.py index a04ad35..351e4bd 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -23,18 +23,16 @@ from wok.control.utils import get_class_name, model_fn STORAGEVOLUMES_REQUESTS = { - 'POST': {'default': "Create storage volume '%(name)s' at pool '%(pool)s'"}, + 'POST': {'default': "KCHVOL0001L"}, } STORAGEVOLUME_REQUESTS = { - 'DELETE': {'default': "Remove storage volume '%(ident)s' from " - "pool '%(pool)s'"}, - 'PUT': {'default': "Update storage volume '%(ident)s' at pool '%(pool)s'"}, + 'DELETE': {'default': "KCHVOL0002L"}, + 'PUT': {'default': "KCHVOL0003L"}, 'POST': { - 'wipe': "Wipe storage volume '%(ident)s' off pool '%(pool)s'", - 'resize': "Resize storage volume '%(ident)s' at pool '%(pool)s' with " - "size %(size)s", - 'clone': "Clone storage volume '%(ident)s' at pool '%(pool)s'", + 'wipe': "KCHVOL0004L", + 'resize': "KCHVOL0005L", + 'clone': "KCHVOL0006L", }, } diff --git a/control/templates.py b/control/templates.py index 343ced1..82697d0 100644 --- a/control/templates.py +++ b/control/templates.py @@ -22,14 +22,14 @@ from wok.control.utils import UrlSubNode TEMPLATES_REQUESTS = { - 'POST': {'default': "Create template '%(name)s'"}, + 'POST': {'default': "KCHTMPL0001L"}, } TEMPLATE_REQUESTS = { - 'DELETE': {'default': "Remove template '%(ident)s'"}, - 'PUT': {'default': "Update template '%(ident)s'"}, + 'DELETE': {'default': "KCHTMPL0002L"}, + 'PUT': {'default': "KCHTMPL0003L"}, 'POST': { - 'clone': "Clone template '%(ident)s'", + 'clone': "KCHTMPL0004L", }, } diff --git a/control/vm/hostdevs.py b/control/vm/hostdevs.py index e9fd5dc..d21e19d 100644 --- a/control/vm/hostdevs.py +++ b/control/vm/hostdevs.py @@ -22,12 +22,12 @@ from wok.control.utils import UrlSubNode VMHOSTDEVS_REQUESTS = { - 'POST': {'default': "Attach host device '%(name)s' to guest '%(vmid)s'"}, + 'POST': {'default': "KCHVMHDEV0001L"}, } VMHOSTDEV_REQUESTS = { 'DELETE': { - 'default': "Detach host device '%(ident)s' from guest '%(vmid)s'", + 'default': "KCHVMHDEV0002L", }, } diff --git a/control/vm/ifaces.py b/control/vm/ifaces.py index 9ecfc8f..0cea8b5 100644 --- a/control/vm/ifaces.py +++ b/control/vm/ifaces.py @@ -23,16 +23,16 @@ from wok.control.utils import UrlSubNode VMIFACES_REQUESTS = { 'POST': { - 'default': "Attach network interface '%(network)s' to guest '%(vm)s'", + 'default': "KCHVMIF0001L", }, } VMIFACE_REQUESTS = { 'DELETE': { - 'default': "Detach network interface '%(ident)s' from guest '%(vm)s'", + 'default': "KCHVMIF0002L", }, 'PUT': { - 'default': "Update network interface '%(ident)s' at guest '%(vm)s'", + 'default': "KCHVMIF0003L", }, } diff --git a/control/vm/snapshots.py b/control/vm/snapshots.py index d8cccc1..20f07a7 100644 --- a/control/vm/snapshots.py +++ b/control/vm/snapshots.py @@ -22,13 +22,13 @@ from wok.control.utils import UrlSubNode VMSNAPSHOTS_REQUESTS = { - 'POST': {'default': "Create snapshot '%(name)s' at guest '%(vm)s'"}, + 'POST': {'default': "KCHSNAP0001L"}, } VMSNAPSHOT_REQUESTS = { - 'DELETE': {'default': "Remove snapshot '%(ident)s' from guest '%(vm)s'"}, + 'DELETE': {'default': "KCHSNAP0002L"}, 'POST': { - 'revert': "Revert guest '%(vm)s' to snapshot '%(ident)s'", + 'revert': "KCHSNAP0003L", }, } diff --git a/control/vm/storages.py b/control/vm/storages.py index 4a4c8d2..615074a 100644 --- a/control/vm/storages.py +++ b/control/vm/storages.py @@ -23,13 +23,13 @@ from wok.control.utils import UrlSubNode VMSTORAGES_REQUESTS = { 'POST': { - 'default': "Attach %(type)s storage '%(path)s' to guest '%(vm)s'", + 'default': "KCHVMSTOR0001L", }, } VMSTORAGE_REQUESTS = { - 'DELETE': {'default': "Remove storage '%(ident)s' from guest '%(vm)s'"}, - 'PUT': {'default': "Update storage '%(ident)s' at guest '%(vm)s'"}, + 'DELETE': {'default': "KCHVMSTOR0002L"}, + 'PUT': {'default': "KCHVMSTOR0003L"}, } diff --git a/control/vms.py b/control/vms.py index 64df00e..2339017 100644 --- a/control/vms.py +++ b/control/vms.py @@ -25,24 +25,24 @@ from wok.plugins.kimchi.control.vm import sub_nodes VMS_REQUESTS = { 'POST': { - 'default': "Create guest '%(name)s' from template '%(template)s'", + 'default': "KCHVM0001L", }, } VM_REQUESTS = { - 'DELETE': {'default': "Remove guest '%(ident)s'"}, - 'PUT': {'default': "Edit guest '%(ident)s'"}, + 'DELETE': {'default': "KCHVM0002L"}, + 'PUT': {'default': "KCHVM0003L"}, 'POST': { - 'start': "Start guest '%(ident)s'", - 'poweroff': "Power off guest '%(ident)s'", - 'shutdown': "Shutdown guest '%(ident)s'", - 'reset': "Restart guest '%(ident)s'", - 'connect': "Connect to guest '%(ident)s' through novnc/spice", - 'clone': "Clone guest '%(ident)s'", - 'migrate': "Migrate guest '%(ident)s' to '%(remote_host)s'", - 'suspend': "Suspend guest '%(ident)s'", - 'resume': "Resume guest '%(ident)s'", - 'serial': "Connect to guest '%(ident)s' through serial", + 'start': "KCHVM0004L", + 'poweroff': "KCHVM0005L", + 'shutdown': "KCHVM0006L", + 'reset': "KCHVM0007L", + 'connect': "KCHVM0008L", + 'clone': "KCHVM0009L", + 'migrate': "KCHVM0010L", + 'suspend': "KCHVM0011L", + 'resume': "KCHVM0012L", + 'serial': "KCHVM0013L", }, } diff --git a/i18n.py b/i18n.py index db245c0..7baa3b6 100644 --- a/i18n.py +++ b/i18n.py @@ -331,4 +331,49 @@ messages = { "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), + # These messages (ending with L) are for user log purposes + "KCHNET0001L": _("Create %(connection)s virtual network '%(name)s'"), + "KCHNET0002L": _("Remove virtual network '%(ident)s'"), + "KCHNET0003L": _("Update virtual network '%(ident)s'"), + "KCHNET0004L": _("Activate virtual network '%(ident)s'"), + "KCHNET0005L": _("Deactivate virtual network '%(ident)s'"), + "KCHPOOL0001L": _("Create %(type)s storage pool '%(name)s'"), + "KCHPOOL0002L": _("Remove storage pool '%(ident)s'"), + "KCHPOOL0003L": _("Update storage pool '%(ident)s'"), + "KCHPOOL0004L": _("Activate storage pool '%(ident)s'"), + "KCHPOOL0005L": _("Deactivate storage pool '%(ident)s'"), + "KCHSNAP0001L": _("Create snapshot '%(name)s' at guest '%(vm)s'"), + "KCHSNAP0002L": _("Remove snapshot '%(ident)s' from guest '%(vm)s'"), + "KCHSNAP0003L": _("Revert guest '%(vm)s' to snapshot '%(ident)s'"), + "KCHTMPL0001L": _("Create template '%(name)s'"), + "KCHTMPL0002L": _("Remove template '%(ident)s'"), + "KCHTMPL0003L": _("Update template '%(ident)s'"), + "KCHTMPL0004L": _("Clone template '%(ident)s'"), + "KCHVM0001L": _("Create guest '%(name)s' from template '%(template)s'"), + "KCHVM0002L": _("Remove guest '%(ident)s'"), + "KCHVM0003L": _("Edit guest '%(ident)s'"), + "KCHVM0004L": _("Start guest '%(ident)s'"), + "KCHVM0005L": _("Power off guest '%(ident)s'"), + "KCHVM0006L": _("Shutdown guest '%(ident)s'"), + "KCHVM0007L": _("Restart guest '%(ident)s'"), + "KCHVM0008L": _("Connect to guest '%(ident)s' through novnc/spice"), + "KCHVM0009L": _("Clone guest '%(ident)s'"), + "KCHVM0010L": _("Migrate guest '%(ident)s' to '%(remote_host)s'"), + "KCHVM0011L": _("Suspend guest '%(ident)s'"), + "KCHVM0012L": _("Resume guest '%(ident)s'"), + "KCHVM0013L": _("Connect to guest '%(ident)s' through serial"), + "KCHVMHDEV0001L": _("Attach host device '%(name)s' to guest '%(vmid)s'"), + "KCHVMHDEV0002L": _("Detach host device '%(ident)s' from guest '%(vmid)s'"), + "KCHVMIF0001L": _("Attach network interface '%(network)s' to guest '%(vm)s'"), + "KCHVMIF0002L": _("Detach network interface '%(ident)s' from guest '%(vm)s'"), + "KCHVMIF0003L": _("Update network interface '%(ident)s' at guest '%(vm)s'"), + "KCHVMSTOR0001L": _("Attach %(type)s storage '%(path)s' to guest '%(vm)s'"), + "KCHVMSTOR0002L": _("Remove storage '%(ident)s' from guest '%(vm)s'"), + "KCHVMSTOR0003L": _("Update storage '%(ident)s' at guest '%(vm)s'"), + "KCHVOL0001L": _("Create storage volume '%(name)s' at pool '%(pool)s'"), + "KCHVOL0002L": _("Remove storage volume '%(ident)s' from pool '%(pool)s'"), + "KCHVOL0003L": _("Update storage volume '%(ident)s' at pool '%(pool)s'"), + "KCHVOL0004L": _("Wipe storage volume '%(ident)s' off pool '%(pool)s'"), + "KCHVOL0005L": _("Resize storage volume '%(ident)s' at pool '%(pool)s' with size %(size)s"), + "KCHVOL0006L": _("Clone storage volume '%(ident)s' at pool '%(pool)s'"), } -- 1.9.1

1 0

[PATCH] [Kimchi 0/2] Add translation support to user log
by Lucio Correia 13 May '16

13 May '16

Lucio Correia (2): Add translation to user log messages Use verbs in the past control/networks.py | 10 +++++----- control/storagepools.py | 10 +++++----- control/storagevolumes.py | 14 ++++++-------- control/templates.py | 8 ++++---- control/vm/hostdevs.py | 4 ++-- control/vm/ifaces.py | 6 +++--- control/vm/snapshots.py | 6 +++--- control/vm/storages.py | 6 +++--- control/vms.py | 26 +++++++++++++------------- i18n.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 89 insertions(+), 46 deletions(-) -- 1.9.1

1 0

[PATCH] [Wok 3/3] Use past verbs
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/i18n.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wok/i18n.py b/src/wok/i18n.py index d3342fc..4fc21f1 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -56,8 +56,8 @@ messages = { "WOKUTILS0005E": _("Invalid data unit '%(unit)s'"), # These messages (ending with L) are for user log purposes - "WOKCOL0001L": _("Request on collection"), - "WOKRES0001L": _("Request on resource"), - "WOKROOT0001L": _("User '%(username)s' login"), - "WOKROOT0002L": _("User '%(username)s' logout"), + "WOKCOL0001L": _("Request made on collection"), + "WOKRES0001L": _("Request made on resource"), + "WOKROOT0001L": _("User '%(username)s' logged in"), + "WOKROOT0002L": _("User '%(username)s' logged out"), } -- 1.9.1

1 0

[PATCH] [Wok 2/3] Add support and translate user request log messages
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 17 ++++++++++++----- src/wok/i18n.py | 6 ++++++ src/wok/root.py | 13 +++++++++---- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index 29b43ac..be5f618 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -33,13 +33,14 @@ from wok.control.utils import validate_params from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError from wok.exception import OperationFailed, UnauthorizedError, WokException +from wok.message import WokMessage from wok.reqlogger import RequestRecord from wok.utils import get_plugin_from_request, utf8_dict, wok_log # Default request log messages -COLLECTION_DEFAULT_LOG = "request on collection" -RESOURCE_DEFAULT_LOG = "request on resource" +COLLECTION_DEFAULT_LOG = "WOKCOL0001L" +RESOURCE_DEFAULT_LOG = "WOKRES0001L" LOG_DISABLED_METHODS = ['GET'] @@ -138,9 +139,11 @@ class Resource(object): action_result = action_fn(*model_args) # log request + code = self.getRequestMessage(method, action_name) reqParams = utf8_dict(self.log_args, request) + msg = WokMessage(code, reqParams).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method, action_name) % reqParams, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') @@ -218,8 +221,10 @@ class Resource(object): # log request if method not in LOG_DISABLED_METHODS: + code = self.getRequestMessage(method) + msg = WokMessage(code, self.log_args).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method) % self.log_args, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') @@ -437,9 +442,11 @@ class Collection(object): result = self.create(params, *args) # log request + code = self.getRequestMessage(method) reqParams = utf8_dict(self.log_args, params) + msg = WokMessage(code, reqParams).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method) % reqParams, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(USER_NAME, 'N/A') diff --git a/src/wok/i18n.py b/src/wok/i18n.py index 5a2876f..d3342fc 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -54,4 +54,10 @@ messages = { "WOKUTILS0002E": _("Timeout while running command '%(cmd)s' after %(seconds)s seconds"), "WOKUTILS0004E": _("Invalid data value '%(value)s'"), "WOKUTILS0005E": _("Invalid data unit '%(unit)s'"), + + # These messages (ending with L) are for user log purposes + "WOKCOL0001L": _("Request on collection"), + "WOKRES0001L": _("Request on resource"), + "WOKROOT0001L": _("User '%(username)s' login"), + "WOKROOT0002L": _("User '%(username)s' logout"), } diff --git a/src/wok/root.py b/src/wok/root.py index d1a2cc9..29ea657 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -32,14 +32,15 @@ from wok.control import sub_nodes from wok.control.base import Resource from wok.control.utils import parse_request from wok.exception import MissingParameter, OperationFailed +from wok.message import WokMessage from wok.reqlogger import RequestRecord from wok.utils import get_plugin_from_request ROOT_REQUESTS = { 'POST': { - 'login': "User '%(username)s' login", - 'logout': "User '%(username)s' logout", + 'login': "WOKROOT0001L", + 'logout': "WOKROOT0002L", }, } @@ -165,8 +166,10 @@ class WokRoot(Root): raise cherrypy.HTTPError(401) finally: method = 'POST' + code = self.getRequestMessage(method, 'login') + msg = WokMessage(code, params).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method, 'login') % params, + msg, app=get_plugin_from_request(), req=method, user=cherrypy.session.get(auth.USER_NAME, 'N/A') @@ -177,9 +180,11 @@ class WokRoot(Root): @cherrypy.expose def logout(self): method = 'POST' + code = self.getRequestMessage(method, 'logout') params = {'username': cherrypy.session.get(auth.USER_NAME, 'N/A')} + msg = WokMessage(code, params).get_text(prepend_code=False) RequestRecord( - self.getRequestMessage(method, 'logout') % params, + msg, app=get_plugin_from_request(), req=method, user=params['username'] -- 1.9.1

1 0

[PATCH] [Wok 1/3] Add option to get Wok message text without code
by Lucio Correia 13 May '16

13 May '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/message.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wok/message.py b/src/wok/message.py index a3794d0..a7162c7 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -78,7 +78,11 @@ class WokMessage(object): return translation.gettext(text) - def get_text(self): + def get_text(self, prepend_code=True): msg = self._get_translation() msg = unicode(msg, 'utf-8') % self.args - return "%s: %s" % (self.code, msg) + + if prepend_code: + return "%s: %s" % (self.code, msg) + + return msg -- 1.9.1

1 0

[PATCH] [Wok 0/3] Add translation support to user log
by Lucio Correia 13 May '16

13 May '16

Lucio Correia (3): Add option to get Wok message text without code Add support and translate user request log messages Use past verbs src/wok/control/base.py | 17 ++++++++++++----- src/wok/i18n.py | 6 ++++++ src/wok/message.py | 8 ++++++-- src/wok/root.py | 13 +++++++++---- 4 files changed, 33 insertions(+), 11 deletions(-) -- 1.9.1

1 0

[PATCH v2] [Kimchi] Check if qemu/libvirt user has permission to use the image
by Jose Ricardo Ziviani 13 May '16

13 May '16

- Based on this check this patch returns a new field to the interface be able to disable such ISO before creating any templates with it. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- v2: - check permission is now generic for any image control/storagevolumes.py | 3 ++- docs/API.md | 2 ++ mockmodel.py | 6 ++++-- model/storagevolumes.py | 10 ++++++++-- tests/test_model_storagevolume.py | 2 +- tests/test_rest.py | 1 + 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/control/storagevolumes.py b/control/storagevolumes.py index a04ad35..e7f5b54 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -83,7 +83,8 @@ class StorageVolume(Resource): 'path': self.info['path'], 'used_by': self.info['used_by'], 'format': self.info['format'], - 'isvalid': self.info['isvalid']} + 'isvalid': self.info['isvalid'], + 'has_permission': self.info['has_permission']} for key in ('os_version', 'os_distro', 'bootable', 'base'): val = self.info.get(key) diff --git a/docs/API.md b/docs/API.md index 6d502a9..83f9d38 100644 --- a/docs/API.md +++ b/docs/API.md @@ -614,6 +614,8 @@ A interface represents available network interface on VM. * bootable *(optional)*: True if iso image is bootable and not corrupted. * used_by: Name of vms which use this volume. * isvalid: True if is a valid volume. + * has_permission: qemu/libvirt user has the right permission to + to use the image * **DELETE**: Remove the Storage Volume * **POST**: *See Storage Volume Actions* diff --git a/mockmodel.py b/mockmodel.py index 142e81f..38d08b5 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -476,14 +476,16 @@ class MockStorageVolumes(object): 'type': 'block', 'path': base_path + '1', 'used_by': [], - 'isvalid': True}, + 'isvalid': True, + 'has_permission': True}, 'unit:0:0:2': {'capacity': 2048, 'format': 'unknown', 'allocation': 512, 'type': 'block', 'path': base_path + '2', 'used_by': [], - 'isvalid': True}} + 'isvalid': True, + 'has_permission': True}} class MockVolumeGroups(object): diff --git a/model/storagevolumes.py b/model/storagevolumes.py index e037e35..da42e85 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -30,12 +30,14 @@ from lxml.builder import E from wok.exception import InvalidOperation, InvalidParameter, IsoFormatError from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.utils import add_task, get_unique_file_name, wok_log +from wok.utils import add_task, get_unique_file_name +from wok.utils import probe_file_permission_as_user, wok_log from wok.xmlutils.utils import xpath_get_text from wok.model.tasks import TaskModel from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.isoinfo import IsoImage +from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel @@ -273,6 +275,7 @@ class StorageVolumeModel(object): self.task = TaskModel(**kargs) self.storagevolumes = StorageVolumesModel(**kargs) self.storagepool = StoragePoolModel(**kargs) + self.libvirt_user = UserTests().probe_user() @staticmethod def get_storagevolume(poolname, name, conn): @@ -329,13 +332,15 @@ class StorageVolumeModel(object): isvalid = False used_by = get_disk_used_by(self.objstore, self.conn, path) + ret, _ = probe_file_permission_as_user(path, self.libvirt_user) res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], allocation=info[2], path=path, used_by=used_by, format=fmt, - isvalid=isvalid) + isvalid=isvalid, + has_permission=ret) if fmt == 'iso': if os.path.islink(path): path = os.path.join(os.path.dirname(path), os.readlink(path)) @@ -347,6 +352,7 @@ class StorageVolumeModel(object): bootable = True except IsoFormatError: bootable = False + res.update( dict(os_distro=os_distro, os_version=os_version, path=path, bootable=bootable)) diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index 7dbda97..56dda8f 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -258,7 +258,7 @@ class StorageVolumeTests(unittest.TestCase): self.assertEquals(200, resp.status) keys = [u'name', u'type', u'capacity', u'allocation', u'path', - u'used_by', u'format', u'isvalid'] + u'used_by', u'format', u'isvalid', u'has_permission'] for vol in json.loads(resp.read()): resp = self.request(uri + '/' + vol['name']) self.assertEquals(200, resp.status) diff --git a/tests/test_rest.py b/tests/test_rest.py index c1294ee..cae196e 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1174,6 +1174,7 @@ class RestTests(unittest.TestCase): self.assertEquals('17', storagevolume['os_version']) self.assertEquals('fedora', storagevolume['os_distro']) self.assertEquals(True, storagevolume['bootable']) + self.assertEquals(True, storagevolume['has_permission']) # Create a template # In real model os distro/version can be omitted -- 2.7.4

2 1

Links for accessibility
by Samuel Henrique De Oliveira Guimaraes 13 May '16

13 May '16

Hi team, I've seen some issues on Github regarding accessibility and I found some articles that may help us dealing with new features or bug fixes in the future: - http://www.sitepoint.com/accessible-web-components/ - http://webaim.org/techniques/aria/ - http://heydonworks.com/practical_aria_examples/ - https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/ARIA_Test_C… And most important, some real use case examples with source code: - http://oaa-accessibility.org/ Thanks, Samuel

1 0

[PATCH][Kimchi 1/2] Implements support to memory hotplug in non-NUMA guests
by Rodrigo Trujillo 12 May '16

12 May '16

This patch makes necessary changes in Kimchi guest update to support memory hotplug operations in non-numa guests, due to latest Libvirt changes. --- model/utils.py | 18 ++++++++++++++++++ model/vms.py | 53 +++++++++++++++++------------------------------------ 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/model/utils.py b/model/utils.py index b7ea82e..da62971 100644 --- a/model/utils.py +++ b/model/utils.py @@ -129,3 +129,21 @@ def metadata_exists(dom): if root.find("metadata") is None: return False return True + + +def has_cpu_numa(dom): + """ + Verify if domain has NUMA configuration + Returns: True or False + """ + root = etree.fromstring(dom.XMLDesc(0)) + return (root.find('./cpu/numa') is not None) + + +def set_numa_memory(mem, root): + """ + Set new NUMA memory value + Returns: etree element updated + """ + root.find('./cpu/numa/cell').set('memory', str(mem)) + return root diff --git a/model/vms.py b/model/vms.py index cf40ad1..f88cfdb 100644 --- a/model/vms.py +++ b/model/vms.py @@ -61,9 +61,9 @@ from wok.plugins.kimchi.model.utils import set_metadata_node from wok.plugins.kimchi.screenshot import VMScreenshot from wok.plugins.kimchi.utils import get_next_clone_name from wok.plugins.kimchi.utils import template_name_from_uri -from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml, get_numa_xml from wok.plugins.kimchi.xmlutils.cpu import get_topology_xml from wok.plugins.kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks +from utils import has_cpu_numa, set_numa_memory DOM_STATE_MAP = {0: 'nostate', @@ -769,10 +769,10 @@ class VMModel(object): # topology is being undefined: remove it new_xml = xml_item_remove(new_xml, XPATH_TOPOLOGY) - # Updating memory and NUMA if necessary, if vm is offline + # Updating memory if vm is offline if (not dom.isActive() and 'memory' in params and params['memory'] != {}): - new_xml = self._update_memory_config(new_xml, params) + new_xml = self._update_memory_config(new_xml, params, dom) if 'graphics' in params: new_xml = self._update_graphics(dom, new_xml, params) @@ -810,7 +810,7 @@ class VMModel(object): vm_name = name return (nonascii_name if nonascii_name is not None else vm_name, dom) - def _update_memory_config(self, xml, params): + def _update_memory_config(self, xml, params, dom): # Cannot pass max memory if there is not support to memory hotplug # Then set max memory as memory, just to continue with the update if not self.caps.mem_hotplug_support: @@ -905,16 +905,18 @@ class VMModel(object): root.remove(currentMem) memory = root.find('.memory') - # If host/guest does not support memory hot plug, then there is - # NUMA configure, we must update the tag directly - if not self.caps.mem_hotplug_support: - if memory is not None: - memory.text = str(newMem) - else: + # Set NUMA parameterers if necessary. NUMA is not required for CPU + # and Memory hotplug anymore + if has_cpu_numa(dom): if memory is not None: # Libvirt is going to set the value automatically with # the value configured in NUMA tag root.remove(memory) + root = set_numa_memory(newMem, root) + else: + # update the memory tag directly + if memory is not None: + memory.text = str(newMem) if (maxMemTag is not None) and (not hasMaxMem): if newMem == newMaxMem: @@ -922,22 +924,6 @@ class VMModel(object): else: maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) - # Set NUMA parameterers and create it if does not exist - # CPU tag DO NOT exist? Create it - cpu = root.find(XPATH_CPU) - if cpu is None: - cpu = get_cpu_xml(0, newMem) - root.insert(0, ET.fromstring(cpu)) - else: - # Does NUMA tag exist ? - numaTag = cpu.find('./numa') - if numaTag is None: - numa_element = get_numa_xml(0, newMem) - cpu.insert(0, ET.fromstring(numa_element)) - else: - cellTag = cpu.find('./numa/cell') - cellTag.set('memory', str(newMem)) - # Setting memory hard limit to max_memory + 1GiB memtune = root.find('memtune') if memtune is not None: @@ -990,12 +976,9 @@ class VMModel(object): if not self.caps.mem_hotplug_support: raise InvalidOperation("KCHVM0046E") - # Check if the vm xml supports memory hotplug, if not, static update - # must be done firstly, then Kimchi is going to update the xml xml = dom.XMLDesc(0) - numa_mem = xpath_get_text(xml, XPATH_NUMA_CELL + '/@memory') max_mem = xpath_get_text(xml, './maxMemory') - if numa_mem == [] or max_mem == []: + if max_mem == []: raise OperationFailed('KCHVM0042E', {'name': dom.name()}) # Memory live update must be done in chunks of 1024 Mib or 1Gib @@ -1038,12 +1021,10 @@ class VMModel(object): # Hot add given number of memory devices in the guest flags = libvirt.VIR_DOMAIN_MEM_CONFIG | libvirt.VIR_DOMAIN_MEM_LIVE # Create memory device xml - mem_dev_xml = etree.tostring( - E.memory( - E.target( - E.size('1', unit='GiB'), - E.node('0')), - model='dimm')) + tmp_xml = E.memory(E.target(E.size('1', unit='GiB')), model='dimm') + if has_cpu_numa(dom): + tmp_xml.find('target').append(E.node('0')) + mem_dev_xml = etree.tostring(tmp_xml) # Add chunks of 1G of memory for i in range(amount): dom.attachDeviceFlags(mem_dev_xml, flags) -- 2.1.0

2 2

[PATCH v2] [Kimchi 0/2] Filtering VEPA interfaces
by dhbarboza82＠gmail.com 12 May '16

12 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> v2: - fixed issue found by Aline This patch set filters the VEPA interfaces to be used in network creation by eliminating the ConnectX-4 cards. Unit tests, docs and UI changes included. Daniel Henrique Barboza (2): Filter VEPA interfaces: adding 'module' to interfaces API Filter VEPA interfaces: JS changes control/interfaces.py | 3 ++- docs/API.md | 2 ++ tests/test_rest.py | 2 +- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.network_add_main.js | 12 ++++++++++-- 5 files changed, 29 insertions(+), 4 deletions(-) -- 2.5.5

2 3

[PATCH][Kimchi] Fix memory return in vm with memory devices hotplugged
by Rodrigo Trujillo 12 May '16

12 May '16

Libvirt is updating 'currentmemory' and 'memory' if its values are equal, when user attaches a memory device. So, we can use the function maxMemory() of Libvirt API to retrieve the value of memory. Kimchi does not use currentMemory tag, but once it is the amount seen inside a running guest, if it was changed outside kimchi, we must sum the memory devices values (if any) to have the right value seen inside guest. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/model/vms.py b/model/vms.py index 7bf4c77..2374d31 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1210,24 +1210,21 @@ class VMModel(object): 'threads': threads, } - if state == 'shutoff': - val = xpath_get_text(xml, XPATH_DOMAIN_MEMORY)[0] - unit_list = xpath_get_text(xml, XPATH_DOMAIN_MEMORY_UNIT) - if len(unit_list) > 0: - unit = unit_list[0] - else: - unit = 'KiB' - memory = convert_data_size(val, unit, 'MiB') - else: - # Return current memory plus the amount of memory given by memory - # devices + # Kimchi does not make use of 'currentMemory' tag, it only updates + # NUMA memory config or 'memory' tag directly. In memory hotplug, + # Libvirt always updates 'memory', so we can use this tag retrieving + # from Libvirt API maxMemory() function, regardeless of the VM state + # Case VM changed currentMemory outside Kimchi, sum mem devs + memory = dom.maxMemory() >> 10 + curr_mem = (info[2] >> 10) + if memory != curr_mem: root = ET.fromstring(xml) totMemDevs = 0 for size in root.findall('./devices/memory/target/size'): totMemDevs += convert_data_size(size.text, size.get('unit'), 'MiB') - memory = (info[2] >> 10) + totMemDevs + memory = curr_mem + totMemDevs # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

2 1

[PATCH][Kimchi] Does not use slot in memory device removal
by Rodrigo Trujillo 12 May '16

12 May '16

Latest Libvirt version changed, and does not add anymore automatically address/slots for memory devices hotplugged. Kimchi tries to remove memory devices by theirs slot number, when virtual machine is offline, and if it has memory devices configured. This behavior will raise an error, so this patch fix this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/model/vms.py b/model/vms.py index b617b1d..7bf4c77 100644 --- a/model/vms.py +++ b/model/vms.py @@ -846,9 +846,9 @@ class VMModel(object): newMem = newMem - (len(memDevs) * (1024 << 10)) elif newMem < (oldMem << 10): devsRemove = len(memDevs) - (oldMem - (newMem >> 10))/1024 - 1 - for dev in memDevs: - if int(dev.xpath('./address/@slot')[0]) > devsRemove: - root.find('./devices').remove(dev) + for dev in enumerate(memDevs): + if dev[0] > devsRemove: + root.find('./devices').remove(dev[1]) newMem = \ newMem - ( len(root.findall('./devices/memory')) * 1024 << 10 -- 2.1.0

2 1

[PATCH] [Kimchi] Check if qemu/libvirt user has permission to use an ISO
by Jose Ricardo Ziviani 12 May '16

12 May '16

- Based on this check this patch returns a new field to the interface be able to disable such ISO before creating any templates with it. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- control/storagevolumes.py | 3 +++ docs/API.md | 2 ++ model/storagevolumes.py | 9 +++++++-- tests/test_model_storagevolume.py | 3 ++- tests/test_rest.py | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/control/storagevolumes.py b/control/storagevolumes.py index a04ad35..08cd989 100644 --- a/control/storagevolumes.py +++ b/control/storagevolumes.py @@ -90,6 +90,9 @@ class StorageVolume(Resource): if val: res[key] = val + if self.info['format'] == 'iso': + res['has_permission'] = self.info.get('has_permission', False) + return res diff --git a/docs/API.md b/docs/API.md index 9d42c53..6afa6e4 100644 --- a/docs/API.md +++ b/docs/API.md @@ -613,6 +613,8 @@ A interface represents available network interface on VM. * bootable *(optional)*: True if iso image is bootable and not corrupted. * used_by: Name of vms which use this volume. * isvalid: True if is a valid volume. + * has_permission *(optional)*: qemu/libvirt user has the right permission to + to use the image * **DELETE**: Remove the Storage Volume * **POST**: *See Storage Volume Actions* diff --git a/model/storagevolumes.py b/model/storagevolumes.py index e037e35..9d4ac43 100644 --- a/model/storagevolumes.py +++ b/model/storagevolumes.py @@ -30,12 +30,14 @@ from lxml.builder import E from wok.exception import InvalidOperation, InvalidParameter, IsoFormatError from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.utils import add_task, get_unique_file_name, wok_log +from wok.utils import add_task, get_unique_file_name +from wok.utils import probe_file_permission_as_user, wok_log from wok.xmlutils.utils import xpath_get_text from wok.model.tasks import TaskModel from wok.plugins.kimchi.config import READONLY_POOL_TYPE from wok.plugins.kimchi.isoinfo import IsoImage +from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagepools import StoragePoolModel @@ -347,9 +349,12 @@ class StorageVolumeModel(object): bootable = True except IsoFormatError: bootable = False + + user = UserTests().probe_user() + ret, _ = probe_file_permission_as_user(path, user) res.update( dict(os_distro=os_distro, os_version=os_version, path=path, - bootable=bootable)) + bootable=bootable, has_permission=ret)) return res def wipe(self, pool, name): diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index 7dbda97..bb7758f 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -266,7 +266,8 @@ class StorageVolumeTests(unittest.TestCase): all_keys = keys[:] vol_info = json.loads(resp.read()) if vol_info['format'] == 'iso': - all_keys.extend([u'os_distro', u'os_version', u'bootable']) + all_keys.extend([u'os_distro', u'os_version', u'bootable', + u'has_permission']) self.assertEquals(sorted(all_keys), sorted(vol_info.keys())) diff --git a/tests/test_rest.py b/tests/test_rest.py index b73d16c..516a38b 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1174,6 +1174,7 @@ class RestTests(unittest.TestCase): self.assertEquals('17', storagevolume['os_version']) self.assertEquals('fedora', storagevolume['os_distro']) self.assertEquals(True, storagevolume['bootable']) + self.assertEquals(True, storagevolume['has_permission']) # Create a template # In real model os distro/version can be omitted -- 2.7.4

4 3

[PATCH] [Kimchi] Depends on Fixed "Add Template" modal window alignment patch; add loading/creating
by Socorro Stoppler 12 May '16

12 May '16

This patch address the suggestions made by Aline in previous review: - Add a loader icon until get all the information to display the ISOs (as Ramon also suggested) - When selecting "Create" button, it may take some time, specially when using an local Image file, so once user selects it, disable the button and change its label to "Creating..." like it was before. When you receive the server response, display the error or close the dialog on success. - Move the filter input box to the same line of select "All" check box. (Addressed by Samuel's patch - Fixed "Add Template" modal window alignment patch) Socorro Stoppler (1): Added loading icon and 'Creating' for create template ui/js/src/kimchi.template_add_main.js | 25 +++++++++++++++++++------ ui/pages/template-add.html.tmpl | 16 ++++++++-------- 2 files changed, 27 insertions(+), 14 deletions(-) -- 2.5.0

2 2

[PATCH] [Kimchi] Fixed "Add Template" modal window alignment
by sguimaraes943＠gmail.com 12 May '16

12 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> nor alignment issues with kimchi.css and Add Template modal html Samuel Guimarães (1): Fixed "Add Template" modal window alignment ui/css/kimchi.css | 18 +++++++++++++++++- ui/css/src/modules/_templates.scss | 16 +++++++++++++++- ui/js/src/kimchi.template_add_main.js | 2 +- ui/pages/template-add.html.tmpl | 17 ++++++----------- 4 files changed, 39 insertions(+), 14 deletions(-) -- 1.9.3

3 3

[PATCH] [Kimchi] Adding 'source_media' docs in docs/API.md
by dhbarboza82＠gmail.com 12 May '16

12 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This attribute went through changes recently and none of them, neither the previous usage before them, was documented. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- docs/API.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/API.md b/docs/API.md index 9d42c53..5fa722c 100644 --- a/docs/API.md +++ b/docs/API.md @@ -295,6 +295,10 @@ Represents a snapshot of the Virtual Machine's primary monitor. * **GET**: Retrieve a summarized list of all defined Templates * **POST**: Create a new Template * name: The name of the Template. Used to identify the Template in this API + * source_media: dictionary. The type of media to be used in the installation. + * type: the type of the media. Values: 'netboot' and 'disk'. + * path: applicable for type = 'disk' only. Indicates the path of the + source media. * os_distro *(optional)*: The operating system distribution * os_version *(optional)*: The version of the operating system distribution * memory *(optional)*: The memory parameters of the template, specify one -- 2.5.5

3 2

[PATCH] [Kimchi 0/2] *** DEPENDS ON WOK SEARCH QUERY FIX *** filtering VEPA interfaces
by dhbarboza82＠gmail.com 12 May '16

12 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch set filters the VEPA interfaces to be used in network creation by eliminating the ConnectX-4 cards. Unit tests, docs and UI changes included. Daniel Henrique Barboza (2): Filter VEPA interfaces: adding 'module' to interfaces API Filter VEPA interfaces: JS changes control/interfaces.py | 3 ++- docs/API.md | 2 ++ tests/test_rest.py | 2 +- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.network_add_main.js | 12 ++++++++++-- 5 files changed, 29 insertions(+), 4 deletions(-) -- 2.5.5

3 5

[PATCH] [Wok] Updated .pot and *.po files using update-po.
by archus＠linux.vnet.ibm.com 11 May '16

11 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Updated .pot and *.po files to have all new externalized strings. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- po/de_DE.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/en_US.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/es_ES.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/fr_FR.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/it_IT.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/ja_JP.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/ko_KR.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 47 +++++++++++++++++++++++++++++++++++++++++++---- po/ru_RU.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/wok.pot | 46 ++++++++++++++++++++++++++++++++++++++++++---- po/zh_CN.po | 47 +++++++++++++++++++++++++++++++++++++++++++---- po/zh_TW.po | 46 ++++++++++++++++++++++++++++++++++++++++++---- 12 files changed, 506 insertions(+), 48 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 70434b7..cceb050 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -78,6 +78,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "%(item)s konnten nicht im Datenspeicher gefunden werden" @@ -112,6 +120,12 @@ msgstr "STACK" msgid "Go to Homepage" msgstr "Gehe zu Homepage" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "Keine solchen Daten verfügbar." + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -125,9 +139,6 @@ msgstr "Abbrechen" msgid "Confirm" msgstr "Bestätigen" -msgid "No such data available." -msgstr "Keine solchen Daten verfügbar." - msgid "Loading..." msgstr "Wird geladen..." @@ -199,6 +210,12 @@ msgstr "Anmelden" msgid "Logging in..." msgstr "Wird angemeldet..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -222,3 +239,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/en_US.po b/po/en_US.po index b150487..afee270 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -77,6 +77,14 @@ msgid "Creation of log file failed: %(err)s" msgstr "" #, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + +#, python-format msgid "Unable to find %(item)s in datastore" msgstr "" @@ -108,6 +116,12 @@ msgstr "" msgid "Go to Homepage" msgstr "" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "" + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -119,9 +133,6 @@ msgstr "" msgid "Confirm" msgstr "" -msgid "No such data available." -msgstr "" - msgid "Loading..." msgstr "" @@ -191,6 +202,12 @@ msgstr "" msgid "Logging in..." msgstr "" +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -214,3 +231,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index fbaac01..1072d94 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -77,6 +77,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "No se puede encontrar %(item)s en el almacén de datos" @@ -111,6 +119,12 @@ msgstr "PILA" msgid "Go to Homepage" msgstr "Ir a la página inicial" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "No hay datos de ese tipo disponibles." + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -125,9 +139,6 @@ msgstr "Cancelar" msgid "Confirm" msgstr "Confirmar" -msgid "No such data available." -msgstr "No hay datos de ese tipo disponibles." - msgid "Loading..." msgstr "Cargando..." @@ -199,6 +210,12 @@ msgstr "Iniciar sesión" msgid "Logging in..." msgstr "Iniciando sesión..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -222,3 +239,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index 0cc7d0a..32d88e1 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2014-08-27 21:30+0000\n" "Last-Translator: BobSynfig\n" "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/" @@ -80,6 +80,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "Impossible de trouver %(item)s dans le magasin de données" @@ -114,6 +122,12 @@ msgstr "STACK" msgid "Go to Homepage" msgstr "Aller à la page d'accueil" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "De telles données ne sont pas disponibles." + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -128,9 +142,6 @@ msgstr "Annuler" msgid "Confirm" msgstr "Confirmer" -msgid "No such data available." -msgstr "De telles données ne sont pas disponibles." - msgid "Loading..." msgstr "Chargement en cours..." @@ -202,6 +213,12 @@ msgstr "Se connecter" msgid "Logging in..." msgstr "En cours de connexion..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -225,3 +242,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index e4b9503..3627229 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -77,6 +77,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "Impossibile trovare %(item)s nell'archivio dati" @@ -111,6 +119,12 @@ msgstr "STACK" msgid "Go to Homepage" msgstr "Vai alla home page" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "Dati indicati non disponibili." + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -125,9 +139,6 @@ msgstr "Annulla" msgid "Confirm" msgstr "Conferma" -msgid "No such data available." -msgstr "Dati indicati non disponibili." - msgid "Loading..." msgstr "Caricamento in corso..." @@ -199,6 +210,12 @@ msgstr "Accedi" msgid "Logging in..." msgstr "Accesso in corso..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -222,3 +239,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/ja_JP.po b/po/ja_JP.po index 3f1d7af..b992283 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -76,6 +76,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "%(item)s はデータ・ストアに見つかりません" @@ -110,6 +118,12 @@ msgstr "スタック" msgid "Go to Homepage" msgstr "ホーム・ページに移動する" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "そのようなデータはありません。" + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -123,9 +137,6 @@ msgstr "取消" msgid "Confirm" msgstr "確認" -msgid "No such data available." -msgstr "そのようなデータはありません。" - msgid "Loading..." msgstr "ロードしています..." @@ -195,6 +206,12 @@ msgstr "ログイン" msgid "Logging in..." msgstr "ログインしています..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -218,3 +235,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 1afff07..abe17ee 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -75,6 +75,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "데이터 저장소에서 %(item)s을(를) 찾을 수 없습니다." @@ -107,6 +115,12 @@ msgstr "스택" msgid "Go to Homepage" msgstr "홈 페이지로 이동" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "해당 데이터가 없습니다." + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -120,9 +134,6 @@ msgstr "취소" msgid "Confirm" msgstr "확인" -msgid "No such data available." -msgstr "해당 데이터가 없습니다." - msgid "Loading..." msgstr "로드 중..." @@ -193,6 +204,12 @@ msgstr "로그인" msgid "Logging in..." msgstr "로그인 중..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -216,3 +233,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2ce4843..081ab9d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2015-03-23 12:57+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -94,6 +94,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "Não foi possível encontrar %(item)s no datastore" @@ -127,6 +135,12 @@ msgstr "PILHA" msgid "Go to Homepage" msgstr "Ir para a Página Inicial" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "Não há dados disponíveis." + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -141,9 +155,6 @@ msgstr "Cancelar" msgid "Confirm" msgstr "Confirmar" -msgid "No such data available." -msgstr "Não há dados disponíveis." - msgid "Loading..." msgstr "Carregando..." @@ -214,6 +225,12 @@ msgstr "Entrar" msgid "Logging in..." msgstr "Entrando..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "Peers" @@ -237,3 +254,25 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + + +msgid "Search" +msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index a1dd8b6..5bd9ba4 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2014-08-28 17:32+0000\n" "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/" @@ -76,6 +76,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "Не найден %(item)s в хранилище данных" @@ -108,6 +116,12 @@ msgstr "Стек" msgid "Go to Homepage" msgstr "Перейти на главную страницу" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "Нет таких данных." + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -121,9 +135,6 @@ msgstr "Отмена" msgid "Confirm" msgstr "Подтвердить" -msgid "No such data available." -msgstr "Нет таких данных." - msgid "Loading..." msgstr "Загружается..." @@ -193,6 +204,12 @@ msgstr "Войти" msgid "Logging in..." msgstr "Вход..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -216,3 +233,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/wok.pot b/po/wok.pot index 9e136c9..657c663 100755 --- a/po/wok.pot +++ b/po/wok.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -77,6 +77,14 @@ msgid "Creation of log file failed: %(err)s" msgstr "" #, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + +#, python-format msgid "Unable to find %(item)s in datastore" msgstr "" @@ -108,6 +116,12 @@ msgstr "" msgid "Go to Homepage" msgstr "" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "" + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -119,9 +133,6 @@ msgstr "" msgid "Confirm" msgstr "" -msgid "No such data available." -msgstr "" - msgid "Loading..." msgstr "" @@ -191,6 +202,12 @@ msgstr "" msgid "Logging in..." msgstr "" +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -214,3 +231,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 690c4d6..2891d4d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -92,6 +92,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "在数据存储中找不到%(item)s" @@ -124,6 +132,12 @@ msgstr "调用栈" msgid "Go to Homepage" msgstr "返回主页" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "没有可用的数据" + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -136,9 +150,6 @@ msgstr "取消" msgid "Confirm" msgstr "确认" -msgid "No such data available." -msgstr "没有可用的数据" - msgid "Loading..." msgstr "正在加载..." @@ -208,6 +219,12 @@ msgstr "登录" msgid "Logging in..." msgstr "登录中..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "对等机" @@ -231,3 +248,25 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + + +msgid "Search" +msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index ca537e1..47ff20a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-23 16:14-0300\n" +"POT-Creation-Date: 2016-05-11 08:43+0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -75,6 +75,14 @@ msgstr "" msgid "Creation of log file failed: %(err)s" msgstr "" +#, python-format +msgid "Unable to find notification %(id)s" +msgstr "" + +#, python-format +msgid "Unable to delete notification %(id)s: %(message)s" +msgstr "" + #, python-format msgid "Unable to find %(item)s in datastore" msgstr "在資料儲存庫中找不到 %(item)s" @@ -107,6 +115,12 @@ msgstr "堆疊" msgid "Go to Homepage" msgstr "跳至首頁" +msgid "Settings" +msgstr "" + +msgid "No such data available." +msgstr "沒有此類可用資料。" + msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " @@ -120,9 +134,6 @@ msgstr "取消 " msgid "Confirm" msgstr "確認" -msgid "No such data available." -msgstr "沒有此類可用資料。" - msgid "Loading..." msgstr "正在載入..." @@ -192,6 +203,12 @@ msgstr "登入" msgid "Logging in..." msgstr "正在登入..." +msgid "Language" +msgstr "" + +msgid "Locale" +msgstr "" + msgid "Peers" msgstr "" @@ -215,3 +232,24 @@ msgstr "" msgid "Powered by" msgstr "" + +msgid "User Activity Log" +msgstr "" + +msgid "Advanced Search" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Reset To Default" +msgstr "" + +msgid "Search results by:" +msgstr "" + +msgid "Request Type" +msgstr "" + +msgid "Search" +msgstr "" -- 1.8.3.1

3 2

[Wok][PATCH v2 0/7] Multi-Culture Support
by pkulkark＠linux.vnet.ibm.com 11 May '16

11 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch set provides multi-culture support by adding another drop down list during login for user locale selection. The numeric data and datetime fields are formatted based on the locale selected. Pooja Kulkarni (7): Multi-Culture Support - Add a separate drop down list for locale Multi-Culture support - Add methods to get and set locales in wok.lang.js Multi-Culture support - Add locale in format settings in wok.line-chart.js Multi-Culture support : Format datetime as per locale in wok.list.js Multi-Culture support : Implement new drop down list for locale in wok.login.js Multi-Culture support : Modify wok.formatMeasurement util to include formatting based on locale Multi-Culture support : Format datetime in user activity log as per locale ui/js/src/wok.lang.js | 8 ++++++++ ui/js/src/wok.line-chart.js | 3 ++- ui/js/src/wok.list.js | 6 +++++- ui/js/src/wok.login.js | 9 +++++++++ ui/js/src/wok.utils.js | 10 +++++++--- ui/js/wok.bootgrid.js | 10 +++++++++- ui/js/wok.user-log.js | 3 ++- ui/pages/login.html.tmpl | 34 ++++++++++++++++++++++++++++++++++ 8 files changed, 76 insertions(+), 7 deletions(-) -- 2.1.0

6 34

[PATCH V3] [Wok 0/7] Multi-Culture Support Changes
by archus＠linux.vnet.ibm.com 11 May '16

11 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> V3 patches for muti-culture support which includes formatting of date, time, datetime, number and addition dropdown to select locale in login page. Also handle the command modificationis suggested. Archana Singh (7): Multi-Culture Support - Add a separate drop down list for locale Multi-Culture support - Add methods to get and set locales in wok.lang.js Multi-Culture support - Add locale in format settings in wok.line-chart.js Multi-Culture support : Added support for converters in widget wok.list.js Multi-Culture support : Implement new drop down list for locale in wok.login.js Multi-Culture support : Modify util to include formatting based on locale Multi-Culture support : Added support to add converters to bootgrid ui/js/src/wok.lang.js | 16 +++++++++++++ ui/js/src/wok.line-chart.js | 3 ++- ui/js/src/wok.list.js | 12 +++++++++- ui/js/src/wok.login.js | 15 ++++++++++-- ui/js/src/wok.utils.js | 46 +++++++++++++++++++++++++++++++++++-- ui/js/wok.bootgrid.js | 8 ++++--- ui/js/wok.user-log.js | 8 +++---- ui/pages/login.html.tmpl | 56 ++++++++++++++++++++++++++++++++++----------- 8 files changed, 138 insertions(+), 26 deletions(-) -- 1.8.3.1

3 10

[PATCH] [WoK] Fixing WoK match in search queries
by dhbarboza82＠gmail.com 11 May '16

11 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> Prior to this patch, supposing an example with the VMs API of Kimchi, we could send a GET request like this: /plugins/kimchi/vms?state=thisisnotrunning and get as a answer all the VMs with state=running. The reason was that WoK was doing a membership verification in the input value even if the value isn't a list and, in this case, 'running' in 'thisisnotrunning' was returning True and the VM would be added to the returned results. This also impacted regular expressions with negative lookahead. Using the same API mentioned above, a search query like 'state=^(?!running).*$' would return all VMs because if state was not 'running' it would match this regex and, if it was 'running', it would match this membership rule because 'running' in '^(?!running).*$' returns True. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/wok/control/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index f314d18..29b43ac 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -392,8 +392,9 @@ class Collection(object): continue if all(key in res.data and - (res.data[key] == val or res.data[key] in val or - re.match(str(val), res.data[key])) + (res.data[key] == val or + re.match(str(val), res.data[key]) or + (isinstance(val, list) and res.data[key] in val)) for key, val in fields_filter.iteritems()): data.append(res.data) return data -- 2.5.5

3 2

[RFC] How to filter certain interfaces for VEPA in the UI
by Daniel Henrique Barboza 10 May '16

10 May '16

Hi there, I want to filter the interfaces listing in the UI when creating VEPA networks. Reason is that some network cards (you got it right - ConnectX-4 !!) does not have support for this kind of network yet. Looking in the backend/UI code I want to discuss possible ways of filtering a collection listing. For the sake of this discussion let's assume that the 'module' parameter (the kernel module that loaded the interface) is already available at /plugins/kimchi/network/interfaces API: (1) use query strings. For example, '/plugins/kimchi/vms?state=running' would list only the VMs that are running. Problem is that AFAIK I can't use a query string to say "I want all VMs but the ones running" or something like /plugins/kimchi/vms?state!=running. To do that I would need to first list all VMs then list the running VMs and do list_all - list_running . Or, in our case, list_all - list_connectx4. (2) Implement it in JS. There are functions like 'loadInterfaces' which receives a filter option to get specific elements. It's easy to simply implement a 'loadVEPAInterfaces' and filter everything there. It wouldn't require to fire 2 GET requests and do a list operation to exclude the interfaces. We can simply work with the interfaces returned from the 'all' listing. My issues with (1) and (2) is that I feel I am putting too much logic in UI code. Suppose that the criteria for VEPA networks changes and now it's not a simple matter of excluding the interfaces with module=mlx5_core. What then? A backend solution would be, for example: (3) Add a new parameter called 'vepa_capable' in network/interfaces API, then a simple call to /plugins/kimchi/network/interfaces?vepa_capable=true would return the information, with a single GET call, in a way that the UI would be oblivious of what's going on in the backend. We can change the backend logic anytime without messing with the UI calls Of all these approaches I like (3) more, but not by far. This is why I want to hear options and perhaps other ideas aside from these 3. Thanks, Daniel

2 3

[PATCH] [Kimchi] Add support to Libvirt Events.
by pvital＠linux.vnet.ibm.com 10 May '16

10 May '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch adds support to handle in Kimchi any Libvirt Event, just by adding a callback to process the event and register the event with the callback. None event is being registered by this patch and they need be added by developer by demand in the code. To see how register an event, the unit test test_libvirtevents.py register two events and then use them in the code. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- i18n.py | 4 + model/libvirtevents.py | 60 ++++++++++++++ model/model.py | 5 +- tests/test_libvirtevents.py | 196 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 model/libvirtevents.py create mode 100644 tests/test_libvirtevents.py diff --git a/i18n.py b/i18n.py index 39f5e57..569f84d 100644 --- a/i18n.py +++ b/i18n.py @@ -331,4 +331,8 @@ messages = { "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), + "KCHEVENT0001E": _("Failed to register the default event implementation."), + "KCHEVENT0002E": _("Failed to register timeout event."), + "KCHEVENT0003E": _("Failed to Run the default event implementation."), + } diff --git a/model/libvirtevents.py b/model/libvirtevents.py new file mode 100644 index 0000000..710840a --- /dev/null +++ b/model/libvirtevents.py @@ -0,0 +1,60 @@ +# +# 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 + +import cherrypy +import libvirt +import time + +from wok.exception import OperationFailed +from wok.utils import wok_log + + +class LibvirtEvents(object): + def __init__(self): + # Register default implementation of event handlers + if libvirt.virEventRegisterDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0001E') + + # Run a background thread with the event loop. Using cherrypy + # BackgroundTask class due to issues when using threading module with + # cherrypy. + self.event_loop_thread = cherrypy.process.plugins.BackgroundTask( + 2, + self._event_loop_run + ) + self.event_loop_thread.setName('KimchiLibvirtEventLoop') + self.event_loop_thread.setDaemon(True) + self.event_loop_thread.start() + + # Set an event timeout to control the self._event_loop_run + if libvirt.virEventAddTimeout(0, self._kimchi_EventTimeout, None) < 0: + raise OperationFailed('KCHEVENT0002E') + + # Event loop method to be executed in background as thread + def _event_loop_run(self): + while True: + if libvirt.virEventRunDefaultImpl() < 0: + raise OperationFailed('KCHEVENT0003E') + + def is_event_loop_alive(self): + return self.event_loop_thread.isAlive() + + # Event loop handler used to limit length of waiting for any other event. + def _kimchi_EventTimeout(self, timer, opaque): + time.sleep(1) diff --git a/model/model.py b/model/model.py index e44f804..ed474d2 100644 --- a/model/model.py +++ b/model/model.py @@ -26,6 +26,7 @@ from wok.plugins.kimchi import config from wok.utils import import_module, listPathModules from wok.plugins.kimchi.model.libvirtconnection import LibvirtConnection +from wok.plugins.kimchi.model.libvirtevents import LibvirtEvents class Model(BaseModel): @@ -43,8 +44,10 @@ class Model(BaseModel): return instances self.objstore = ObjectStore(objstore_loc or config.get_object_store()) + self.events = LibvirtEvents() self.conn = LibvirtConnection(libvirt_uri) - kargs = {'objstore': self.objstore, 'conn': self.conn} + kargs = {'objstore': self.objstore, 'conn': self.conn, + 'eventsloop': self.events} models = [] # Import task model from Wok diff --git a/tests/test_libvirtevents.py b/tests/test_libvirtevents.py new file mode 100644 index 0000000..4994776 --- /dev/null +++ b/tests/test_libvirtevents.py @@ -0,0 +1,196 @@ +# -*- coding: utf-8 -*- +# +# 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 + +import libvirt +import os +import shutil +import time +import unittest + +import tests.utils as utils + +from wok.basemodel import Singleton +from wok.rollbackcontext import RollbackContext + +from wok.plugins.kimchi.model import model + +import iso_gen + + +TMP_DIR = '/var/lib/kimchi/tests/' +UBUNTU_ISO = TMP_DIR + 'ubuntu14.04.iso' +EVENT_ID = 0 + + +def setUpModule(): + if not os.path.exists(TMP_DIR): + os.makedirs(TMP_DIR) + + iso_gen.construct_fake_iso(UBUNTU_ISO, True, '14.04', 'ubuntu') + + # Some FeatureTests functions depend on server to validate their result. + # As CapabilitiesModel is a Singleton class it will get the first result + # from FeatureTests which may be wrong when using the Model instance + # directly - the case of this test_model.py + # So clean Singleton instances to make sure to get the right result when + # running the following tests. + Singleton._instances = {} + + +def tearDownModule(): + shutil.rmtree(TMP_DIR) + + +def get_next_event_id(): + global EVENT_ID + EVENT_ID += 1 + return EVENT_ID + + +def get_event_id(): + global EVENT_ID + return EVENT_ID + + +class LibvirtEventsTests(unittest.TestCase): + def setUp(self): + self.tmp_store = '/tmp/kimchi-store-test' + + def tearDown(self): + os.unlink(self.tmp_store) + + def domain_event_lifecycle_cb(self, conn, dom, event, detail, *args): + """ + Callback to handle Domain (VMs) events - VM Livecycle. + """ + evStrings = ("Defined", "Undefined", "Started", "Suspended", "Resumed", + "Stopped", "Shutdown", "PMSuspended", "Crashed") + evDetails = (("Added", "Updated"), + ("Removed", ), + ("Booted", "Migrated", "Restored", "Snapshot", "Wakeup"), + ("Paused", "Migrated", "IOError", "Watchdog", "Restored", + "Snapshot", "API error"), + ("Unpaused", "Migrated", "Snapshot"), + ("Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", + "Failed", "Snapshot"), + ("Finished", ), + ("Memory", "Disk"), + ("Panicked")) + + json = {'domain': dom.name(), 'event': evStrings[event], + 'event_detail': evDetails[event][detail]} + with self.objstore as session: + session.store('libvirt-event', get_next_event_id(), json) + + def domain_event_reboot_cb(self, conn, dom, *args): + """ + Callback to handle Domain (VMs) events - VM Reboot. + """ + json = {'domain': dom.name(), 'event': 'Rebooted'} + with self.objstore as session: + session.store('libvirt-event', get_next_event_id(), json) + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + def test_events_vm_lifecycle(self): + inst = model.Model(objstore_loc=self.tmp_store) + self.objstore = inst.objstore + + # Register the most common Libvirt domain events to be handled. + conn = inst.conn.get() + event_map = [(libvirt.VIR_DOMAIN_EVENT_ID_LIFECYCLE, + self.domain_event_lifecycle_cb), + (libvirt.VIR_DOMAIN_EVENT_ID_REBOOT, + self.domain_event_reboot_cb)] + + for event, event_cb in event_map: + try: + conn.domainEventRegisterAny(None, event, event_cb, None) + except libvirt.libvirtError as e: + # It's not a big deal if an event could not be registered. + print "Could not register event %s. Details: %s" % (event, e) + + # Create a template and VM to test, and start lifecycle tests + with RollbackContext() as rollback: + template_params = {'name': 'test', + 'source_media': {'type': 'disk', + 'path': UBUNTU_ISO}} + + inst.templates_create(template_params) + rollback.prependDefer(inst.template_delete, 'test') + + vm_params = {'name': 'kimchi-vm1', + 'template': '/plugins/kimchi/templates/test'} + task = inst.vms_create(vm_params) + inst.task_wait(task['id'], 10) + task = inst.task_lookup(task['id']) + self.assertEquals('finished', task['status']) + time.sleep(5) + with self.objstore as session: + res = session.get('libvirt-event', get_event_id()) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Defined', res['event']) + self.assertEquals('Added', res['event_detail']) + + inst.vm_start('kimchi-vm1') + time.sleep(5) + with self.objstore as session: + res = session.get('libvirt-event', get_event_id()) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Started', res['event']) + self.assertEquals('Booted', res['event_detail']) + + inst.vm_suspend('kimchi-vm1') + time.sleep(5) + with self.objstore as session: + res = session.get('libvirt-event', get_event_id()) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Suspended', res['event']) + self.assertEquals('Paused', res['event_detail']) + + inst.vm_resume('kimchi-vm1') + time.sleep(5) + with self.objstore as session: + res = session.get('libvirt-event', get_event_id()) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Resumed', res['event']) + self.assertEquals('Unpaused', res['event_detail']) + + inst.vm_reset('kimchi-vm1') + time.sleep(5) + with self.objstore as session: + res = session.get('libvirt-event', get_event_id()) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Rebooted', res['event']) + + inst.vm_poweroff('kimchi-vm1') + time.sleep(5) + with self.objstore as session: + res = session.get('libvirt-event', get_event_id()) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Stopped', res['event']) + self.assertEquals('Destroyed', res['event_detail']) + + inst.vm_delete('kimchi-vm1') + time.sleep(5) + with self.objstore as session: + res = session.get('libvirt-event', get_event_id()) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Undefined', res['event']) + self.assertEquals('Removed', res['event_detail']) -- 2.5.5

4 3

[PATCH V2] [Wok] Save notifications in memory instead of object store
by Lucio Correia 10 May '16

10 May '16

Notifications are temporary data structure, so save it in memory instead of object store, allowing it to work even when there is no disk space. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/model/notifications.py | 52 ++++++++++++++++++++++++++++++------------ src/wok/objectstore.py | 36 ----------------------------- src/wok/server.py | 4 ---- 3 files changed, 38 insertions(+), 54 deletions(-) Changes in V2: * Do not log notification delete requests diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py index 77184db..79bed03 100644 --- a/src/wok/model/notifications.py +++ b/src/wok/model/notifications.py @@ -17,40 +17,64 @@ # 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 datetime import datetime + from wok.exception import NotFoundError, OperationFailed from wok.message import WokMessage +from wok.utils import wok_log + + +notificationsStore = {} + + +def add_notification(code, args={}, plugin_name=None): + if not code: + wok_log.error("Unable to add notification: invalid code '%(code)s'" % + {'code': str(code)}) + return + + global notificationsStore + notification = notificationsStore.get(code) + + # do not update timestamp if notification already exists + timestamp = datetime.now().isoformat() if notification is None else \ + notification['timestamp'] + + args.update({"_plugin_name": plugin_name, "timestamp": timestamp}) + notificationsStore[code] = args class NotificationsModel(object): def __init__(self, **kargs): - self.objstore = kargs['objstore'] + pass def get_list(self): - with self.objstore as session: - return session.get_list('notification') + global notificationsStore + return notificationsStore.keys() class NotificationModel(object): def __init__(self, **kargs): - self.objstore = kargs['objstore'] + pass def lookup(self, id): - with self.objstore as session: - notification = session.get('notification', str(id)) + global notificationsStore + notification = notificationsStore.get(str(id)) - # use WokMessage to translate the notification - if notification: - timestamp = notification['timestamp'] - plugin = notification.pop('_plugin_name', None) - message = WokMessage(id, notification, plugin).get_text() - return {"code": id, "message": message, "timestamp": timestamp} + # use WokMessage to translate the notification + if notification: + timestamp = notification['timestamp'] + plugin = notification.pop('_plugin_name', None) + message = WokMessage(str(id), notification, plugin).get_text() + return {"code": id, "message": message, "timestamp": timestamp} raise NotFoundError("WOKNOT0001E", {'id': str(id)}) def delete(self, id): + global notificationsStore + try: - with self.objstore as session: - session.delete('notification', str(id)) + del notificationsStore[str(id)] except Exception as e: raise OperationFailed("WOKNOT0002E", {'id': str(id), 'msg': e.msg()}) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index ff3796c..59354f3 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -23,8 +23,6 @@ import sqlite3 import threading import traceback -from datetime import datetime - try: from collections import OrderedDict except ImportError: @@ -146,37 +144,3 @@ class ObjectStore(object): # exception again wok_log.error(traceback.format_exc()) return False - - -def add_notification(code, args={}, plugin_name=None): - if not code: - wok_log.error("Unable to add notification: invalid code '%(code)s'" % - {'code': str(code)}) - return - - try: - with ObjectStore() as session: - notification = session.get('notification', code) - except NotFoundError: - notification = None - - try: - # do not update timestamp if notification already exists - timestamp = datetime.now().isoformat() if notification is None else \ - notification['timestamp'] - args.update({"_plugin_name": plugin_name, "timestamp": timestamp}) - - with ObjectStore() as session: - session.store('notification', code, args) - except Exception as e: - wok_log.error("Unable to store notification: %s" % e.message) - - -def clean_notifications(): - try: - with ObjectStore() as session: - notifications = session.get_list('notification') - for item in notifications: - session.delete('notification', item) - except Exception as e: - wok_log.error("Unable to clean notifications: %s" % e.message) diff --git a/src/wok/server.py b/src/wok/server.py index a329ed4..902d4bf 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,7 +33,6 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model -from wok.objectstore import clean_notifications from wok.proxy import start_proxy, terminate_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot @@ -107,9 +106,6 @@ class Server(object): if dev_env: cherrypy.log.screen = True - # clean object store notifications - clean_notifications() - # close standard file handlers because we are going to use a # watchedfiled handler, otherwise we will have two file handlers # pointing to the same file, duplicating log enries -- 1.9.1

3 2

[Wok][PATCH] Make tab name translatable and include ui/pages/tabs/* in POTFILES.in
by pkulkark＠linux.vnet.ibm.com 10 May '16

10 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch makes the tab name translatable and adds the path ui/pages/tabs/* in POTFILES.in Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- po/POTFILES.in | 1 + ui/pages/i18n.json.tmpl | 1 + 2 files changed, 2 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index aae0ca9..c0f0eb0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ # List of source files which contain translatable strings. src/wok/i18n.py ui/pages/*.tmpl +ui/pages/tabs/*.tmpl diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index c3c5b69..240be65 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -24,6 +24,7 @@ #silent _ = t.gettext #silent _t = t.gettext { + "Settings": "$_("Settings")", "WOKAPI6007E": "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")", "WOKAPI6003M": "$_("Cancel")", -- 2.1.0

3 4

[PATCH] [Wok] Save notifications in memory instead of object store
by Lucio Correia 09 May '16

09 May '16

Notifications are temporary data structure, so save it in memory instead of object store, allowing it to work even when there is no disk space. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/control/notifications.py | 6 +++++ src/wok/model/notifications.py | 52 +++++++++++++++++++++++++++++----------- src/wok/objectstore.py | 36 ---------------------------- src/wok/server.py | 4 ---- 4 files changed, 44 insertions(+), 54 deletions(-) diff --git a/src/wok/control/notifications.py b/src/wok/control/notifications.py index 37d45f2..b57595e 100644 --- a/src/wok/control/notifications.py +++ b/src/wok/control/notifications.py @@ -21,6 +21,11 @@ from wok.control.base import Collection, Resource from wok.control.utils import UrlSubNode +NOTIFICATION_REQUESTS = { + 'DELETE': {'default': "UI notification deleted: %(ident)s"}, +} + + @UrlSubNode('notifications', True) class Notifications(Collection): def __init__(self, model): @@ -31,6 +36,7 @@ class Notifications(Collection): class Notification(Resource): def __init__(self, model, id): super(Notification, self).__init__(model, id) + self.log_map = NOTIFICATION_REQUESTS @property def data(self): diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py index 77184db..79bed03 100644 --- a/src/wok/model/notifications.py +++ b/src/wok/model/notifications.py @@ -17,40 +17,64 @@ # 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 datetime import datetime + from wok.exception import NotFoundError, OperationFailed from wok.message import WokMessage +from wok.utils import wok_log + + +notificationsStore = {} + + +def add_notification(code, args={}, plugin_name=None): + if not code: + wok_log.error("Unable to add notification: invalid code '%(code)s'" % + {'code': str(code)}) + return + + global notificationsStore + notification = notificationsStore.get(code) + + # do not update timestamp if notification already exists + timestamp = datetime.now().isoformat() if notification is None else \ + notification['timestamp'] + + args.update({"_plugin_name": plugin_name, "timestamp": timestamp}) + notificationsStore[code] = args class NotificationsModel(object): def __init__(self, **kargs): - self.objstore = kargs['objstore'] + pass def get_list(self): - with self.objstore as session: - return session.get_list('notification') + global notificationsStore + return notificationsStore.keys() class NotificationModel(object): def __init__(self, **kargs): - self.objstore = kargs['objstore'] + pass def lookup(self, id): - with self.objstore as session: - notification = session.get('notification', str(id)) + global notificationsStore + notification = notificationsStore.get(str(id)) - # use WokMessage to translate the notification - if notification: - timestamp = notification['timestamp'] - plugin = notification.pop('_plugin_name', None) - message = WokMessage(id, notification, plugin).get_text() - return {"code": id, "message": message, "timestamp": timestamp} + # use WokMessage to translate the notification + if notification: + timestamp = notification['timestamp'] + plugin = notification.pop('_plugin_name', None) + message = WokMessage(str(id), notification, plugin).get_text() + return {"code": id, "message": message, "timestamp": timestamp} raise NotFoundError("WOKNOT0001E", {'id': str(id)}) def delete(self, id): + global notificationsStore + try: - with self.objstore as session: - session.delete('notification', str(id)) + del notificationsStore[str(id)] except Exception as e: raise OperationFailed("WOKNOT0002E", {'id': str(id), 'msg': e.msg()}) diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index ff3796c..59354f3 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -23,8 +23,6 @@ import sqlite3 import threading import traceback -from datetime import datetime - try: from collections import OrderedDict except ImportError: @@ -146,37 +144,3 @@ class ObjectStore(object): # exception again wok_log.error(traceback.format_exc()) return False - - -def add_notification(code, args={}, plugin_name=None): - if not code: - wok_log.error("Unable to add notification: invalid code '%(code)s'" % - {'code': str(code)}) - return - - try: - with ObjectStore() as session: - notification = session.get('notification', code) - except NotFoundError: - notification = None - - try: - # do not update timestamp if notification already exists - timestamp = datetime.now().isoformat() if notification is None else \ - notification['timestamp'] - args.update({"_plugin_name": plugin_name, "timestamp": timestamp}) - - with ObjectStore() as session: - session.store('notification', code, args) - except Exception as e: - wok_log.error("Unable to store notification: %s" % e.message) - - -def clean_notifications(): - try: - with ObjectStore() as session: - notifications = session.get_list('notification') - for item in notifications: - session.delete('notification', item) - except Exception as e: - wok_log.error("Unable to clean notifications: %s" % e.message) diff --git a/src/wok/server.py b/src/wok/server.py index a329ed4..902d4bf 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,7 +33,6 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model -from wok.objectstore import clean_notifications from wok.proxy import start_proxy, terminate_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot @@ -107,9 +106,6 @@ class Server(object): if dev_env: cherrypy.log.screen = True - # clean object store notifications - clean_notifications() - # close standard file handlers because we are going to use a # watchedfiled handler, otherwise we will have two file handlers # pointing to the same file, duplicating log enries -- 1.9.1

4 6

[PATCH] [Kimchi] Implement image rebase to avoid backing file dependency
by Jose Ricardo Ziviani 09 May '16

09 May '16

- Runs a rebase on the image that has created using backing file to avoid such dependency. It's slower than using the backing file itself but faster than clonning and more reliable than trusting in backing files. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- i18n.py | 1 + model/templates.py | 8 ++++++++ utils.py | 16 +++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/i18n.py b/i18n.py index 39f5e57..bcc8b96 100644 --- a/i18n.py +++ b/i18n.py @@ -292,6 +292,7 @@ messages = { "KCHUTILS0003E": _("Unable to choose a virtual machine name"), "KCHUTILS0006E": _("Cannot upgrade objectstore data."), + "KCHUTILS0007E": _("Impossible to rebase the image: %(error)s"), "KCHVMSTOR0002E": _("Invalid storage type. Types supported: 'cdrom', 'disk'"), "KCHVMSTOR0003E": _("The path '%(value)s' is not a valid local/remote path for the device"), diff --git a/model/templates.py b/model/templates.py index 131f86b..e8b9e51 100644 --- a/model/templates.py +++ b/model/templates.py @@ -34,6 +34,7 @@ from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi.config import get_kimchi_version from wok.plugins.kimchi.kvmusertests import UserTests from wok.plugins.kimchi.model.cpuinfo import CPUInfoModel +from wok.plugins.kimchi.utils import image_rebase from wok.plugins.kimchi.utils import pool_name_from_uri from wok.plugins.kimchi.vmtemplate import VMTemplate @@ -400,6 +401,13 @@ class LibvirtVMTemplate(VMTemplate): pool = self._get_storage_pool(v['pool']) # outgoing text to libvirt, encode('utf-8') pool.createXML(v['xml'].encode('utf-8'), 0) + + # if using backing image, rebase the image to remove the + # dependency on that backing image + if 'base' in v \ + and 'path' in v['base'] \ + and 'path' in v: + image_rebase(v['path']) except libvirt.libvirtError as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return vol_list diff --git a/utils.py b/utils.py index c4cd07d..9b9a4dc 100644 --- a/utils.py +++ b/utils.py @@ -30,12 +30,26 @@ from urlparse import urlparse from wok.exception import InvalidParameter, OperationFailed from wok.plugins.kimchi import config from wok.plugins.kimchi.osinfo import get_template_default -from wok.utils import wok_log +from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text MAX_REDIRECTION_ALLOWED = 5 +def image_rebase(image_path): + wok_log.info('starting to rebase image %s' % image_path) + _, err, rc = run_command(['qemu-img', + 'rebase', + '-b', + '', + image_path]) + if rc or err: + error = '%s - %s' % (str(rc), err) + raise OperationFailed("KCHUTILS0007E", {'error': error}) + + wok_log.info('image rebased successfully') + + def _uri_to_name(collection, uri): expr = '/plugins/kimchi/%s/(.*?)$' % collection m = re.match(expr, uri) -- 2.7.4

3 2

[PATCH] [Wok] Wok Toggle-Switch checkbox UI
by sguimaraes943＠gmail.com 09 May '16

09 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds a toggle switch inspired by iOS and Material Design checkboxes. This widget will be used in Ginger System Services front-end. HTML syntax: <input type="checkbox" id="checkboxid" checked="" class="wok-toggleswitch-checkbox"> <label for="checkboxid" class="wok-toggleswitch-label"> <span class="sr-only">Checkbox label hidden from UI</span></label> JS is necessary to update label text once checkbox status is changed - Screen reader software reads the toggle switch as a regular checkbox! (you'll have to create your own code for this as it may vary from use-case) Samuel Guimarães (1): Added Wok Toggle-Switch checkbox UI ui/css/src/modules/_wok-toggleswitch.scss | 80 +++++++++++++++++++++++++++++++ ui/css/src/modules/_wok-variables.scss | 3 ++ ui/css/src/wok.scss | 2 + ui/css/wok.css | 77 +++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+) create mode 100644 ui/css/src/modules/_wok-toggleswitch.scss -- 1.9.3

3 3

[PATCH] [Wok] Fixed underline text-decoration with .btn-link classes
by sguimaraes943＠gmail.com 09 May '16

09 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch removes an empty underline when putting the mouse over .btn-link buttons with icons. Samuel Guimarães (1): Fixed underline text-decoration with .btn-link classes ui/css/bootstrap.custom.css | 6 +++--- ui/css/src/modules/_buttons.scss | 9 +++++++++ ui/css/wok.css | 8 ++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) -- 1.9.3

3 3

[PATCH] [Wok] Issue #95: Accessibility
by ghidasy＠linux.vnet.ibm.com 09 May '16

09 May '16

From: Gabriel Hidasy Rezende <ghidasy(a)br.ibm.com> Treat ESC and Enter keyboard events on Advanced Search dialog, Enter triggers a click on button-search, while esc closes the window. Gabriel Hidasy Rezende (1): Issue #95: Accessibility ui/js/wok.user-log.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.5.5

2 2

[PATCH] [Kimchi] Handle Libvirt host ENOSPC event
by Lucio Correia 09 May '16

09 May '16

When storage pool is out of space and guest requires more, guest is paused and nothing is told to the user. This patch uses Libvirt Event handling and Asynchronous Notifications mechanism to tell web users about what happened. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/libvirtevents.py | 24 ++++++++++++++++++++++++ model/model.py | 3 +++ 3 files changed, 28 insertions(+), 1 deletion(-) This patch depends on: * [Kimchi] Add support to Libvirt Events * [Wok] Save notifications in memory instead of object store diff --git a/i18n.py b/i18n.py index 569f84d..ddfa871 100644 --- a/i18n.py +++ b/i18n.py @@ -334,5 +334,5 @@ messages = { "KCHEVENT0001E": _("Failed to register the default event implementation."), "KCHEVENT0002E": _("Failed to register timeout event."), "KCHEVENT0003E": _("Failed to Run the default event implementation."), - + "KCHEVENT0004W": _("I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)."), } diff --git a/model/libvirtevents.py b/model/libvirtevents.py index 710840a..00e9433 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -22,6 +22,8 @@ import libvirt import time from wok.exception import OperationFailed +from wok.message import WokMessage +from wok.model.notifications import add_notification from wok.utils import wok_log @@ -58,3 +60,25 @@ class LibvirtEvents(object): # Event loop handler used to limit length of waiting for any other event. def _kimchi_EventTimeout(self, timer, opaque): time.sleep(1) + + def event_enospc_cb(self, conn, dom, path, dev, action, reason, args): + if reason == "enospc": + info = { + "vm": dom.name(), + "srcPath": path, + "devAlias": dev, + } + add_notification("KCHEVENT0004W", info, '/plugins/kimchi') + msg = WokMessage("KCHEVENT0004W", info, '/plugins/kimchi') + wok_log.warning(msg.get_text()) + + def handleEnospc(self, conn): + """ + Register Libvirt IO_ERROR_REASON event to handle host ENOSPC + """ + conn.get().domainEventRegisterAny( + None, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + self.event_enospc_cb, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON + ) diff --git a/model/model.py b/model/model.py index ed474d2..327d5a7 100644 --- a/model/model.py +++ b/model/model.py @@ -50,6 +50,9 @@ class Model(BaseModel): 'eventsloop': self.events} models = [] + # Register for Libvirt's host ENOSPC event and notify UI if it happens + self.events.handleEnospc(self.conn) + # Import task model from Wok instances = get_instances('wok.model.tasks') for instance in instances: -- 1.9.1

2 1

[PATCH] [Kimchi 0/2] Fix issues while attaching new disk to VM
by Aline Manera 07 May '16

07 May '16

Aline Manera (2): Bug fix: Display error when creating new disk to attach to guest Bug fix: Do not allow user selects invalid volume format to create a new volume API.json | 6 +++--- docs/API.md | 6 +++--- i18n.py | 4 ++-- model/storagevolumes.py | 2 +- model/vmstorages.py | 2 +- tests/test_template.py | 3 +-- ui/js/src/kimchi.guest_storage_add.main.js | 11 +++++++---- ui/pages/i18n.json.tmpl | 1 + ui/pages/template-edit.html.tmpl | 4 ---- 9 files changed, 19 insertions(+), 20 deletions(-) -- 2.5.5

2 4

[PATCH] [Kimchi] Bug fix: Allow creating network with XML special characters
by Aline Manera 06 May '16

06 May '16

libvirt will take care of scaping any XML special character so Kimchi does not need to do anything related to that. For example: [alinefm@alinefm-TP440 kimchi]$ sudo virsh net-dumpxml '~!@#$%^&*()[]<>' <network> <name>~!@#$%^&*()[]<></name> <uuid>3f7fc0c9-1c82-4f61-8055-62523a8827d3</uuid> <bridge name='virbr3' stp='on' delay='0'/> <mac address='52:54:00:77:d2:cd'/> <ip address='192.168.3.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.3.129' end='192.168.3.254'/> </dhcp> </ip> </network> This patch also updated the test case to cover this scenario. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/networks.py | 2 -- tests/test_model_network.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/model/networks.py b/model/networks.py index 9ae2ea8..333ea6d 100644 --- a/model/networks.py +++ b/model/networks.py @@ -23,7 +23,6 @@ import libvirt import sys import time from libvirt import VIR_INTERFACE_XML_INACTIVE -from xml.sax.saxutils import escape from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError, OperationFailed @@ -107,7 +106,6 @@ class NetworksModel(object): self._set_network_vepa(params) # create network XML - params['name'] = escape(params['name']) xml = to_network_xml(**params) try: diff --git a/tests/test_model_network.py b/tests/test_model_network.py index 14d7288..89c9f7d 100644 --- a/tests/test_model_network.py +++ b/tests/test_model_network.py @@ -149,7 +149,7 @@ class NetworkTests(unittest.TestCase): def test_network_lifecycle(self): # Verify all the supported network type networks = [{'name': u'kīмсhī-пet', 'connection': 'isolated'}, - {'name': u'nat-network', 'connection': 'nat'}, + {'name': u'<!nat-network>&', 'connection': 'nat'}, {'name': u'subnet-network', 'connection': 'nat', 'subnet': '127.0.100.0/24'}] -- 2.5.5

2 2

[PATCH] [Kimchi] Bug fix: Create VM based on Remote ISO Template
by Aline Manera 06 May '16

06 May '16

When trying to create a VM from a recent created remote ISO Template, an error was raised: Error in async_task 1 Traceback (most recent call last): File "/home/alinefm/wok/src/wok/asynctask.py", line 72, in _run_helper self.fn(cb, opaque) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 168, in _create_task vol_list = t.fork_vm_storage(vm_uuid) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/templates.py", line 397, in fork_vm_storage vol_list = self.to_volume_list(vm_uuid) File "/home/alinefm/wok/src/wok/plugins/kimchi/vmtemplate.py", line 262, in to_volume_list base_fmt = imageinfo.probe_img_info(d['base'])['format'] File "/home/alinefm/wok/src/wok/plugins/kimchi/imageinfo.py", line 40, in probe_img_info info['actual-size'] = info['actual-size'] >> 30 KeyError: 'actual-size' It was because the remote ISO path was being set as CDROM and also as base image, causing the issue when creating the VM. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- model/templates.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/model/templates.py b/model/templates.py index 131f86b..5cdac00 100644 --- a/model/templates.py +++ b/model/templates.py @@ -68,10 +68,9 @@ class TemplatesModel(object): if source_media['type'] == 'netboot': params['netboot'] = True return self.save_template(params) - else: - # Get path of source media if it's based on disk type. - path = source_media.get('path', None) + # Get path of source media if it's based on disk type. + path = source_media.get('path', None) if path is None: raise InvalidParameter("KCHTMPL0016E") @@ -80,9 +79,10 @@ class TemplatesModel(object): if urlparse.urlparse(path).scheme in ["http", "https", "tftp", "ftp", "ftps"]: params["cdrom"] = path + return self.save_template(params) - # image does not exists: raise error - elif not os.path.exists(path): + # Local file (ISO/Img) does not exist: raise error + if not os.path.exists(path): raise InvalidParameter("KCHTMPL0002E", {'path': path}) # create magic object to discover file type -- 2.5.5

3 3

[PATCH] [Kimchi] Create template error message not being displayed in panel
by Socorro Stoppler 06 May '16

06 May '16

When an error occurs in Create Template, the error message is being displayed on its parent rather than the Create Template panel. This patch fixes that so the error is now being displayed in the create template panel. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/pages/template-add.html.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index 670c7a2..2a8fdb7 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -29,6 +29,7 @@ </div> <div class="modal-body"> <div class="template-modal-container"> + <div id="alert-modal-container"></div> </div> <div class="template-pager"> <div class="page-list"> -- 2.5.0

3 2

[PATCH] [Kimchi 0/2] *** DEPENDS ON GINGERBASE NETINFO PATCH *** migrating to Gingerbase netinfo
by dhbarboza82＠gmail.com 05 May '16

05 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch set adapts Kimchi source code to uses the netinfo module from Gingerbase. Daniel Henrique Barboza (2): Migration to Gingerbase netinfo: import changes Migration to Gingerbase netinfo: removing netinfo.py model/interfaces.py | 2 +- model/networks.py | 6 +- netinfo.py | 265 ---------------------------------------------------- tests/test_model.py | 2 +- 4 files changed, 5 insertions(+), 270 deletions(-) delete mode 100644 netinfo.py -- 2.5.5

3 4

[PATCH] [Kimchi] VEPA network UI: fixing network creation
by dhbarboza82＠gmail.com 05 May '16

05 May '16

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> VEPA has a multiple interface select. This wasn't being considered when assigning the value of network.interface element being used to call the network creation API. Result was an error "Interface should be bare NIC or bonding" because the backend was receiving an array of array. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- ui/js/src/kimchi.network_add_main.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index 99e42c1..4eb5c5b 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -35,6 +35,10 @@ kimchi.startNetworkCreation = function() { interfaces: [ network.interface ], vlan_id: network.vlan_id }; + // in VEPA connection case, network.interface is already an array + if (data.connection === kimchi.NETWORK_TYPE_VEPA) { + data.interfaces = network.interface; + } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down"; -- 2.5.5

4 3

[PATCH] [Kimchi] Disable Template when it has invalid parameters
by peterpnns＠gmail.com 05 May '16

05 May '16

From: peterpennings <peterpnns(a)gmail.com> This patch adds a block behavior on the action to select invalid templates when creating a guest peterpennings (1): Disable Template when it has invalid parameters ui/css/kimchi.css | 28 ++++++++++++++++++--- ui/css/src/modules/_guests.scss | 6 +++++ ui/css/src/modules/_templates.scss | 18 +++++++++++--- ui/js/src/kimchi.guest_add_main.js | 8 ++++++ ui/js/src/kimchi.network_add_main.js | 48 +++++++++++++++++++++++++----------- ui/js/src/kimchi.template_main.js | 9 +++++-- ui/pages/guest-add.html.tmpl | 7 +++--- ui/pages/tabs/templates.html.tmpl | 6 +++-- 8 files changed, 102 insertions(+), 28 deletions(-) -- 2.5.0

2 4

[PATCH V2] [Kimchi] Remove cherrypy configuration from kimchi.conf file
by Aline Manera 05 May '16

05 May '16

This patch depends on Wok patch "[PATCH] [Wok 3/3] Add root configuration as default for PluginConfig" V1 - V2: - update tes case Aline Manera (1): Remove cherrypy configuration from kimchi.conf file kimchi.conf | 13 ------------- tests/test_config.py.in | 5 ++--- 2 files changed, 2 insertions(+), 16 deletions(-) -- 2.5.5

2 3

[PATCH] [Wok 0/3] Make session timeout configurable
by Aline Manera 05 May '16

05 May '16

Aline Manera (3): Add wok-robot header to /notifications requests Issue #19: Make session timeout configurable Add root configuration as default for PluginConfig src/wok.conf.in | 4 ++++ src/wok/auth.py | 2 +- src/wok/config.py.in | 16 +++++++++++++--- src/wokd.in | 5 +++++ tests/test_config.py.in | 2 -- ui/js/src/wok.api.js | 1 + 6 files changed, 24 insertions(+), 6 deletions(-) -- 2.5.5

3 6

[Wok][PATCH 0/7] Multi-Culture Support
by pkulkark＠linux.vnet.ibm.com 04 May '16

04 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> co-authored by: Archana Singh <archus(a)linux.vnet.ibm.com> This patch set provides multi-culture support by adding another drop down list during login for user locale selection. The numeric data and datetime fields are formatted based on the locale selected. Pooja Kulkarni (7): Multi-Culture Support - Add a separate drop down list for locale Multi-Culture support - Add methods to get and set locales in wok.lang.js Multi-Culture support - Add locale in format settings in wok.line-chart.js Multi-Culture support : Format datetime as per locale in wok.list.js Multi-Culture support : Implement new drop down list for locale in wok.login.js Multi-Culture support : Modify wok.formatMeasurement util to include formatting based on locale Multi-Culture support : Format datetime in user activity log as per locale ui/js/src/wok.lang.js | 8 ++++++++ ui/js/src/wok.line-chart.js | 3 ++- ui/js/src/wok.list.js | 4 ++++ ui/js/src/wok.login.js | 9 +++++++++ ui/js/src/wok.utils.js | 10 +++++++--- ui/js/wok.bootgrid.js | 10 +++++++++- ui/js/wok.user-log.js | 3 ++- ui/pages/login.html.tmpl | 34 ++++++++++++++++++++++++++++++++++ 8 files changed, 75 insertions(+), 6 deletions(-) -- 2.1.0

3 10

[PATCH] [Kimchi] Remove cherrypy configuration from kimchi.conf file
by Aline Manera 04 May '16

04 May '16

This patch depends on Wok patch "[PATCH] [Wok 3/3] Add root configuration as default for PluginConfig" Aline Manera (1): Remove cherrypy configuration from kimchi.conf file kimchi.conf | 13 ------------- 1 file changed, 13 deletions(-) -- 2.5.5

2 3

Wok Debian/Ubuntu integration
by Frederic Bonnard 03 May '16

03 May '16

Hi, with the new version 2.1.0 of wok/kimchi/gingerbase, I updated my packaging. I'm still having a few issues and as there is a github issue concerning having wok related projects inside Ubuntu, I'd like to share some concerns so far. Here are the details : https://github.com/kimchi-project/wok/issues/25#issuecomment-211483696 - For the "relative URLs" issue, I've got some packages done and installed. Anyone could help on fixing those ? I've got a server I can give access to a wok developer, or I can send the .deb to someone willing to install them on his machine. - For the second issue, is it worth I send an updated patch against wok, or do you see other ways of doing to disable launching a specific instance of nginx ? F.

2 1

[PATCH v2] [Kimchi] Disable Template when it has invalid parameters
by sguimaraes943＠gmail.com 03 May '16

03 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds a block behavior on the action to select invalid templates when creating a guest peterpennings (1): Disable Template when it has invalid parameters Samuel Guimarães (1): Disable Template when it has invalid parameters v2: - Removed reference to kimchi.network_add_main.js - Fixed warning icon position in list and gallery views - Remoed tooltip when template is valid - Added front-end form validation when user attempts to save invalid storage pool (must apply "Enabled .has-feedback icons" patch sent to Wok first) - Added form control error class when template has invalid cdrom (reported issue #933 for vm-image not showing in invalid key) ui/css/kimchi.css | 97 ++++++++++++++++++++++++++++++++-- ui/css/src/modules/_guests.scss | 6 +++ ui/css/src/modules/_iso-list.scss | 22 +++++++- ui/css/src/modules/_templates.scss | 53 +++++++++++++++++-- ui/js/src/kimchi.guest_add_main.js | 7 +++ ui/js/src/kimchi.template_edit_main.js | 52 ++++++++++++++---- ui/js/src/kimchi.template_main.js | 9 +++- ui/pages/guest-add.html.tmpl | 11 ++-- ui/pages/i18n.json.tmpl | 1 + ui/pages/tabs/templates.html.tmpl | 24 +++++---- ui/pages/template-edit.html.tmpl | 6 ++- 11 files changed, 255 insertions(+), 33 deletions(-) -- 1.9.3

2 3