May 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Wok 1/2] Issue #101: In runcommand, enabling UTF-8 characters support in command output.
by archus＠linux.vnet.ibm.com 23 May '16

23 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Command output needs to be english for programmatically parsing of output. "LC_ALL = C" set the all LC_* to en_US and charset to ASCII. Replaced C with "en_US.UTF-8" enable charset to UTF-8. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/utils.py b/src/wok/utils.py index b37518f..3783685 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -226,9 +226,9 @@ def run_command(cmd, timeout=None, silent=False, tee=None, if env_vars is None: env_vars = os.environ.copy() - env_vars['LC_ALL'] = 'C' + env_vars['LC_ALL'] = 'en_US.UTF-8' elif env_vars.get('LC_ALL') is None: - env_vars['LC_ALL'] = 'C' + env_vars['LC_ALL'] = 'en_US.UTF-8' try: proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, -- 1.8.3.1

1 0

[PATCH] [Wok 0/2] Fix for Issues #101 and #115
by archus＠linux.vnet.ibm.com 23 May '16

23 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> 1) Enabling UTF-8 characters support in command output. 2) Fix for _get_resources wok_log.error result into unicode error. Archana Singh (2): Issue #101: In runcommand, enabling UTF-8 characters support in command output. Issue #115: _get_resources wok_log.error result into unicode error src/wok/control/base.py | 8 ++++++-- src/wok/utils.py | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) -- 1.8.3.1

1 0

[PATCHv2] [Kimchi] Edit Virtual Network with passthrough support
by Socorro Stoppler 21 May '16

21 May '16

v2: - Fixed bugs encountered while testing - Added support for macvtap passthrough - Addressed feedback from Lucio - UI issues below are still unresolved - Due to value from backend currently is not showing up when edit comes up and instead 'Nothing selected' is showing, this is being handled gracefully in that if user leaves the Destination field as is, the value (from backend) is preserved. v1: - 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 names Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 23 ++++ ui/js/src/kimchi.network.js | 14 +++ ui/js/src/kimchi.network_add_main.js | 20 ++-- ui/js/src/kimchi.network_edit_main.js | 198 ++++++++++++++++++++++++++++++++++ ui/pages/network-edit.html.tmpl | 78 ++++++++++++++ ui/pages/tabs/network.html.tmpl | 3 +- 6 files changed, 327 insertions(+), 9 deletions(-) create mode 100644 ui/js/src/kimchi.network_edit_main.js create mode 100644 ui/pages/network-edit.html.tmpl diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 83d1cc7..8c01646 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -648,6 +648,17 @@ var kimchi = { }); }, + retrieveNetwork : function(name, suc, err) { + wok.requestJSON({ + url : 'plugins/kimchi/networks/' + encodeURIComponent(name), + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success: suc, + error: err + }); + }, + deleteNetwork : function(name, suc, err) { wok.requestJSON({ url : 'plugins/kimchi/networks/' + encodeURIComponent(name), @@ -661,6 +672,18 @@ var kimchi = { }); }, + updateNetwork : function(name, settings, suc, err) { + wok.requestJSON({ + url : "plugins/kimchi/networks/" + encodeURIComponent(name), + type : 'PUT', + contentType : 'application/json', + data : JSON.stringify(settings), + dataType : 'json', + success: suc, + error: err + }); + }, + listHostPartitions : function(suc, err) { wok.requestJSON({ url : 'plugins/kimchi/host/partitions', diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c0100cf..381449d 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -91,6 +91,8 @@ kimchi.getNetworkItemHtml = function(network) { startClass : network.state === "up" ? "wok-hide-action-item" : "", stopClass : network.state === "down" ? "wok-hide-action-item" : disable_in_use, stopDisabled : network.in_use ? "disabled" : "", + editClass : network.state === "up" || network.in_use ? "disabled" : "", + editDisabled : network.state === "up" || network.in_use ? "disabled" : "", deleteClass : network.state === "up" || network.in_use ? "disabled" : "", deleteDisabled: network.state === "up" || network.in_use ? "disabled" : "" }); @@ -107,6 +109,8 @@ kimchi.stopNetwork = function(network,menu) { if (!network.in_use) { $("[nwAct='delete']", menu).removeClass("disabled"); $(":first-child", $("[nwAct='delete']", menu)).removeAttr("disabled"); + $("[nwAct='edit']", menu).removeClass("disabled"); + $(":first-child", $("[nwAct='edit']", menu)).removeAttr("disabled"); } $(".network-state", $("#" + wok.escapeStr(network.name))).switchClass("loading", "down"); }, function(err) { @@ -128,6 +132,8 @@ kimchi.addNetworkActions = function(network) { $("[nwAct='start']", menu).addClass("disabled"); $("[nwAct='delete']", menu).addClass("disabled"); $(":first-child", $("[nwAct='delete']", menu)).attr("disabled", true); + $("[nwAct='edit']", menu).addClass("disabled"); + $(":first-child", $("[nwAct='edit']", menu)).attr("disabled", true); kimchi.toggleNetwork(network.name, true, function() { $("[nwAct='start']", menu).addClass("wok-hide-action-item"); $("[nwAct='start']", menu).removeClass("disabled"); @@ -142,8 +148,10 @@ kimchi.addNetworkActions = function(network) { $("[nwAct='start']", menu).removeClass("disabled"); if (!network.in_use) { $("[nwAct='delete']", menu).removeClass("disabled"); + $("[nwAct='edit']", menu).removeClass("disabled"); } $(":first-child", $("[nwAct='delete']", menu)).removeAttr("disabled"); + $(":first-child", $("[nwAct='edit']", menu)).removeAttr("disabled"); wok.message.error(err.responseJSON.reason); }); } else if ($(evt.currentTarget).attr("nwAct") === "stop") { @@ -180,6 +188,12 @@ kimchi.addNetworkActions = function(network) { $('#networkGrid').dataGrid('deleteRow', $(evt.currentTarget).parents(".wok-datagrid-row")); }); }, null); + } else if ($(evt.currentTarget).attr("nwAct") === "edit") { + if (network.state === "up" || network.in_use) { + return false; + } + kimchi.selectedNetwork = network.name; + wok.window.open('plugins/kimchi/network-edit.html'); } }); diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index 3090aeb..a500cf8 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -56,7 +56,7 @@ kimchi.startNetworkCreation = function() { }; kimchi.openNetworkDialog = function(okCallback) { - kimchi.loadInterfaces(); + kimchi.loadInterfaces(undefined, false); $("#networkFormOk").on("click", function() { $("#networkFormOk").button("disable"); @@ -73,10 +73,12 @@ kimchi.openNetworkDialog = function(okCallback) { }); }; -kimchi.setDefaultNetworkType = function(isInterfaceAvail) { +kimchi.setDefaultNetworkType = function(isInterfaceAvail, bEdit) { $("#networkType").selectpicker(); if (!isInterfaceAvail) { - kimchi.enableBridgeOptions(false); + if (!bEdit) { + kimchi.enableBridgeOptions(false); + } $("#networkBriDisabledLabel").removeClass('hidden'); } else { $("#networkBriDisabledLabel").remove(); @@ -128,9 +130,9 @@ kimchi.setupNetworkFormEvent = function() { } } $('#networkDestinationID').selectpicker('destroy'); - kimchi.loadInterfaces(new Array("nic", "bonding")); + kimchi.loadInterfaces(new Array("nic", "bonding"), false); } else { - kimchi.loadInterfaces(); + kimchi.loadInterfaces(undefined, false); } }); @@ -175,7 +177,7 @@ kimchi.enableBridgeOptions = function(enable, networkType, networkDestinationTyp }; }; -kimchi.loadInterfaces = function(interfaceFilterArray) { +kimchi.loadInterfaces = function(interfaceFilterArray, bEdit) { var loadInterfacesHTML = function(result) { var options = []; @@ -200,8 +202,10 @@ kimchi.loadInterfaces = function(interfaceFilterArray) { } $selectDestination.append(selectDestinationOptionHTML); $('#networkDestinationID').selectpicker('refresh'); - kimchi.setDefaultNetworkType(result.length!==0); - kimchi.changeNetworkDestination(); + kimchi.setDefaultNetworkType(result.length!==0, bEdit); + if (!bEdit) { + kimchi.changeNetworkDestination(); + } }; var networkType = $("#networkType").val(); diff --git a/ui/js/src/kimchi.network_edit_main.js b/ui/js/src/kimchi.network_edit_main.js new file mode 100644 index 0000000..761d2f4 --- /dev/null +++ b/ui/js/src/kimchi.network_edit_main.js @@ -0,0 +1,198 @@ +/* + * Project Kimchi + * + * Copyright IBM Corp, 2016 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +kimchi.network_edit_main = function() { + var initNetwork = function(network) { + var networkType = network['connection']; + $('#bridgedContent').hide(); + $('#networkType').val(networkType); + $('#networkName').val(kimchi.selectedNetwork); + + var subnetValue = network['subnet']; + if (subnetValue === "") { + $('#networkSubnetRange').val("unavailable"); + } else { + $('#networkSubnetRange').val(subnetValue); + } + + // Default to hide Subnet + $('#subnetRange').hide(); + + if(networkType === "nat" || networkType === "isolated") { + //Show subnet/dhcp range + $('#subnetRange').show(); + } + + if (networkType === kimchi.NETWORK_TYPE_MACVTAP || + networkType === kimchi.NETWORK_TYPE_PASSTHROUGH || + networkType === kimchi.NETWORK_TYPE_VEPA || + networkType === kimchi.NETWORK_TYPE_BRIDGED) { + $('#bridgedContent').show(); + $('#networkDestination').show(); + $('#vlan').hide(); + if (networkType === kimchi.NETWORK_TYPE_BRIDGED) { + //Now check if there's a vlan id and only show if one exists + var netInterface = network['interfaces']; + var netInterfaceParts = netInterface[0].split('-', 2); + var netvlanID = netInterfaceParts[1]; + if (netvlanID !== undefined) { + //Show vlan ID field; do not show the checkbox + $('#vlan').show(); + $('#vlan_chkbox').hide(); + $('#vlan-enabled').show(); + $('#networkVlanID').val(netvlanID); + } + } + } + + kimchi.setupNetworkFormEventForEdit(network); + + //TODO: Trial and error trying to get select box to show show the one that it's currently set to but it doesn't work + var netInterface = network['interfaces']; + $('#networkDestinationID').append('val', netInterface); + $('#networkDestinationID').val(netInterface); + $("#networkDestinationID option[value='+netInterface+']").prop('selected', true); + $('#networkDestinationID').selectpicker('refresh'); + }; + + kimchi.retrieveNetwork(kimchi.selectedNetwork, initNetwork); + + var generalSubmit = function(event) { + $('#networkFormOk').text(i18n['KCHAPI6010M']); + $('#networkFormOk').prop('disabled', true); + + var data = $('#networkConfig').serializeObject(); + kimchi.updateNetworkValues(); + }; + + $('#networkConfig').on('submit', generalSubmit); + $('#networkFormOk').on('click', generalSubmit); +}; + +kimchi.setupNetworkFormEventForEdit = function(network) { + var selectedType = network['connection']; + if (selectedType === kimchi.NETWORK_TYPE_BRIDGED) { + if (kimchi.capabilities && kimchi.capabilities.nm_running) { + wok.message.warn(i18n['KCHNET6001W'],'#alert-modal-container'); + } + } + + // Network name validation + $("#networkName").on("keyup", function(event) { + $("#networkName").toggleClass("invalid-field", !$("#networkName").val().match(/^[^\"\/]+$/)); + kimchi.updateNetworkFormButtonForEdit(); + }); + + var selectedType = network['connection']; + if(selectedType === kimchi.NETWORK_TYPE_MACVTAP || + selectedType === kimchi.NETWORK_TYPE_PASSTHROUGH || + selectedType === kimchi.NETWORK_TYPE_VEPA) { + if (selectedType === kimchi.NETWORK_TYPE_MACVTAP) { + $('#networkDestinationID').attr('multiple', false).data('liveSearch',false); + } else { + $('#networkDestinationID').attr('multiple', true); + if($('#networkDestinationID option').length > 10 ) { + $('#networkDestinationID').data('liveSearch',true); + } + } + $('#networkDestinationID').selectpicker('destroy'); + + kimchi.loadInterfaces(new Array("nic", "bonding"), true); + } else { + kimchi.loadInterfaces(undefined, true); + } + //TODO: Need to confirm if this is still needed + var netInterface = network['interfaces']; + $('#networkDestinationID').append('val', netInterface); + $('#networkDestinationID').val(netInterface); + $("#networkDestinationID option[value='+netInterface+']").prop('selected', true); + $('#networkDestinationID').selectpicker('refresh'); +}; + +kimchi.updateNetworkFormButtonForEdit = function() { + if ($("#networkName").hasClass("invalid-field")) { + $('#networkFormOk').prop('disabled', true); + } else{ + $('#networkFormOk').prop('disabled', false); + } +}; + +kimchi.getNetworkDialogValuesForEdit = function() { + var network = { + name : $("#networkName").val(), + type : $("#networkType").val(), + subnetRange: $("#networkSubnetRange").val(), + interface: $("#networkDestinationID").val(), + vlan_id: $("#networkVlanID").val() + }; + if (network.type === kimchi.NETWORK_TYPE_BRIDGED) { + if (network.vlan_id !== "") { + network.vlan_id = parseInt($("#networkVlanID").val()); + } + } + return network; +}; + +kimchi.updateNetworkValues = function() { + kimchi.retrieveNetwork(kimchi.selectedNetwork, function(settings) { + var network = kimchi.getNetworkDialogValuesForEdit(); + var data = { + name : network.name, + subnet: network.subnetRange, + interfaces: [ network.interface ], + vlan_id: network.vlan_id + }; + var originalDest = settings.interfaces; + var updatedDest = $('#networkDestinationID').val(); + if (originalDest === updatedDest || updatedDest === null) { + delete data['interfaces']; + } + if (network.type !== "nat" && network.type !== "isolated") { + delete data['subnet']; + } else { // either nat or isolated + delete data['interfaces']; + delete data['vlan_id']; + } + if (network.type === kimchi.NETWORK_TYPE_BRIDGED) { + if (data.vlan_id === "") { + delete data['vlan_id']; + } else { + data.vlan_id = parseInt($("#networkVlanID").val()); + } + } else { + delete data['vlan_id']; + } + + // Just like in Add Network, VEPA connection - network.interface - is already an array + if (network.type === kimchi.NETWORK_TYPE_VEPA || network.type === kimchi.NETWORK_TYPE_PASSTHROUGH) { + if (network.interface !== null) { + data.interfaces = network.interface; + } + } + + kimchi.updateNetwork(kimchi.selectedNetwork, data, function() { + $("#networkBody").empty(); + kimchi.initNetworkListView(); + wok.window.close(); + }, function(settings) { + wok.message.error(settings.responseJSON.reason,'#alert-modal-container'); + $('#networkFormOk').text(i18n['KCHAPI6007M']); + $('#networkFormOk').prop('disabled', false); + }); + }); +}; diff --git a/ui/pages/network-edit.html.tmpl b/ui/pages/network-edit.html.tmpl new file mode 100644 index 0000000..4cc7232 --- /dev/null +++ b/ui/pages/network-edit.html.tmpl @@ -0,0 +1,78 @@ +#* + * Project Kimchi + * + * Copyright IBM Corp, 2016 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *# +#unicode UTF-8 +#import gettext +#from wok.cachebust import href +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang, fallback=True) +#silent _ = t.gettext +#silent _t = t.gettext +<html> +<body> +<div id="edit-network-window" class="window modal-content"> + <div class="modal-header"> + <h4 class="modal-title" id="networkModalLabel">$_("Edit Network")</h4> + </div> + <div id="networkConfig" class="modal-body"> + <span id="alert-modal-container"></span> + <div class="form-group"> + <label for="networkType">$_("Network Type")</label> + <input type="text" class="form-control" id="networkType" disabled="disabled" /> + </div> + <div class="form-group"> + <label for="networkName">$_("Network Name")</label> + <input type="text" class="form-control" name="netName" id="networkName" /> + <p class="help-block"> + <i class="fa fa-info-circle"></i> $_("Name should not contain '/' and '\"'.")</p> + </div> + <div id="subnetRange" class="form-group" "col-md-3"> + <div class="form-group"> + <label for="networkSubnetRange">$_("Address Space")</label> + <input type="text" class="form-control" id="networkSubnetRange" /> + </div> + </div> + <div id="networkBriDisabledLabel" class="form-group hidden"> + <p>$_("(No interfaces found)")</p> + </div> + <div id="bridgedContent"> + <div id="networkDestination" class="form-group"> + <label for="networkDestinationID">$_("Destination")</label> + <select id="networkDestinationID" data-size="5" class="selectpicker col-md-12 col-lg-12 form-control"> + </select> + </div> + <div class="form-group" id="vlan"> + <div id="vlan_chkbox"> + <input id="enableVlan" class="wok-checkbox" type="checkbox" value="" /> + <label for="enableVlan" id="labelEnableVlan">$_("Enable VLAN") </label> + </div> + <div id="vlan-enabled"> + <label for="networkVlanID" id="labelNetworkVlanID">$_("VLAN ID"): </label> + <input type="text" id="networkVlanID" class="form-control" /> + </div> + </div> + </div> + </div> + <div class="modal-footer"> + <button type="submit" id="networkFormOk" class="btn btn-default">$_("Save")</button> + <button type="button" id="networkFormCancel" data-dismiss="modal" class="btn btn-default">$_("Cancel")</button> + </div> +</div> +<script type="text/javascript"> +kimchi.network_edit_main(); +</script> +</body> +</html> diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index d8660d3..6ddabaa 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -99,6 +99,7 @@ <ul class="dropdown-menu" role="menu"> <li role="presentation" nwAct="start" class='{startClass}'><a><i class="fa fa-undo"></i>$_("Start")</a></li> <li role="presentation" nwAct="stop" class='{stopClass}'><a {stopDisabled}><i class="fa fa-ban"></i>$_("Stop")</a></li> + <li role="presentation" nwAct="edit" class='{editClass}'><a {editDisabled}><i class="fa fa-pencil"></i>$_("Edit")</a></li> <li role="presentation" nwAct="delete" class='critical {deleteClass}'><a {deleteDisabled}><i class="fa fa-minus-circle"></i>$_("Delete")</a></li> </ul> </div> @@ -110,4 +111,4 @@ kimchi.initNetwork(); </script> </body> -</html> \ No newline at end of file +</html> -- 2.5.0

3 4

[PATCH V2] [Kimchi] UI fixes for edit virtual network
by Aline Manera 21 May '16

21 May '16

This patch solves the issues pointed by Socorro: - 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 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 12 ++++++++ ui/js/src/kimchi.network_add_main.js | 48 ++++++++++++++++--------------- ui/js/src/kimchi.network_edit_main.js | 53 +++++++++++++++++++++++------------ ui/pages/network-edit.html.tmpl | 3 -- 4 files changed, 73 insertions(+), 43 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 8c01646..1ef3649 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -634,6 +634,18 @@ var kimchi = { }); }, + getInterface : function(iface, suc, err, sync) { + wok.requestJSON({ + url : 'plugins/kimchi/interfaces/' + encodeURIComponent(iface), + type : 'GET', + contentType : 'application/json', + async : !sync, + dataType : 'json', + success : suc, + error : err + }); + }, + getVEPAInterfaces : function(suc, err) { wok.requestJSON({ url : 'plugins/kimchi/interfaces?module=^(?!mlx5_core|mlx5-core).*$', diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index a500cf8..85df203 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -177,31 +177,35 @@ kimchi.enableBridgeOptions = function(enable, networkType, networkDestinationTyp }; }; -kimchi.loadInterfaces = function(interfaceFilterArray, bEdit) { - - var loadInterfacesHTML = function(result) { - var options = []; - $selectDestination = $('#networkDestinationID'); - var nics = {}; - $('#networkDestinationID').find('option').remove(); - var selectDestinationOptionHTML = ''; - for (var i = 0; i < result.length; i++) { - if (typeof interfaceFilterArray === 'undefined') { - options.push({label:result[i].name,value:result[i].name}); - nics[result[i].name] = result[i]; - selectDestinationOptionHTML += '<option data-type="'+ result[i].type +'" value="'+ result[i].name + '">' + result[i].name + '</option>'; - } else { - for (var k = 0; k < interfaceFilterArray.length; k++) { - if (result[i].type == interfaceFilterArray[k]) { - options.push({label:result[i].name,value:result[i].name}); - nics[result[i].name] = result[i]; - selectDestinationOptionHTML += '<option data-type="'+ result[i].type +'" value="'+ result[i].name + '">' + result[i].name + '</option>'; - } +kimchi.createInterfacesOpts = function(ifaces, interfaceFilterArray) { + var options = []; + $selectDestination = $('#networkDestinationID'); + var nics = {}; + $('#networkDestinationID').find('option').remove(); + var selectDestinationOptionHTML = ''; + for (var i = 0; i < ifaces.length; i++) { + if (typeof interfaceFilterArray === 'undefined') { + options.push({label:ifaces[i].name,value:ifaces[i].name}); + nics[ifaces[i].name] = ifaces[i]; + selectDestinationOptionHTML += '<option data-type="' + ifaces[i].type + '" value="'+ ifaces[i].name + '">' + ifaces[i].name + '</option>'; + } else { + for (var k = 0; k < interfaceFilterArray.length; k++) { + if (ifaces[i].type == interfaceFilterArray[k]) { + options.push({label:ifaces[i].name,value:ifaces[i].name}); + nics[ifaces[i].name] = ifaces[i]; + selectDestinationOptionHTML += '<option data-type="'+ ifaces[i].type +'" value="'+ ifaces[i].name + '">' + ifaces[i].name + '</option>'; } } } - $selectDestination.append(selectDestinationOptionHTML); - $('#networkDestinationID').selectpicker('refresh'); + } + $selectDestination.append(selectDestinationOptionHTML); + $('#networkDestinationID').selectpicker('refresh'); +}; + +kimchi.loadInterfaces = function(interfaceFilterArray, bEdit) { + + var loadInterfacesHTML = function(result) { + kimchi.createInterfacesOpts(result, interfaceFilterArray); kimchi.setDefaultNetworkType(result.length!==0, bEdit); if (!bEdit) { kimchi.changeNetworkDestination(); diff --git a/ui/js/src/kimchi.network_edit_main.js b/ui/js/src/kimchi.network_edit_main.js index 761d2f4..4dd830a 100644 --- a/ui/js/src/kimchi.network_edit_main.js +++ b/ui/js/src/kimchi.network_edit_main.js @@ -61,13 +61,6 @@ kimchi.network_edit_main = function() { } kimchi.setupNetworkFormEventForEdit(network); - - //TODO: Trial and error trying to get select box to show show the one that it's currently set to but it doesn't work - var netInterface = network['interfaces']; - $('#networkDestinationID').append('val', netInterface); - $('#networkDestinationID').val(netInterface); - $("#networkDestinationID option[value='+netInterface+']").prop('selected', true); - $('#networkDestinationID').selectpicker('refresh'); }; kimchi.retrieveNetwork(kimchi.selectedNetwork, initNetwork); @@ -98,6 +91,30 @@ kimchi.setupNetworkFormEventForEdit = function(network) { kimchi.updateNetworkFormButtonForEdit(); }); + var loadIfaces = function(interfaceFilterArray){ + var buildInterfaceOpts = function(result) { + var currentIfaces = network['interfaces']; + for (var i = 0; i < currentIfaces.length; i++) { + kimchi.getInterface(currentIfaces[i], function(iface) { + result.push(iface); + } , null, true); + } + kimchi.createInterfacesOpts(result, interfaceFilterArray); + + for (var i = 0; i < currentIfaces.length; i++) { + $("#networkDestinationID option[value='" + currentIfaces[i] + "']").attr('selected','selected'); + } + $('#networkDestinationID').selectpicker('refresh'); + }; + + var networkType = $("#networkType").val(); + if (networkType === kimchi.NETWORK_TYPE_VEPA) { + kimchi.getVEPAInterfaces(buildInterfaceOpts); + } else { + kimchi.getInterfaces(buildInterfaceOpts); + } + } + var selectedType = network['connection']; if(selectedType === kimchi.NETWORK_TYPE_MACVTAP || selectedType === kimchi.NETWORK_TYPE_PASSTHROUGH || @@ -112,16 +129,10 @@ kimchi.setupNetworkFormEventForEdit = function(network) { } $('#networkDestinationID').selectpicker('destroy'); - kimchi.loadInterfaces(new Array("nic", "bonding"), true); + loadIfaces(new Array("nic", "bonding")); } else { - kimchi.loadInterfaces(undefined, true); + loadIfaces(undefined); } - //TODO: Need to confirm if this is still needed - var netInterface = network['interfaces']; - $('#networkDestinationID').append('val', netInterface); - $('#networkDestinationID').val(netInterface); - $("#networkDestinationID option[value='+netInterface+']").prop('selected', true); - $('#networkDestinationID').selectpicker('refresh'); }; kimchi.updateNetworkFormButtonForEdit = function() { @@ -185,9 +196,15 @@ kimchi.updateNetworkValues = function() { } } - kimchi.updateNetwork(kimchi.selectedNetwork, data, function() { - $("#networkBody").empty(); - kimchi.initNetworkListView(); + kimchi.updateNetwork(kimchi.selectedNetwork, data, function(result) { + $('#' + kimchi.selectedNetwork).remove(); + network = result; + network.type = result.connection; + network.state = result.state === "active" ? "up" : "down"; + network.interface = result.interfaces ? result.interfaces[0] : i18n["KCHNET6001M"]; + network.addrSpace = result.subnet ? result.subnet : i18n["KCHNET6001M"]; + network.persistent = result.persistent; + $('#networkGrid').dataGrid('addRow', kimchi.addNetworkItem(network)); wok.window.close(); }, function(settings) { wok.message.error(settings.responseJSON.reason,'#alert-modal-container'); diff --git a/ui/pages/network-edit.html.tmpl b/ui/pages/network-edit.html.tmpl index 4cc7232..3f2f3fe 100644 --- a/ui/pages/network-edit.html.tmpl +++ b/ui/pages/network-edit.html.tmpl @@ -45,9 +45,6 @@ <input type="text" class="form-control" id="networkSubnetRange" /> </div> </div> - <div id="networkBriDisabledLabel" class="form-group hidden"> - <p>$_("(No interfaces found)")</p> - </div> <div id="bridgedContent"> <div id="networkDestination" class="form-group"> <label for="networkDestinationID">$_("Destination")</label> -- 2.5.5

3 3

[PATCH] [Wok] Fix advanced log search by time
by Jose Ricardo Ziviani 20 May '16

20 May '16

- Backend does not allow log search by time, giving an error WOKLOG0001E. This commit fixes this issue by including the time field in the list of FILTER_FIELDS. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- src/wok/reqlogger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py index 1145dbd..b309d8f 100644 --- a/src/wok/reqlogger.py +++ b/src/wok/reqlogger.py @@ -33,7 +33,7 @@ from wok.utils import ascii_dict, remove_old_files # Log search setup -FILTER_FIELDS = ['app', 'date', 'download', 'req', 'user'] +FILTER_FIELDS = ['app', 'date', 'download', 'req', 'user', 'time'] LOG_DOWNLOAD_URI = "/data/logs/%s" LOG_DOWNLOAD_TIMEOUT = 6 LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(user)s: %(message)s\n" -- 2.7.4

2 1

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

20 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. v1: - HTML and CSS v2: - Delete and Wipe with multi-selection - Confirm messages with list of selected volumes when wiping or deleting volumes (requires SCSS/CSS patch sent to Wok) - Filter working - Removed "Add Volume" link from Storage Pool action button - Added "Add Volume" to Volume box action button To do: - Clone function - Fix progress bar (gallery view) and spinner (list view) when adding and cloning a new volume - Add a temporary volume when cloning process is still in progress Known issues: - List doesn't refresh when the only volume available is deleted from Storage Pool. Please let me know if you find any bug or if you have any suggestion. Samuel Guimarães (1): Storage Volume management UI ui/css/kimchi.css | 273 +++++++++++++++---- ui/css/src/modules/_storage.scss | 295 +++++++++++++++++---- ui/js/src/kimchi.api.js | 50 ++++ ui/js/src/kimchi.storage_main.js | 256 ++++++++++++++---- ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +- ui/js/src/kimchi.storagepool_resize_volume_main.js | 58 ++++ ui/pages/i18n.json.tmpl | 5 + ui/pages/storagepool-resize-volume.html.tmpl | 51 ++++ ui/pages/tabs/storage.html.tmpl | 120 ++++++--- 9 files changed, 925 insertions(+), 185 deletions(-) create mode 100644 ui/js/src/kimchi.storagepool_resize_volume_main.js create mode 100644 ui/pages/storagepool-resize-volume.html.tmpl -- 1.9.3

2 2

[PATCH] [Kimchi] UI fixes for edit virtual network
by Aline Manera 20 May '16

20 May '16

This patch solves the issues pointed by Socorro: - 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 --- ui/js/src/kimchi.api.js | 12 +++++++++ ui/js/src/kimchi.network_add_main.js | 48 +++++++++++++++++++---------------- ui/js/src/kimchi.network_edit_main.js | 48 ++++++++++++++++++++++------------- ui/pages/network-edit.html.tmpl | 3 --- 4 files changed, 68 insertions(+), 43 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 8c01646..1ef3649 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -634,6 +634,18 @@ var kimchi = { }); }, + getInterface : function(iface, suc, err, sync) { + wok.requestJSON({ + url : 'plugins/kimchi/interfaces/' + encodeURIComponent(iface), + type : 'GET', + contentType : 'application/json', + async : !sync, + dataType : 'json', + success : suc, + error : err + }); + }, + getVEPAInterfaces : function(suc, err) { wok.requestJSON({ url : 'plugins/kimchi/interfaces?module=^(?!mlx5_core|mlx5-core).*$', diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index a500cf8..85df203 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -177,31 +177,35 @@ kimchi.enableBridgeOptions = function(enable, networkType, networkDestinationTyp }; }; -kimchi.loadInterfaces = function(interfaceFilterArray, bEdit) { - - var loadInterfacesHTML = function(result) { - var options = []; - $selectDestination = $('#networkDestinationID'); - var nics = {}; - $('#networkDestinationID').find('option').remove(); - var selectDestinationOptionHTML = ''; - for (var i = 0; i < result.length; i++) { - if (typeof interfaceFilterArray === 'undefined') { - options.push({label:result[i].name,value:result[i].name}); - nics[result[i].name] = result[i]; - selectDestinationOptionHTML += '<option data-type="'+ result[i].type +'" value="'+ result[i].name + '">' + result[i].name + '</option>'; - } else { - for (var k = 0; k < interfaceFilterArray.length; k++) { - if (result[i].type == interfaceFilterArray[k]) { - options.push({label:result[i].name,value:result[i].name}); - nics[result[i].name] = result[i]; - selectDestinationOptionHTML += '<option data-type="'+ result[i].type +'" value="'+ result[i].name + '">' + result[i].name + '</option>'; - } +kimchi.createInterfacesOpts = function(ifaces, interfaceFilterArray) { + var options = []; + $selectDestination = $('#networkDestinationID'); + var nics = {}; + $('#networkDestinationID').find('option').remove(); + var selectDestinationOptionHTML = ''; + for (var i = 0; i < ifaces.length; i++) { + if (typeof interfaceFilterArray === 'undefined') { + options.push({label:ifaces[i].name,value:ifaces[i].name}); + nics[ifaces[i].name] = ifaces[i]; + selectDestinationOptionHTML += '<option data-type="' + ifaces[i].type + '" value="'+ ifaces[i].name + '">' + ifaces[i].name + '</option>'; + } else { + for (var k = 0; k < interfaceFilterArray.length; k++) { + if (ifaces[i].type == interfaceFilterArray[k]) { + options.push({label:ifaces[i].name,value:ifaces[i].name}); + nics[ifaces[i].name] = ifaces[i]; + selectDestinationOptionHTML += '<option data-type="'+ ifaces[i].type +'" value="'+ ifaces[i].name + '">' + ifaces[i].name + '</option>'; } } } - $selectDestination.append(selectDestinationOptionHTML); - $('#networkDestinationID').selectpicker('refresh'); + } + $selectDestination.append(selectDestinationOptionHTML); + $('#networkDestinationID').selectpicker('refresh'); +}; + +kimchi.loadInterfaces = function(interfaceFilterArray, bEdit) { + + var loadInterfacesHTML = function(result) { + kimchi.createInterfacesOpts(result, interfaceFilterArray); kimchi.setDefaultNetworkType(result.length!==0, bEdit); if (!bEdit) { kimchi.changeNetworkDestination(); diff --git a/ui/js/src/kimchi.network_edit_main.js b/ui/js/src/kimchi.network_edit_main.js index 761d2f4..4b813c9 100644 --- a/ui/js/src/kimchi.network_edit_main.js +++ b/ui/js/src/kimchi.network_edit_main.js @@ -61,13 +61,6 @@ kimchi.network_edit_main = function() { } kimchi.setupNetworkFormEventForEdit(network); - - //TODO: Trial and error trying to get select box to show show the one that it's currently set to but it doesn't work - var netInterface = network['interfaces']; - $('#networkDestinationID').append('val', netInterface); - $('#networkDestinationID').val(netInterface); - $("#networkDestinationID option[value='+netInterface+']").prop('selected', true); - $('#networkDestinationID').selectpicker('refresh'); }; kimchi.retrieveNetwork(kimchi.selectedNetwork, initNetwork); @@ -98,6 +91,25 @@ kimchi.setupNetworkFormEventForEdit = function(network) { kimchi.updateNetworkFormButtonForEdit(); }); + var loadIfaces = function(interfaceFilterArray){ + var buildInterfaceOpts = function(result) { + var currentIfaces = network['interfaces']; + for (var i = 0; i < currentIfaces.length; i++) { + kimchi.getInterface(currentIfaces[i], function(iface) { + result.push(iface); + } , null, true); + } + kimchi.createInterfacesOpts(result, interfaceFilterArray); + }; + + var networkType = $("#networkType").val(); + if (networkType === kimchi.NETWORK_TYPE_VEPA) { + kimchi.getVEPAInterfaces(buildInterfaceOpts); + } else { + kimchi.getInterfaces(buildInterfaceOpts); + } + } + var selectedType = network['connection']; if(selectedType === kimchi.NETWORK_TYPE_MACVTAP || selectedType === kimchi.NETWORK_TYPE_PASSTHROUGH || @@ -112,16 +124,10 @@ kimchi.setupNetworkFormEventForEdit = function(network) { } $('#networkDestinationID').selectpicker('destroy'); - kimchi.loadInterfaces(new Array("nic", "bonding"), true); + loadIfaces(new Array("nic", "bonding")); } else { - kimchi.loadInterfaces(undefined, true); + loadIfaces(undefined); } - //TODO: Need to confirm if this is still needed - var netInterface = network['interfaces']; - $('#networkDestinationID').append('val', netInterface); - $('#networkDestinationID').val(netInterface); - $("#networkDestinationID option[value='+netInterface+']").prop('selected', true); - $('#networkDestinationID').selectpicker('refresh'); }; kimchi.updateNetworkFormButtonForEdit = function() { @@ -185,9 +191,15 @@ kimchi.updateNetworkValues = function() { } } - kimchi.updateNetwork(kimchi.selectedNetwork, data, function() { - $("#networkBody").empty(); - kimchi.initNetworkListView(); + kimchi.updateNetwork(kimchi.selectedNetwork, data, function(result) { + $('#' + kimchi.selectedNetwork).remove(); + network = result; + network.type = result.connection; + network.state = result.state === "active" ? "up" : "down"; + network.interface = result.interfaces ? result.interfaces[0] : i18n["KCHNET6001M"]; + network.addrSpace = result.subnet ? result.subnet : i18n["KCHNET6001M"]; + network.persistent = result.persistent; + $('#networkGrid').dataGrid('addRow', kimchi.addNetworkItem(network)); wok.window.close(); }, function(settings) { wok.message.error(settings.responseJSON.reason,'#alert-modal-container'); diff --git a/ui/pages/network-edit.html.tmpl b/ui/pages/network-edit.html.tmpl index 4cc7232..3f2f3fe 100644 --- a/ui/pages/network-edit.html.tmpl +++ b/ui/pages/network-edit.html.tmpl @@ -45,9 +45,6 @@ <input type="text" class="form-control" id="networkSubnetRange" /> </div> </div> - <div id="networkBriDisabledLabel" class="form-group hidden"> - <p>$_("(No interfaces found)")</p> - </div> <div id="bridgedContent"> <div id="networkDestination" class="form-group"> <label for="networkDestinationID">$_("Destination")</label> -- 2.5.5

1 0

[PATCH] [Wok] Fixed minor CSS issues and wok-confirm content when displaying lists
by sguimaraes943＠gmail.com 20 May '16

20 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds some new styles for lists inside wok.confirm dialogs and fixes a minor issue with grouped Bootstrap selectors badly compiled by old version of python-libsass. This is required for new Storage Volume management options. Samuel Guimarães (1): Fixed minor CSS issues and wok-confirm content when displaying lists ui/css/bootstrap.custom.css | 6 +++--- ui/css/src/modules/_wok-confirm.scss | 11 +++++++++++ ui/css/wok.css | 11 +++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) -- 1.9.3

2 2

[PATCH] [Wok] Moved i18n variable from htmlStr
by pkulkark＠linux.vnet.ibm.com 20 May '16

20 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch fixes the issue with the i18n variable breaking wok by moving it from htmlStr. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/js/src/wok.list.js b/ui/js/src/wok.list.js index d17a3e7..1d4e526 100644 --- a/ui/js/src/wok.list.js +++ b/ui/js/src/wok.list.js @@ -43,7 +43,7 @@ wok.widget.List.prototype = (function() { '<div id="{id}-action-group" class="wok-list-action-button-container">', '<div class="dropdown mobile-action">', '<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">', - '<span class="mobile-action-label">'+i18n['WOKSETT0012M']+'</span>', + '<span class="mobile-action-label">{actions}</span>', '</button>', '<ul class="dropdown-menu" role="menu">', '</ul>', @@ -246,7 +246,8 @@ wok.widget.List.prototype = (function() { loading: i18n.WOKGRD6001M, message: i18n.WOKGRD6002M, buttonLabel: i18n.WOKGRD6003M, - detailedLabel: i18n.WOKGRD6004M + detailedLabel: i18n.WOKGRD6004M, + actions: i18n.WOKSETT0012M })).appendTo(container); this.domNode = domNode; -- 2.1.0

3 2

Re: [Kimchi-devel] [PATCH] [Kimchi] Isolate unit tests execution.
by Aline Manera 20 May '16

20 May '16

On 05/20/2016 08:27 AM, Paulo Ricardo Paz Vital wrote: > On May 18 06:24PM, Aline Manera wrote: >> >> On 05/16/2016 11:16 PM, pvital(a)linux.vnet.ibm.com wrote: >>> From: Paulo Vital <pvital(a)linux.vnet.ibm.com> >>> >>> This patch isolates each unit test execution reducing the occurrences of tests >>> using data from previous unit tests and making results not reliable. >>> >>> In addition, it also simplifies the output of tests execution, printing the tags >>> PASSED and FAILED and the error/failed banners only when necessary. >>> >>> Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> >>> --- >>> tests/run_tests.sh.in | 53 +++++++++++++++++++++++++++++++++++++++------------ >>> 1 file changed, 41 insertions(+), 12 deletions(-) >>> >>> diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in >>> index 68dfa2e..d9c2661 100644 >>> --- a/tests/run_tests.sh.in >>> +++ b/tests/run_tests.sh.in >>> @@ -21,6 +21,10 @@ >>> HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ >>> PYTHON_VER=@PYTHON_VERSION@ >>> >>> +RED='\033[0;31m' >>> +GREEN='\033[0;32m' >>> +NC='\033[0m' # No Color >>> + >>> if [ "$1" = "-v" ]; then >>> OPTS="-v" >>> shift >>> @@ -40,19 +44,44 @@ else >>> CMD="python -m unittest" >>> fi >>> >>> -LIST=($ARGS) >>> -MODEL_LIST=() >>> -MOCK_LIST=() >>> -for ((i=0;i<${#LIST[@]};i++)); do >>> - >>> - if [[ ${LIST[$i]} == test_model* ]]; then >>> - MODEL_LIST+=(${LIST[$i]}) >>> +NUM_TESTS=0 >>> +TIME=0 >>> +declare -A FAILED_UT # dict to store failed unit tests and its OUTPUT_FILE >>> +for UT in $ARGS; do >>> + OUTPUT_FILE=$(mktemp) >>> + echo -n "***** Running unit test: $UT... " >>> + # ../../../../../ refers to the project root >>> + # ../../../../ refers to wok directory >>> + # ../../../ refers to plugins directory >>> + PYTHONPATH=../../../../../:../../../../:../../../ \ >>> + PYTHONWARNINGS="ignore:Unverified HTTPS request" \ >>> + $CMD $OPTS $UT &> $OUTPUT_FILE >> You can do: >> >> output=$($CMD $OPTS $UT) >> >> to get the test output. That way we don't need to create multiple temporary >> files. >> > Yeap, I can do this. However, the idea to have a temporary file is keep the full > output of the test case execution for future analysis, instead of check only the > console history. > > This patch, when an error or failure happens, prints only the 'banner' with the > test case error on user console. With the output stored in a file (temporary > because I delete the files which finishes with no errors) I can see it later to > fix the error. > My point is: you don't need to have multiple files. Store the error output in a variable and if it is not empty in the end of the process, write it into a file and print the output to user as you already do. >>> + RES=$? >>> + if [ $RES -ne 0 ]; then >>> + # unit test has failed, so keep the OUTPUT_FILE and print the results >>> + echo -e "\t ${RED}FAILED${NC}" >>> + ERROR_LOG_BEGIN=$(grep -n "^\==*" $OUTPUT_FILE | head -n1 | cut -d":" -f1) >>> + ERROR_LOG_END=$(cat $OUTPUT_FILE | wc -l) >>> + tail -n $((${ERROR_LOG_END}-${ERROR_LOG_BEGIN}+1)) $OUTPUT_FILE >>> + FAILED_UT+=([$UT]=$OUTPUT_FILE) >>> + OUTPUT=$(grep "Ran" $OUTPUT_FILE) >> Following my suggestion to do not use temporary files, all the above block >> will be replace by: >> >> FAILED_UT+=$output >> > With this changes the full output of test execution will be printed in the > console. As I told above, this patch's idea is 'clean' the output printed in the > console by showing only the error/failure 'banner' and keeping the full > execution stack on a file. > >>> else >>> - MOCK_LIST+=(${LIST[$i]}) >>> + # unit test has passed, so print the results and delete the OUTPUT_FILE >>> + OUTPUT=$(grep "Ran" $OUTPUT_FILE) >>> + echo -e "\t ${GREEN}PASSED${NC} - $OUTPUT" >>> + rm -rf $OUTPUT_FILE >>> fi >>> + TES=$(echo $OUTPUT | cut -d" " -f2) >>> + NUM_TESTS=$(echo "$NUM_TESTS + $TES" | bc) >>> + TES=$(echo $OUTPUT | cut -d" " -f5) >>> + TIME=$(echo "$TIME + ${TES:0:-1}" | bc) >>> done >>> >>> -# ../../../../../ refers to the project root >>> -# ../../../../ refers to wok directory >>> -# ../../../ refers to plugins directory >>> -PYTHONPATH=../../../../../:../../../../:../../../ PYTHONWARNINGS="ignore:Unverified HTTPS request" $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} >>> +# Print summary results >>> +echo -e "======================================================================" >>> +echo -e "===================== Kimchi Unit Tests Summary ======================" >>> +echo -e "Ran $NUM_TESTS tests in $TIME seconds." >>> +for i in "${!FAILED_UT[@]}"; do >>> + FAIL_STATS=$(grep FAILED ${FAILED_UT[$i]} | cut -d" " -f2-4) >>> + echo -e "$i FAILED: $FAIL_STATS - log available at ${FAILED_UT[$i]}" >>> +done >>> -- >>> 2.5.5 > -- > Paulo Ricardo Paz Vital > Linux Technology Center, IBM Systems > http://www.ibm.com/linux/ltc/

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Isolate unit tests execution.
by Aline Manera 20 May '16

20 May '16

On 05/20/2016 09:10 AM, Paulo Ricardo Paz Vital wrote: > To show how the new output will be if applied this patch, you can see one > execution at http://paste.fedoraproject.org/368843/ > > In the summary you can see that two temporary files are pointed and only these > two files will be available after the execution (all other files were deleted). So will I need to check file by file to get the error output?! Why not use a single file? > On May 20 08:27AM, Paulo Ricardo Paz Vital wrote: >> On May 18 06:24PM, Aline Manera wrote: >>> >>> On 05/16/2016 11:16 PM, pvital(a)linux.vnet.ibm.com wrote: >>>> From: Paulo Vital <pvital(a)linux.vnet.ibm.com> >>>> >>>> This patch isolates each unit test execution reducing the occurrences of tests >>>> using data from previous unit tests and making results not reliable. >>>> >>>> In addition, it also simplifies the output of tests execution, printing the tags >>>> PASSED and FAILED and the error/failed banners only when necessary. >>>> >>>> Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> >>>> --- >>>> tests/run_tests.sh.in | 53 +++++++++++++++++++++++++++++++++++++++------------ >>>> 1 file changed, 41 insertions(+), 12 deletions(-) >>>> >>>> diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in >>>> index 68dfa2e..d9c2661 100644 >>>> --- a/tests/run_tests.sh.in >>>> +++ b/tests/run_tests.sh.in >>>> @@ -21,6 +21,10 @@ >>>> HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ >>>> PYTHON_VER=@PYTHON_VERSION@ >>>> >>>> +RED='\033[0;31m' >>>> +GREEN='\033[0;32m' >>>> +NC='\033[0m' # No Color >>>> + >>>> if [ "$1" = "-v" ]; then >>>> OPTS="-v" >>>> shift >>>> @@ -40,19 +44,44 @@ else >>>> CMD="python -m unittest" >>>> fi >>>> >>>> -LIST=($ARGS) >>>> -MODEL_LIST=() >>>> -MOCK_LIST=() >>>> -for ((i=0;i<${#LIST[@]};i++)); do >>>> - >>>> - if [[ ${LIST[$i]} == test_model* ]]; then >>>> - MODEL_LIST+=(${LIST[$i]}) >>>> +NUM_TESTS=0 >>>> +TIME=0 >>>> +declare -A FAILED_UT # dict to store failed unit tests and its OUTPUT_FILE >>>> +for UT in $ARGS; do >>>> + OUTPUT_FILE=$(mktemp) >>>> + echo -n "***** Running unit test: $UT... " >>>> + # ../../../../../ refers to the project root >>>> + # ../../../../ refers to wok directory >>>> + # ../../../ refers to plugins directory >>>> + PYTHONPATH=../../../../../:../../../../:../../../ \ >>>> + PYTHONWARNINGS="ignore:Unverified HTTPS request" \ >>>> + $CMD $OPTS $UT &> $OUTPUT_FILE >>> You can do: >>> >>> output=$($CMD $OPTS $UT) >>> >>> to get the test output. That way we don't need to create multiple temporary >>> files. >>> >> Yeap, I can do this. However, the idea to have a temporary file is keep the full >> output of the test case execution for future analysis, instead of check only the >> console history. >> >> This patch, when an error or failure happens, prints only the 'banner' with the >> test case error on user console. With the output stored in a file (temporary >> because I delete the files which finishes with no errors) I can see it later to >> fix the error. >> >>>> + RES=$? >>>> + if [ $RES -ne 0 ]; then >>>> + # unit test has failed, so keep the OUTPUT_FILE and print the results >>>> + echo -e "\t ${RED}FAILED${NC}" >>>> + ERROR_LOG_BEGIN=$(grep -n "^\==*" $OUTPUT_FILE | head -n1 | cut -d":" -f1) >>>> + ERROR_LOG_END=$(cat $OUTPUT_FILE | wc -l) >>>> + tail -n $((${ERROR_LOG_END}-${ERROR_LOG_BEGIN}+1)) $OUTPUT_FILE >>>> + FAILED_UT+=([$UT]=$OUTPUT_FILE) >>>> + OUTPUT=$(grep "Ran" $OUTPUT_FILE) >>> Following my suggestion to do not use temporary files, all the above block >>> will be replace by: >>> >>> FAILED_UT+=$output >>> >> With this changes the full output of test execution will be printed in the >> console. As I told above, this patch's idea is 'clean' the output printed in the >> console by showing only the error/failure 'banner' and keeping the full >> execution stack on a file. >> >>>> else >>>> - MOCK_LIST+=(${LIST[$i]}) >>>> + # unit test has passed, so print the results and delete the OUTPUT_FILE >>>> + OUTPUT=$(grep "Ran" $OUTPUT_FILE) >>>> + echo -e "\t ${GREEN}PASSED${NC} - $OUTPUT" >>>> + rm -rf $OUTPUT_FILE >>>> fi >>>> + TES=$(echo $OUTPUT | cut -d" " -f2) >>>> + NUM_TESTS=$(echo "$NUM_TESTS + $TES" | bc) >>>> + TES=$(echo $OUTPUT | cut -d" " -f5) >>>> + TIME=$(echo "$TIME + ${TES:0:-1}" | bc) >>>> done >>>> >>>> -# ../../../../../ refers to the project root >>>> -# ../../../../ refers to wok directory >>>> -# ../../../ refers to plugins directory >>>> -PYTHONPATH=../../../../../:../../../../:../../../ PYTHONWARNINGS="ignore:Unverified HTTPS request" $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} >>>> +# Print summary results >>>> +echo -e "======================================================================" >>>> +echo -e "===================== Kimchi Unit Tests Summary ======================" >>>> +echo -e "Ran $NUM_TESTS tests in $TIME seconds." >>>> +for i in "${!FAILED_UT[@]}"; do >>>> + FAIL_STATS=$(grep FAILED ${FAILED_UT[$i]} | cut -d" " -f2-4) >>>> + echo -e "$i FAILED: $FAIL_STATS - log available at ${FAILED_UT[$i]}" >>>> +done >>>> -- >>>> 2.5.5 >> -- >> Paulo Ricardo Paz Vital >> Linux Technology Center, IBM Systems >> http://www.ibm.com/linux/ltc/ >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> > -- > Paulo Ricardo Paz Vital > Linux Technology Center, IBM Systems > http://www.ibm.com/linux/ltc/

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Isolate unit tests execution.
by Paulo Ricardo Paz Vital 20 May '16

20 May '16

On May 18 06:24PM, Aline Manera wrote: > > > On 05/16/2016 11:16 PM, pvital(a)linux.vnet.ibm.com wrote: > > From: Paulo Vital <pvital(a)linux.vnet.ibm.com> > > > > This patch isolates each unit test execution reducing the occurrences of tests > > using data from previous unit tests and making results not reliable. > > > > In addition, it also simplifies the output of tests execution, printing the tags > > PASSED and FAILED and the error/failed banners only when necessary. > > > > Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> > > --- > > tests/run_tests.sh.in | 53 +++++++++++++++++++++++++++++++++++++++------------ > > 1 file changed, 41 insertions(+), 12 deletions(-) > > > > diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in > > index 68dfa2e..d9c2661 100644 > > --- a/tests/run_tests.sh.in > > +++ b/tests/run_tests.sh.in > > @@ -21,6 +21,10 @@ > > HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ > > PYTHON_VER=@PYTHON_VERSION@ > > > > +RED='\033[0;31m' > > +GREEN='\033[0;32m' > > +NC='\033[0m' # No Color > > + > > if [ "$1" = "-v" ]; then > > OPTS="-v" > > shift > > @@ -40,19 +44,44 @@ else > > CMD="python -m unittest" > > fi > > > > -LIST=($ARGS) > > -MODEL_LIST=() > > -MOCK_LIST=() > > -for ((i=0;i<${#LIST[@]};i++)); do > > - > > - if [[ ${LIST[$i]} == test_model* ]]; then > > - MODEL_LIST+=(${LIST[$i]}) > > +NUM_TESTS=0 > > +TIME=0 > > +declare -A FAILED_UT # dict to store failed unit tests and its OUTPUT_FILE > > +for UT in $ARGS; do > > + OUTPUT_FILE=$(mktemp) > > + echo -n "***** Running unit test: $UT... " > > + # ../../../../../ refers to the project root > > + # ../../../../ refers to wok directory > > + # ../../../ refers to plugins directory > > + PYTHONPATH=../../../../../:../../../../:../../../ \ > > + PYTHONWARNINGS="ignore:Unverified HTTPS request" \ > > + $CMD $OPTS $UT &> $OUTPUT_FILE > > You can do: > > output=$($CMD $OPTS $UT) > > to get the test output. That way we don't need to create multiple temporary > files. > Yeap, I can do this. However, the idea to have a temporary file is keep the full output of the test case execution for future analysis, instead of check only the console history. This patch, when an error or failure happens, prints only the 'banner' with the test case error on user console. With the output stored in a file (temporary because I delete the files which finishes with no errors) I can see it later to fix the error. > > + RES=$? > > + if [ $RES -ne 0 ]; then > > + # unit test has failed, so keep the OUTPUT_FILE and print the results > > + echo -e "\t ${RED}FAILED${NC}" > > > + ERROR_LOG_BEGIN=$(grep -n "^\==*" $OUTPUT_FILE | head -n1 | cut -d":" -f1) > > + ERROR_LOG_END=$(cat $OUTPUT_FILE | wc -l) > > + tail -n $((${ERROR_LOG_END}-${ERROR_LOG_BEGIN}+1)) $OUTPUT_FILE > > + FAILED_UT+=([$UT]=$OUTPUT_FILE) > > + OUTPUT=$(grep "Ran" $OUTPUT_FILE) > > Following my suggestion to do not use temporary files, all the above block > will be replace by: > > FAILED_UT+=$output > With this changes the full output of test execution will be printed in the console. As I told above, this patch's idea is 'clean' the output printed in the console by showing only the error/failure 'banner' and keeping the full execution stack on a file. > > else > > - MOCK_LIST+=(${LIST[$i]}) > > + # unit test has passed, so print the results and delete the OUTPUT_FILE > > + OUTPUT=$(grep "Ran" $OUTPUT_FILE) > > + echo -e "\t ${GREEN}PASSED${NC} - $OUTPUT" > > + rm -rf $OUTPUT_FILE > > fi > > + TES=$(echo $OUTPUT | cut -d" " -f2) > > + NUM_TESTS=$(echo "$NUM_TESTS + $TES" | bc) > > + TES=$(echo $OUTPUT | cut -d" " -f5) > > + TIME=$(echo "$TIME + ${TES:0:-1}" | bc) > > done > > > > -# ../../../../../ refers to the project root > > -# ../../../../ refers to wok directory > > -# ../../../ refers to plugins directory > > -PYTHONPATH=../../../../../:../../../../:../../../ PYTHONWARNINGS="ignore:Unverified HTTPS request" $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} > > +# Print summary results > > +echo -e "======================================================================" > > +echo -e "===================== Kimchi Unit Tests Summary ======================" > > +echo -e "Ran $NUM_TESTS tests in $TIME seconds." > > +for i in "${!FAILED_UT[@]}"; do > > + FAIL_STATS=$(grep FAILED ${FAILED_UT[$i]} | cut -d" " -f2-4) > > + echo -e "$i FAILED: $FAIL_STATS - log available at ${FAILED_UT[$i]}" > > +done > > -- > > 2.5.5 > -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

1 1

Re: [Kimchi-devel] [PATCH][Kimchi 1/2] Modify max memory slots default numbers
by Aline Manera 19 May '16

19 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi 1/2] Modify max memory slots default numbers
by Aline Manera 19 May '16

19 May '16

On 05/19/2016 09:14 AM, Rodrigo Trujillo wrote: > This patch sets the number of available memory device slots to the > number supported by each architecture in qemu/libvirt. Without the > restriction of 1GB per device, now kimchi Will allow users to hotplug > more devices than previous implementarion. > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > model/vms.py | 23 ++--------------------- > osinfo.py | 11 +++++++++++ > vmtemplate.py | 20 +++++--------------- > 3 files changed, 18 insertions(+), 36 deletions(-) > > diff --git a/model/vms.py b/model/vms.py > index 0108381..48196dd 100644 > --- a/model/vms.py > +++ b/model/vms.py > @@ -58,6 +58,7 @@ from wok.plugins.kimchi.model.utils import get_ascii_nonascii_name, get_vm_name > from wok.plugins.kimchi.model.utils import get_metadata_node > from wok.plugins.kimchi.model.utils import remove_metadata_node > from wok.plugins.kimchi.model.utils import set_metadata_node > +from wok.plugins.kimchi.osinfo import defaults > 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 > @@ -858,23 +859,6 @@ class VMModel(object): > elif newMem == (oldMem << 10): > newMem = newMem - memDevsAmount > > - def _get_slots(mem, maxMem): > - slots = (maxMem - mem) >> 10 >> 10 > - # Libvirt does not accepts slots <= 1 > - if slots < 0: > - raise InvalidParameter("KCHTMPL0031E", > - {'mem': str(mem >> 10), > - 'maxmem': str(maxMem >> 10)}) > - elif slots == 0: > - slots = 1 > - > - # max 32 slots on Power > - distro, _, _ = platform.linux_distribution() > - if distro == "IBM_PowerKVM" and slots > 32: > - slots = 32 > - return slots > - # End of _get_slots > - > # There is an issue in Libvirt/Qemu, where Guest does not start if > # memory and max memory are the same. So we decided to remove max > # memory and only add it if user explicitly provides it, willing to > @@ -886,7 +870,7 @@ class VMModel(object): > max_mem_xml = E.maxMemory( > str(newMaxMem), > unit='Kib', > - slots=str(_get_slots(newMem, newMaxMem))) > + slots=str(defaults['mem_dev_slots'])) You don't need to pass that value as parameter to VMTemplate. VMTemplate already gets the osinfo.defaults values on initialization so the value is in self.info - you just need to use it when needed. > root.insert(0, max_mem_xml) > elif (maxMemTag is None) and (newMem == newMaxMem): > # Nothing to do > @@ -894,7 +878,6 @@ class VMModel(object): > elif (maxMemTag is not None) and (newMem != newMaxMem): > # Just update value in max memory tag > maxMemTag.text = str(newMaxMem) > - maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) > elif (maxMemTag is not None) and (newMem == newMaxMem): > if self._get_mem_dev_total_size(ET.tostring(root)) == 0: > # Remove the tag > @@ -928,8 +911,6 @@ class VMModel(object): > if (newMem == newMaxMem and > (self._get_mem_dev_total_size(ET.tostring(root)) == 0)): > root.remove(maxMemTag) > - else: > - maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) > > # Setting memory hard limit to max_memory + 1GiB > memtune = root.find('memtune') > diff --git a/osinfo.py b/osinfo.py > index 7b80f29..d3909ad 100644 > --- a/osinfo.py > +++ b/osinfo.py > @@ -34,6 +34,14 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), > 'ppc64le': ('ppc64le')} > > > +# Memory devices slot limits by architecture > +MEM_DEV_SLOTS = {'ppc64': 32, > + 'ppc64le': 32, > + 'x86_64': 256, > + 'i686': 256, > + 'i386': 256} > + > + > template_specs = {'x86': {'old': dict(disk_bus='ide', > nic_model='e1000', sound_model='ich6'), > 'modern': dict(disk_bus='virtio', > @@ -175,6 +183,9 @@ def _get_tmpl_defaults(): > # Update defaults values with graphics values > defaults['graphics'] = default_config.pop('graphics') > > + # Setting default memory device slots > + defaults['mem_dev_slots'] = MEM_DEV_SLOTS.get(os.uname()[4], 32) > + > return defaults > > > diff --git a/vmtemplate.py b/vmtemplate.py > index 5e38275..ef92914 100644 > --- a/vmtemplate.py > +++ b/vmtemplate.py > @@ -18,7 +18,6 @@ > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > import os > -import platform > import stat > import time > import urlparse > @@ -369,25 +368,16 @@ class VMTemplate(object): > # TODO: need modify this when boot order edition feature came upstream. > params['boot_order'] = get_bootorder_xml() > > - # Setting maximum number of slots to avoid errors when hotplug memory > - # Number of slots are the numbers of chunks of 1GB that fit inside > - # the max_memory of the host minus memory assigned to the VM. It > - # cannot have more than 32 slots in Power. > + # Setting maximum number of memory slots > + slots = str(self.info['mem_dev_slots']) > + > + # Rearrange memory parameters > memory = self.info['memory'].get('current') > maxmemory = self.info['memory'].get('maxmemory') > - > - slots = (maxmemory - memory) >> 10 > - if slots < 0: > + if maxmemory < memory: > raise OperationFailed("KCHVM0041E", > {'maxmem': str(maxmemory)}) > - elif slots == 0: > - slots = 1 > - elif slots > 32: > - distro, _, _ = platform.linux_distribution() > - if distro == "IBM_PowerKVM": > - slots = 32 > > - # Rearrange memory parameters > params['memory'] = self.info['memory'].get('current') > params['max_memory'] = "" > # if there is not support to memory hotplug in Libvirt or qemu, we

2 1

[PATCH] [Wok] Externalised 'Actions' to i18n and updated .pot and *.po files
by pkulkark＠linux.vnet.ibm.com 19 May '16

19 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch externalised the 'Actions' button to i18n file and updated .pot and *.po files using update-po. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- po/de_DE.po | 19 ++++++++++++++++++- po/en_US.po | 19 ++++++++++++++++++- po/es_ES.po | 19 ++++++++++++++++++- po/fr_FR.po | 19 ++++++++++++++++++- po/it_IT.po | 19 ++++++++++++++++++- po/ja_JP.po | 19 ++++++++++++++++++- po/ko_KR.po | 19 ++++++++++++++++++- po/pt_BR.po | 20 ++++++++++++++++++-- po/ru_RU.po | 19 ++++++++++++++++++- po/wok.pot | 19 ++++++++++++++++++- po/zh_CN.po | 20 ++++++++++++++++++-- po/zh_TW.po | 19 ++++++++++++++++++- ui/js/src/wok.list.js | 2 +- ui/pages/i18n.json.tmpl | 3 ++- 14 files changed, 219 insertions(+), 16 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 72ff6be..0fb869d 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -108,6 +108,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "FEHLERCODE" @@ -184,6 +198,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " diff --git a/po/en_US.po b/po/en_US.po index afee270..73d7056 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -104,6 +104,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -178,6 +192,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 0f7f244..8acb513 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -107,6 +107,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERROR" @@ -184,6 +198,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " diff --git a/po/fr_FR.po b/po/fr_FR.po index 9dd1e3c..9cc473a 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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/" @@ -110,6 +110,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "ERROR CODE" @@ -187,6 +201,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " diff --git a/po/it_IT.po b/po/it_IT.po index 756afa1..ef3729d 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -107,6 +107,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "CODICE DI ERRORE" @@ -184,6 +198,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " diff --git a/po/ja_JP.po b/po/ja_JP.po index 26267ea..dc8926f 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -106,6 +106,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "エラー・コード" @@ -182,6 +196,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" diff --git a/po/ko_KR.po b/po/ko_KR.po index 6d03ee6..84b4750 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -103,6 +103,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "오류 코드" @@ -179,6 +193,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." diff --git a/po/pt_BR.po b/po/pt_BR.po index 1f05ae5..a4ae451 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\n" "PO-Revision-Date: 2015-03-23 12:57+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -123,6 +123,20 @@ msgstr "Valor inválido '%(value)s'" msgid "Invalid data unit '%(unit)s'" msgstr "Unidade inválida '%(unit)s'" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERRO" @@ -200,6 +214,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." @@ -273,6 +290,5 @@ msgstr "" msgid "Request Type" msgstr "" - msgid "Search" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index bb20787..0e81ba4 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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/" @@ -104,6 +104,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "Код ошибки" @@ -180,6 +194,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." diff --git a/po/wok.pot b/po/wok.pot index 657c663..01b8a28 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -104,6 +104,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -178,6 +192,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index f1b1f0f..0a66eec 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -120,6 +120,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "错误码" @@ -195,6 +209,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "用户名或密码错误，请重新输入。" @@ -267,6 +284,5 @@ msgstr "" msgid "Request Type" msgstr "" - msgid "Search" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 28b4461..fd83384 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-05-11 08:43+0200\n" +"POT-Creation-Date: 2016-05-19 21:30+0530\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" @@ -103,6 +103,20 @@ msgstr "" msgid "Invalid data unit '%(unit)s'" msgstr "" +msgid "Request made on collection" +msgstr "" + +msgid "Request made on resource" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged in" +msgstr "" + +#, python-format +msgid "User '%(username)s' logged out" +msgstr "" + msgid "ERROR CODE" msgstr "錯誤碼" @@ -179,6 +193,9 @@ msgstr "" msgid "No results found!" msgstr "" +msgid "Actions" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" diff --git a/ui/js/src/wok.list.js b/ui/js/src/wok.list.js index 3b3055e..d17a3e7 100644 --- a/ui/js/src/wok.list.js +++ b/ui/js/src/wok.list.js @@ -43,7 +43,7 @@ wok.widget.List.prototype = (function() { '<div id="{id}-action-group" class="wok-list-action-button-container">', '<div class="dropdown mobile-action">', '<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">', - '<span class="mobile-action-label">Actions</span>', // TODO: Replace with i18n string + '<span class="mobile-action-label">'+i18n['WOKSETT0012M']+'</span>', '</button>', '<ul class="dropdown-menu" role="menu">', '</ul>', diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 8743d4d..ca7ae4c 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -48,5 +48,6 @@ "WOKSETT0008M": "$_("Filter")", "WOKSETT0009M": "$_("Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries")", "WOKSETT0010M": "$_("No results found!")", - "WOKSETT0011M": "$_("Loading...")" + "WOKSETT0011M": "$_("Loading...")", + "WOKSETT0012M": "$_("Actions")" } -- 2.1.0

2 1

[PATCH v2] [Wok 0/2] Issue #114: Help page for "Settings" tab
by sureshab＠linux.vnet.ibm.com 19 May '16

19 May '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> v2: Added "Code derived from" in copyright for the files copied from other plugins. Changed help text as per review comments Suresh Babu Angadi (2): Issue #114: Help page for "Settings" tab made changes in config to add '/help' uri made Makefile.am and configure.ac changes to add "help" directory added makefiles for "help" and "en_Us" directory Issue #114: Help page for "Settings" tab added dita-hepl.xsl, css file for help pages and help page for "Settings" tab configure.ac | 2 + src/wok/config.py.in | 6 ++ tests/test_config.py.in | 5 + ui/pages/Makefile.am | 2 +- ui/pages/help/Makefile.am | 37 +++++++ ui/pages/help/dita-help.xsl | 45 ++++++++ ui/pages/help/en_US/Makefile.am | 26 +++++ ui/pages/help/en_US/settings.dita | 42 ++++++++ ui/pages/help/wok.css | 209 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 373 insertions(+), 1 deletion(-) create mode 100644 ui/pages/help/Makefile.am create mode 100644 ui/pages/help/dita-help.xsl create mode 100644 ui/pages/help/en_US/Makefile.am create mode 100644 ui/pages/help/en_US/settings.dita create mode 100644 ui/pages/help/wok.css -- 2.1.0

2 3

Re: [Kimchi-devel] [PATCH] [Wok] Clear search when 'Reset to Default' button is clicked
by Aline Manera 19 May '16

19 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH v3] [Kimchi 0/3] Implementing 'Passthrough' virtual network type
by dhbarboza82＠gmail.com 19 May '16

19 May '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v3: - overhaul. Implemented as a new network type instead of a variation of the 'macvtap' type. - passthrough networks now accepts multiple interfaces like VEPA does v2: - used interface now being displayed in UI and backend - fixed an issue where the newly created network would appear as 'passthrough' in the UI until a page refresh This patch set adds a new network type called 'passthrough' to Kimchi. Docs, model, test and UI changes included. This is how it works in action using curl: $ curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X POST 'https://localhost:10001/plugins/kimchi/networks' -d'{"name":"danielhb_passthrough", "connection":"passthrough", "interfaces":["enP2p1s0","enP2p1s1f2"]}' Enter host password for user 'root': { "subnet":"", "connection":"passthrough", "state":"inactive", "name":"danielhb_passthrough", "autostart":true, "in_use":false, "dhcp":{ "start":"", "end":"" }, "interfaces":[ "enP2p1s0", "enP2p1s1f2" ], "vms":[], "persistent":true } Daniel Henrique Barboza (3): Passthrough macvtap network support: doc changes Passthrough macvtap network support: model and test changes Passthrough macvtap network support: UI changes API.json | 2 +- docs/API.md | 8 +++++++ i18n.py | 2 +- model/networks.py | 15 +++++++------ tests/test_networkxml.py | 42 ++++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.network.js | 1 + ui/js/src/kimchi.network_add_main.js | 23 +++++++++++++------- ui/pages/network-add.html.tmpl | 1 + xmlutils/network.py | 2 +- 9 files changed, 79 insertions(+), 17 deletions(-) -- 2.5.5

3 5

Re: [Kimchi-devel] [PATCH][Kimchi 1/2] Change memory hotplug to support more than 32GB
by Aline Manera 19 May '16

19 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi 1/2] Change memory hotplug to support more than 32GB
by Aline Manera 19 May '16

19 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi 1/2] Modify mockmodel to support memory devices
by Aline Manera 19 May '16

19 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Add support to Libvirt Events.
by Aline Manera 19 May '16

19 May '16

On 05/16/2016 11:32 PM, pvital(a)linux.vnet.ibm.com wrote: > 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 | 3 + > model/libvirtevents.py | 59 ++++++++++ > model/model.py | 5 +- > tests/test_model_libvirtevents.py | 219 ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 285 insertions(+), 1 deletion(-) > create mode 100644 model/libvirtevents.py > create mode 100644 tests/test_model_libvirtevents.py > > diff --git a/i18n.py b/i18n.py > index 2301e60..49b7f1c 100644 > --- a/i18n.py > +++ b/i18n.py > @@ -334,4 +334,7 @@ messages = { > "KCHCONN0001E": _("Unable to establish connection with libvirt. Please check your libvirt URI which is often defined in /etc/libvirt/libvirt.conf"), > "KCHCONN0002E": _("Libvirt service is not active. Please start the libvirt service in your host system."), > > + "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..ab5c17d > --- /dev/null > +++ b/model/libvirtevents.py > @@ -0,0 +1,59 @@ > +# > +# 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 > + > + > +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_model_libvirtevents.py b/tests/test_model_libvirtevents.py > new file mode 100644 > index 0000000..d7dc675 > --- /dev/null > +++ b/tests/test_model_libvirtevents.py > @@ -0,0 +1,219 @@ > +# -*- 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 json > +import libvirt > +import os > +import shutil > +import tempfile > +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' > +TMP_EVENT = None > +EVENT_ID = 0 > + > + > +def setUpModule(): > + global TMP_DIR, TMP_EVENT > + > + if not os.path.exists(TMP_DIR): > + os.makedirs(TMP_DIR) > + > + TMP_EVENT = tempfile.mktemp() > + > + 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 = {} > + I don't think we need the above block with the patch you sent to isolated the test cases. > + > +def tearDownModule(): > + global TMP_DIR, TMP_EVENT > + > + os.unlink(TMP_EVENT) > + 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 > + > + > +def _store_event(data): > + global TMP_EVENT > + with open(TMP_EVENT, "a") as file: > + file.write("%s\n" % data) > + > + > +def _get_event(id): > + global TMP_EVENT > + with open(TMP_EVENT, "r") as file: > + for event in [line.rstrip('\n') for line in file.readlines()]: > + fields = event.split('|') > + if fields[0] == id: > + return fields[1] > + > + > +class LibvirtEventsTests(unittest.TestCase): > + def setUp(self): > + self.tmp_store = tempfile.mktemp() > + > + 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")) > + > + data = {'domain': dom.name(), 'event': evStrings[event], > + 'event_detail': evDetails[event][detail]} > + _store_event('%s|%s' % (_get_next_event_id(), json.dumps(data))) > + > + def domain_event_reboot_cb(self, conn, dom, *args): > + """ > + Callback to handle Domain (VMs) events - VM Reboot. > + """ > + data = {'domain': dom.name(), 'event': 'Rebooted'} > + _store_event('%s|%s' % (_get_next_event_id(), json.dumps(data))) > + > + @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 > + conn = inst.conn.get() > + > + # Create a template and VM to test, and start lifecycle tests > + with RollbackContext() as rollback: > + # Register the most common Libvirt domain events to be handled. > + 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: > + ev_id = conn.domainEventRegisterAny(None, event, event_cb, > + None) > + rollback.prependDefer(conn.domainEventDeregisterAny, ev_id) > + > + # Create a template > + template_params = {'name': 'ttest', > + 'source_media': {'type': 'disk', > + 'path': UBUNTU_ISO}} > + > + inst.templates_create(template_params) > + rollback.prependDefer(inst.template_delete, 'ttest') > + > + # Create a VM (guest) > + vm_params = {'name': 'kimchi-vm1', > + 'template': '/plugins/kimchi/templates/ttest'} > + 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) > + # Check event of domain definition (addition) > + res = json.loads(_get_event(str(_get_event_id()))) > + self.assertEquals('kimchi-vm1', res['domain']) > + self.assertEquals('Defined', res['event']) > + self.assertEquals('Added', res['event_detail']) > + > + # Start the VM and check the event > + inst.vm_start('kimchi-vm1') > + time.sleep(5) > + res = json.loads(_get_event(str(_get_event_id()))) > + self.assertEquals('kimchi-vm1', res['domain']) > + self.assertEquals('Started', res['event']) > + self.assertEquals('Booted', res['event_detail']) > + > + # Suspend the VM and check the event > + inst.vm_suspend('kimchi-vm1') > + time.sleep(5) > + res = json.loads(_get_event(str(_get_event_id()))) > + self.assertEquals('kimchi-vm1', res['domain']) > + self.assertEquals('Suspended', res['event']) > + self.assertEquals('Paused', res['event_detail']) > + > + # Resume the VM and check the event > + inst.vm_resume('kimchi-vm1') > + time.sleep(5) > + res = json.loads(_get_event(str(_get_event_id()))) > + self.assertEquals('kimchi-vm1', res['domain']) > + self.assertEquals('Resumed', res['event']) > + self.assertEquals('Unpaused', res['event_detail']) > + > + # Reboot the VM and check the event > + inst.vm_reset('kimchi-vm1') > + time.sleep(5) > + res = json.loads(_get_event(str(_get_event_id()))) > + self.assertEquals('kimchi-vm1', res['domain']) > + self.assertEquals('Rebooted', res['event']) > + > + # PowerOff (hard stop) the VM and check the event > + inst.vm_poweroff('kimchi-vm1') > + time.sleep(5) > + res = json.loads(_get_event(str(_get_event_id()))) > + self.assertEquals('kimchi-vm1', res['domain']) > + self.assertEquals('Stopped', res['event']) > + self.assertEquals('Destroyed', res['event_detail']) > + > + # Delete the VM and check the event > + inst.vm_delete('kimchi-vm1') > + time.sleep(5) > + res = json.loads(_get_event(str(_get_event_id()))) > + self.assertEquals('kimchi-vm1', res['domain']) > + self.assertEquals('Undefined', res['event']) > + self.assertEquals('Removed', res['event_detail']) > -- > 2.5.5

1 0

[PATCH][Kimchi 2/2] Modify tests to support mem devs with different sizes
by Rodrigo Trujillo 19 May '16

19 May '16

This patch makes the changes and add tests to check new memory behavior. It should add (hotplug) a memory device with the additional memory device amount (instead of devs of 1GB as before). Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_model.py | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 737b39c..5f9f042 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -19,6 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import grp +import lxml.etree as ET import os import pwd import re @@ -34,7 +35,7 @@ from wok.config import config from wok.exception import InvalidOperation from wok.exception import InvalidParameter, NotFoundError, OperationFailed from wok.rollbackcontext import RollbackContext -from wok.utils import add_task, get_task_id +from wok.utils import add_task, convert_data_size, get_task_id from wok.xmlutils.utils import xpath_get_text from wok.plugins.gingerbase import netinfo @@ -58,7 +59,7 @@ NON_NUMA_XML = """ <domain type='kvm'> <name>non-numa-kimchi-test</name> <maxMemory slots='2' unit='GiB'>4</maxMemory> - <memory unit='GiB'>2</memory> + <memory unit='GiB'>1</memory> <os> <type arch='ppc64'>hvm</type> <boot dev='hd'/> @@ -805,7 +806,7 @@ class ModelTests(unittest.TestCase): config.set("authentication", "method", "pam") inst = model.Model(None, objstore_loc=self.tmp_store) orig_params = {'name': 'test', - 'memory': {'current': 1024, 'maxmemory': 3072}, + 'memory': {'current': 1024, 'maxmemory': 4096}, 'source_media': {'type': 'disk', 'path': UBUNTU_ISO}} inst.templates_create(orig_params) @@ -827,9 +828,28 @@ class ModelTests(unittest.TestCase): inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, 'kimchi-vm1') - params['memory']['maxmemory'] = 3072 + params['memory']['maxmemory'] = 4096 self.assertEquals(params['memory'], inst.vm_lookup('kimchi-vm1')['memory']) + + params['memory']['current'] = 4096 + del params['memory']['maxmemory'] + inst.vm_update('kimchi-vm1', params) + vm = inst.vm_lookup('kimchi-vm1') + self.assertEquals(4096, vm['memory']['current']) + + # Test memory devices + conn = inst.conn.get() + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(2, len(devs)) + totMemDevs = 0 + for size in devs: + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + self.assertEquals(3072, totMemDevs) else: self.assertRaises(InvalidOperation, inst.vm_update, 'kimchi-vm1', params) @@ -856,11 +876,25 @@ class ModelTests(unittest.TestCase): self.assertEquals(params['memory']['current'], inst.vm_lookup(vm)['memory']['current']) + # Test number and size of memory device added + root = ET.fromstring(conn.lookupByName(vm).XMLDesc()) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(1, len(devs)) + self.assertEquals(2048 << 10, int(devs[0].text)) + params = {'memory': {'current': 4096}} inst.vm_update(vm, params) self.assertEquals(params['memory']['current'], inst.vm_lookup(vm)['memory']['current']) + # Test number and size of memory device added + root = ET.fromstring(conn.lookupByName(vm).XMLDesc()) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(2, len(devs)) + self.assertEquals(1024 << 10, int(devs[1].text)) + self.assertEquals(3072 << 10, + int(devs[0].text) + int(devs[1].text)) + # Stop vm and test persistence inst.vm_poweroff(vm) self.assertEquals(params['memory']['current'], -- 2.1.0

1 1

[PATCH][Kimchi 1/2] Change memory hotplug to support more than 32GB
by Rodrigo Trujillo 19 May '16

19 May '16

This patch removes the restriction of only allow 32 memory devices of 1GB. Now, Kimchi is going to add an unique memory device with the amount of memory to be increased (per request). Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 3 +-- model/vms.py | 81 ++++++++++++++++++++++++++---------------------------------- 2 files changed, 36 insertions(+), 48 deletions(-) diff --git a/i18n.py b/i18n.py index 2301e60..9f40298 100644 --- a/i18n.py +++ b/i18n.py @@ -97,8 +97,7 @@ messages = { "KCHVM0041E": _("Memory assigned is higher then the maximum allowed in the host: %(maxmem)sMib."), "KCHVM0042E": _("Guest '%(name)s' does not support live memory update. Please, with the guest offline, set Maximum Memory with a value greater then Memory to enable this feature."), "KCHVM0043E": _("Only increase memory is allowed in active VMs"), - "KCHVM0044E": _("For live memory update, new memory value must be equal old memory value plus multiples of 1024 Mib"), - "KCHVM0045E": _("There are not enough free slots of 1024 Mib in the guest."), + "KCHVM0045E": _("There are not enough free slots to add a new memory device."), "KCHVM0046E": _("Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1."), "KCHVM0047E": _("Error attaching memory device. Details: %(error)s"), "KCHVM0048E": _("Cannot start %(name)s. Virtual machine is already running."), diff --git a/model/vms.py b/model/vms.py index ef53e38..ae77d3d 100644 --- a/model/vms.py +++ b/model/vms.py @@ -971,6 +971,15 @@ class VMModel(object): dom.isActive()): self._update_memory_live(dom, params) + def _get_mem_dev_total_size(self, xml): + 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') + return totMemDevs + def _update_memory_live(self, dom, params): # Check if host supports memory device if not self.caps.mem_hotplug_support: @@ -979,56 +988,42 @@ class VMModel(object): xml = dom.XMLDesc(0) max_mem = xpath_get_text(xml, './maxMemory') if max_mem == []: - raise OperationFailed('KCHVM0042E', {'name': dom.name()}) + raise InvalidOperation('KCHVM0042E', {'name': dom.name()}) - # Memory live update must be done in chunks of 1024 Mib or 1Gib new_mem = params['memory']['current'] old_mem = int(xpath_get_text(xml, XPATH_DOMAIN_MEMORY)[0]) >> 10 - if new_mem < old_mem: - raise OperationFailed('KCHVM0043E') - if (new_mem - old_mem) % 1024 != 0: - raise OperationFailed('KCHVM0044E') + memory = new_mem - old_mem + flags = libvirt.VIR_DOMAIN_MEM_CONFIG | libvirt.VIR_DOMAIN_MEM_LIVE - # make sure memory is alingned in 256MiB in PowerPC distro, _, _ = platform.linux_distribution() - if (distro == "IBM_PowerKVM" and new_mem % PPC_MEM_ALIGN != 0): - raise InvalidParameter('KCHVM0071E', - {'param': "Memory", - 'mem': str(new_mem), - 'alignment': str(PPC_MEM_ALIGN)}) - - # Check slot spaces: - total_slots = int(xpath_get_text(xml, './maxMemory/@slots')[0]) - needed_slots = (new_mem - old_mem) >> 10 - used_slots = len(xpath_get_text(xml, './devices/memory')) - if needed_slots > (total_slots - used_slots): - raise OperationFailed('KCHVM0045E') - elif needed_slots == 0: - # New memory value is same that current memory set + if distro == "IBM_PowerKVM": + # make sure memory is alingned in 256MiB in PowerPC + if (new_mem % PPC_MEM_ALIGN != 0): + raise InvalidParameter('KCHVM0071E', + {'param': "Memory", + 'mem': str(new_mem), + 'alignment': str(PPC_MEM_ALIGN)}) + # PPC suports only 32 memory slots + if len(xpath_get_text(xml, './devices/memory')) == 32: + raise InvalidOperation('KCHVM0045E') + + if memory == 0: + # Nothing to do return + if memory < 0: + raise InvalidOperation('KCHVM0043E') - distro, _, _ = platform.linux_distribution() - if distro == "IBM_PowerKVM" and needed_slots > 32: - raise OperationFailed('KCHVM0045E') - - # Finally, we are ok to hot add the memory devices + # Finally HotPlug operation ( memory > 0 ) try: - self._hot_add_memory_devices(dom, needed_slots) + # Create memory device xml + tmp_xml = E.memory(E.target(E.size(str(memory), + unit='MiB')), model='dimm') + if has_cpu_numa(dom): + tmp_xml.find('target').append(E.node('0')) + dom.attachDeviceFlags(etree.tostring(tmp_xml), flags) except Exception as e: raise OperationFailed("KCHVM0047E", {'error': e.message}) - def _hot_add_memory_devices(self, dom, amount): - # 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 - 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) - def _has_video(self, dom): dom = ElementTree.fromstring(dom.XMLDesc(0)) return dom.find('devices/video') is not None @@ -1217,13 +1212,7 @@ class VMModel(object): 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 = curr_mem + totMemDevs + memory = curr_mem + self._get_mem_dev_total_size(xml) # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

1 1

[PATCH][Kimchi 2/2] Make static and live update functions independent
by Rodrigo Trujillo 19 May '16

19 May '16

Static and Live update functions were always called and VM state was checked inside functions. This patch makes functions be called separately and remove unsed state checking. This separation is also important because during live updates the static funtion is called and the guest xml is updated. This might cause errors. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- i18n.py | 1 - model/vms.py | 47 +++++++++++++++++++++++++---------------------- tests/test_model.py | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/i18n.py b/i18n.py index 0340303..b4f758e 100644 --- a/i18n.py +++ b/i18n.py @@ -59,7 +59,6 @@ messages = { "KCHVM0001E": _("Virtual machine %(name)s already exists"), "KCHVM0002E": _("Virtual machine %(name)s does not exist"), - "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s is already in use or the virtual machine is not powered off."), "KCHVM0004E": _("Unable to retrieve screenshot for stopped virtual machine %(name)s"), "KCHVM0005E": _("Remote ISO image is not supported by this server."), "KCHVM0006E": _("Screenshot is not supported on virtual machine %(name)s"), diff --git a/model/vms.py b/model/vms.py index 48196dd..f5323ac 100644 --- a/model/vms.py +++ b/model/vms.py @@ -272,8 +272,20 @@ class VMModel(object): raise InvalidParameter('KCHVM0074E', {'params': ', '.join(ext_params)}) - self._live_vm_update(dom, params) - vm_name, dom = self._static_vm_update(name, dom, params) + # METADATA can be updated offline or online + self._vm_update_access_metadata(dom, params) + + # GRAPHICS can be updated offline or online + if 'graphics' in params: + dom = self._update_graphics(dom, params) + + # Live updates + if dom.isActive(): + self._live_vm_update(dom, params) + + vm_name = name + if (DOM_STATE_MAP[dom.info()[0]] == 'shutoff'): + vm_name, dom = self._static_vm_update(name, dom, params) return vm_name def clone(self, name): @@ -650,11 +662,11 @@ class VMModel(object): os_elem = ET.fromstring(os_xml) return (os_elem.attrib.get("version"), os_elem.attrib.get("distro")) - def _update_graphics(self, dom, xml, params): - root = objectify.fromstring(xml) + def _update_graphics(self, dom, params): + root = objectify.fromstring(dom.XMLDesc(0)) graphics = root.devices.find("graphics") if graphics is None: - return xml + return dom password = params['graphics'].get("passwd") if password is not None and len(password.strip()) == 0: @@ -676,13 +688,14 @@ class VMModel(object): valid_to = time.strftime('%Y-%m-%dT%H:%M:%S', expire_time) graphics.attrib['passwdValidTo'] = valid_to + conn = self.conn.get() if not dom.isActive(): - return ET.tostring(root, encoding="utf-8") + return conn.defineXML(ET.tostring(root, encoding="utf-8")) xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) dom.updateDeviceFlags(etree.tostring(graphics), libvirt.VIR_DOMAIN_AFFECT_LIVE) - return xml + return conn.defineXML(xml) def _backup_snapshots(self, snap, all_info): """ Append "snap" and the children of "snap" to the list "all_info". @@ -724,19 +737,14 @@ class VMModel(object): remove_metadata_node(dom, 'name') def _static_vm_update(self, vm_name, dom, params): - old_xml = new_xml = dom.XMLDesc(0) + old_xml = new_xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) params = copy.deepcopy(params) # Update name name = params.get('name') nonascii_name = None - state = DOM_STATE_MAP[dom.info()[0]] if name is not None: - if state != 'shutoff': - msg_args = {'name': vm_name, 'new_name': params['name']} - raise InvalidParameter("KCHVM0003E", msg_args) - params['name'], nonascii_name = get_ascii_nonascii_name(name) new_xml = xml_item_update(new_xml, XPATH_NAME, name, None) @@ -770,14 +778,10 @@ class VMModel(object): # topology is being undefined: remove it new_xml = xml_item_remove(new_xml, XPATH_TOPOLOGY) - # Updating memory if vm is offline - if (not dom.isActive() and 'memory' in params and - params['memory'] != {}): + # Updating memory + if ('memory' in params and params['memory'] != {}): new_xml = self._update_memory_config(new_xml, params, dom) - if 'graphics' in params: - new_xml = self._update_graphics(dom, new_xml, params) - snapshots_info = [] conn = self.conn.get() try: @@ -954,9 +958,8 @@ class VMModel(object): return cpu_info def _live_vm_update(self, dom, params): - self._vm_update_access_metadata(dom, params) - if (('memory' in params) and ('current' in params['memory']) and - dom.isActive()): + # Memory Hotplug/Unplug + if (('memory' in params) and ('current' in params['memory'])): self._update_memory_live(dom, params) def _get_mem_dev_total_size(self, xml): diff --git a/tests/test_model.py b/tests/test_model.py index 6b72bd0..f4a145f 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -957,7 +957,7 @@ class ModelTests(unittest.TestCase): # template disk format must be qcow2 because vmsnapshot # only supports this format orig_params = { - 'name': 'test', 'memory': {'current': 1024}, + 'name': 'test', 'memory': {'current': 1024, 'maxmemory': 2048}, 'cpu_info': {'vcpus': 1}, 'source_media': {'type': 'disk', 'path': UBUNTU_ISO}, 'disks': [{'size': 1, 'format': 'qcow2', 'pool': { -- 2.1.0

1 0

[PATCH][Kimchi 1/2] Modify mockmodel to support memory devices
by Rodrigo Trujillo 19 May '16

19 May '16

Mock model functions were doubling memory devices, causing errors in tests with latest code changes in memory hotplug. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- mockmodel.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index 38d08b5..4617668 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -28,7 +28,7 @@ from lxml.builder import E from wok.exception import NotFoundError, OperationFailed from wok.objectstore import ObjectStore -from wok.utils import add_task +from wok.utils import add_task, convert_data_size from wok.xmlutils.utils import xml_item_update from wok.plugins.kimchi import imageinfo @@ -172,9 +172,18 @@ class MockModel(Model): xml = MockModel._XMLDesc(dom, flags) root = objectify.fromstring(xml) + mem_devs = root.findall('./devices/memory') for dev_xml in MockModel._mock_vms.get(dom.name(), []): dev = objectify.fromstring(dev_xml) - root.devices.append(dev) + add = True + if dev.tag == 'memory': + for mem_dev in mem_devs: + if mem_dev.target.size == dev.target.size: + mem_devs.remove(mem_dev) + add = False + break + if add: + root.devices.append(dev) return ET.tostring(root, encoding="utf-8") @staticmethod @@ -186,6 +195,15 @@ class MockModel(Model): @staticmethod def attachDeviceFlags(dom, xml, flags=0): + myxml = objectify.fromstring(xml) + if myxml.tag == 'memory': + unit = myxml.target.size.get('unit') + myxml.target.size.set('unit', 'KiB') + myxml.target.size._setText(str(int(convert_data_size( + myxml.target.size.text, + unit, 'KiB')))) + xml = ET.tostring(myxml) + dom.setMaxMemory(int(dom.maxMemory() + myxml.target.size)) MockModel._mock_vms[dom.name()].append(xml) @staticmethod -- 2.1.0

1 0

[PATCH][Kimchi 2/2] Add test case to test new slots value implementation
by Rodrigo Trujillo 19 May '16

19 May '16

Adds new test case to check if a new VM has the right slot value. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_vmtemplate.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 97c69ec..74816ef 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -25,7 +25,7 @@ import uuid from wok.xmlutils.utils import xpath_get_text -from wok.plugins.kimchi.osinfo import get_template_default +from wok.plugins.kimchi.osinfo import get_template_default, MEM_DEV_SLOTS from wok.plugins.kimchi.vmtemplate import VMTemplate DISKS = [{'size': 10, 'format': 'raw', 'index': 0, 'pool': {'name': @@ -87,6 +87,15 @@ class VMTemplateTests(unittest.TestCase): self.assertEquals(graphics['type'], t.info['graphics']['type']) self.assertEquals('127.0.0.1', t.info['graphics']['listen']) + def test_mem_dev_slots(self): + vm_uuid = str(uuid.uuid4()).replace('-', '') + t = VMTemplate({'name': 'test-template', 'cdrom': self.iso, + 'memory': {'current': 2048, 'maxmemory': 3072}}) + xml = t.to_vm_xml('test-vm', vm_uuid) + expr = "/domain/maxMemory/@slots" + slots = str(MEM_DEV_SLOTS[os.uname()[4]]) + self.assertEquals(slots, xpath_get_text(xml, expr)[0]) + def test_to_xml(self): graphics = {'type': 'spice', 'listen': '127.0.0.1'} vm_uuid = str(uuid.uuid4()).replace('-', '') -- 2.1.0

1 0

[PATCH][Kimchi 1/2] Modify max memory slots default numbers
by Rodrigo Trujillo 19 May '16

19 May '16

This patch sets the number of available memory device slots to the number supported by each architecture in qemu/libvirt. Without the restriction of 1GB per device, now kimchi Will allow users to hotplug more devices than previous implementarion. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- model/vms.py | 23 ++--------------------- osinfo.py | 11 +++++++++++ vmtemplate.py | 20 +++++--------------- 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/model/vms.py b/model/vms.py index 0108381..48196dd 100644 --- a/model/vms.py +++ b/model/vms.py @@ -58,6 +58,7 @@ from wok.plugins.kimchi.model.utils import get_ascii_nonascii_name, get_vm_name from wok.plugins.kimchi.model.utils import get_metadata_node from wok.plugins.kimchi.model.utils import remove_metadata_node from wok.plugins.kimchi.model.utils import set_metadata_node +from wok.plugins.kimchi.osinfo import defaults 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 @@ -858,23 +859,6 @@ class VMModel(object): elif newMem == (oldMem << 10): newMem = newMem - memDevsAmount - def _get_slots(mem, maxMem): - slots = (maxMem - mem) >> 10 >> 10 - # Libvirt does not accepts slots <= 1 - if slots < 0: - raise InvalidParameter("KCHTMPL0031E", - {'mem': str(mem >> 10), - 'maxmem': str(maxMem >> 10)}) - elif slots == 0: - slots = 1 - - # max 32 slots on Power - distro, _, _ = platform.linux_distribution() - if distro == "IBM_PowerKVM" and slots > 32: - slots = 32 - return slots - # End of _get_slots - # There is an issue in Libvirt/Qemu, where Guest does not start if # memory and max memory are the same. So we decided to remove max # memory and only add it if user explicitly provides it, willing to @@ -886,7 +870,7 @@ class VMModel(object): max_mem_xml = E.maxMemory( str(newMaxMem), unit='Kib', - slots=str(_get_slots(newMem, newMaxMem))) + slots=str(defaults['mem_dev_slots'])) root.insert(0, max_mem_xml) elif (maxMemTag is None) and (newMem == newMaxMem): # Nothing to do @@ -894,7 +878,6 @@ class VMModel(object): elif (maxMemTag is not None) and (newMem != newMaxMem): # Just update value in max memory tag maxMemTag.text = str(newMaxMem) - maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) elif (maxMemTag is not None) and (newMem == newMaxMem): if self._get_mem_dev_total_size(ET.tostring(root)) == 0: # Remove the tag @@ -928,8 +911,6 @@ class VMModel(object): if (newMem == newMaxMem and (self._get_mem_dev_total_size(ET.tostring(root)) == 0)): root.remove(maxMemTag) - else: - maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) # Setting memory hard limit to max_memory + 1GiB memtune = root.find('memtune') diff --git a/osinfo.py b/osinfo.py index 7b80f29..d3909ad 100644 --- a/osinfo.py +++ b/osinfo.py @@ -34,6 +34,14 @@ SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), 'ppc64le': ('ppc64le')} +# Memory devices slot limits by architecture +MEM_DEV_SLOTS = {'ppc64': 32, + 'ppc64le': 32, + 'x86_64': 256, + 'i686': 256, + 'i386': 256} + + template_specs = {'x86': {'old': dict(disk_bus='ide', nic_model='e1000', sound_model='ich6'), 'modern': dict(disk_bus='virtio', @@ -175,6 +183,9 @@ def _get_tmpl_defaults(): # Update defaults values with graphics values defaults['graphics'] = default_config.pop('graphics') + # Setting default memory device slots + defaults['mem_dev_slots'] = MEM_DEV_SLOTS.get(os.uname()[4], 32) + return defaults diff --git a/vmtemplate.py b/vmtemplate.py index 5e38275..ef92914 100644 --- a/vmtemplate.py +++ b/vmtemplate.py @@ -18,7 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os -import platform import stat import time import urlparse @@ -369,25 +368,16 @@ class VMTemplate(object): # TODO: need modify this when boot order edition feature came upstream. params['boot_order'] = get_bootorder_xml() - # Setting maximum number of slots to avoid errors when hotplug memory - # Number of slots are the numbers of chunks of 1GB that fit inside - # the max_memory of the host minus memory assigned to the VM. It - # cannot have more than 32 slots in Power. + # Setting maximum number of memory slots + slots = str(self.info['mem_dev_slots']) + + # Rearrange memory parameters memory = self.info['memory'].get('current') maxmemory = self.info['memory'].get('maxmemory') - - slots = (maxmemory - memory) >> 10 - if slots < 0: + if maxmemory < memory: raise OperationFailed("KCHVM0041E", {'maxmem': str(maxmemory)}) - elif slots == 0: - slots = 1 - elif slots > 32: - distro, _, _ = platform.linux_distribution() - if distro == "IBM_PowerKVM": - slots = 32 - # Rearrange memory parameters params['memory'] = self.info['memory'].get('current') params['max_memory'] = "" # if there is not support to memory hotplug in Libvirt or qemu, we -- 2.1.0

1 0

[PATCH][Kimchi 2/2] Modify tests to support mem devs with different sizes
by Rodrigo Trujillo 19 May '16

19 May '16

This patch makes the changes and add tests to check new memory behavior. It should add (hotplug) a memory device with the additional memory device amount (instead of devs of 1GB as before). Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_model.py | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 87 insertions(+), 4 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 737b39c..6b72bd0 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -19,6 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import grp +import lxml.etree as ET import os import pwd import re @@ -34,7 +35,7 @@ from wok.config import config from wok.exception import InvalidOperation from wok.exception import InvalidParameter, NotFoundError, OperationFailed from wok.rollbackcontext import RollbackContext -from wok.utils import add_task, get_task_id +from wok.utils import add_task, convert_data_size, get_task_id from wok.xmlutils.utils import xpath_get_text from wok.plugins.gingerbase import netinfo @@ -58,7 +59,7 @@ NON_NUMA_XML = """ <domain type='kvm'> <name>non-numa-kimchi-test</name> <maxMemory slots='2' unit='GiB'>4</maxMemory> - <memory unit='GiB'>2</memory> + <memory unit='GiB'>1</memory> <os> <type arch='ppc64'>hvm</type> <boot dev='hd'/> @@ -805,7 +806,7 @@ class ModelTests(unittest.TestCase): config.set("authentication", "method", "pam") inst = model.Model(None, objstore_loc=self.tmp_store) orig_params = {'name': 'test', - 'memory': {'current': 1024, 'maxmemory': 3072}, + 'memory': {'current': 1024, 'maxmemory': 4096}, 'source_media': {'type': 'disk', 'path': UBUNTU_ISO}} inst.templates_create(orig_params) @@ -827,9 +828,77 @@ class ModelTests(unittest.TestCase): inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, 'kimchi-vm1') - params['memory']['maxmemory'] = 3072 + params['memory']['maxmemory'] = 4096 self.assertEquals(params['memory'], inst.vm_lookup('kimchi-vm1')['memory']) + + params['memory']['current'] = 4096 + del params['memory']['maxmemory'] + inst.vm_update('kimchi-vm1', params) + vm = inst.vm_lookup('kimchi-vm1') + self.assertEquals(4096, vm['memory']['current']) + + # Test memory devices + conn = inst.conn.get() + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(2, len(devs)) + totMemDevs = 0 + for size in devs: + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + self.assertEquals(3072, totMemDevs) + + inst.vm_poweroff('kimchi-vm1') + # Remove all devs: + params = {'memory': {'current': 1024}} + inst.vm_update('kimchi-vm1', params) + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory') + self.assertEquals(0, len(devs)) + + # Hotplug 1G DIMM , 512M , 256M and 256M + inst.vm_start('kimchi-vm1') + params = {'memory': {'current': 2048}} + inst.vm_update('kimchi-vm1', params) + params = {'memory': {'current': 2560}} + inst.vm_update('kimchi-vm1', params) + params = {'memory': {'current': 2816}} + inst.vm_update('kimchi-vm1', params) + params = {'memory': {'current': 3072}} + inst.vm_update('kimchi-vm1', params) + + vm = inst.vm_lookup('kimchi-vm1') + self.assertEquals(3072, vm['memory']['current']) + + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(4, len(devs)) + totMemDevs = 0 + for size in devs: + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + self.assertEquals(2048, totMemDevs) + + inst.vm_poweroff('kimchi-vm1') + # Remove 2x256M + 1x512M ... then sum 256M to virtual memory + params = {'memory': {'current': 2304}} + inst.vm_update('kimchi-vm1', params) + xml = conn.lookupByName('kimchi-vm1').XMLDesc() + root = ET.fromstring(xml) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(1, len(devs)) + totMemDevs = 0 + for size in devs: + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'MiB') + self.assertEquals(1024, totMemDevs) else: self.assertRaises(InvalidOperation, inst.vm_update, 'kimchi-vm1', params) @@ -856,11 +925,25 @@ class ModelTests(unittest.TestCase): self.assertEquals(params['memory']['current'], inst.vm_lookup(vm)['memory']['current']) + # Test number and size of memory device added + root = ET.fromstring(conn.lookupByName(vm).XMLDesc()) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(1, len(devs)) + self.assertEquals(2048 << 10, int(devs[0].text)) + params = {'memory': {'current': 4096}} inst.vm_update(vm, params) self.assertEquals(params['memory']['current'], inst.vm_lookup(vm)['memory']['current']) + # Test number and size of memory device added + root = ET.fromstring(conn.lookupByName(vm).XMLDesc()) + devs = root.findall('./devices/memory/target/size') + self.assertEquals(2, len(devs)) + self.assertEquals(1024 << 10, int(devs[1].text)) + self.assertEquals(3072 << 10, + int(devs[0].text) + int(devs[1].text)) + # Stop vm and test persistence inst.vm_poweroff(vm) self.assertEquals(params['memory']['current'], -- 2.1.0

1 0

[PATCH][Kimchi 1/2] Change memory hotplug to support more than 32GB
by Rodrigo Trujillo 19 May '16

19 May '16

This patch removes the restriction of only allow 32 memory devices of 1GB. Now, Kimchi is going to add an unique memory device with the amount of memory to be increased (per request). Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- i18n.py | 3 +- model/vms.py | 120 +++++++++++++++++++++++++++++------------------------------ 2 files changed, 59 insertions(+), 64 deletions(-) diff --git a/i18n.py b/i18n.py index cfbc81e..0340303 100644 --- a/i18n.py +++ b/i18n.py @@ -97,8 +97,7 @@ messages = { "KCHVM0041E": _("Memory assigned is higher then the maximum allowed in the host: %(maxmem)sMib."), "KCHVM0042E": _("Guest '%(name)s' does not support live memory update. Please, with the guest offline, set Maximum Memory with a value greater then Memory to enable this feature."), "KCHVM0043E": _("Only increase memory is allowed in active VMs"), - "KCHVM0044E": _("For live memory update, new memory value must be equal old memory value plus multiples of 1024 Mib"), - "KCHVM0045E": _("There are not enough free slots of 1024 Mib in the guest."), + "KCHVM0045E": _("There are not enough free slots to add a new memory device."), "KCHVM0046E": _("Host's libvirt or qemu version does not support memory devices and memory hotplug. Libvirt must be >= 1.2.14 and QEMU must be >= 2.1."), "KCHVM0047E": _("Error attaching memory device. Details: %(error)s"), "KCHVM0048E": _("Cannot start %(name)s. Virtual machine is already running."), diff --git a/model/vms.py b/model/vms.py index ef53e38..0108381 100644 --- a/model/vms.py +++ b/model/vms.py @@ -837,23 +837,26 @@ class VMModel(object): # Adjust memory devices to new memory, if necessary memDevs = root.findall('./devices/memory') + memDevsAmount = self._get_mem_dev_total_size(ET.tostring(root)) + if len(memDevs) != 0 and hasMem: - if newMem == newMaxMem: + if newMem > (oldMem << 10): + newMem = newMem - memDevsAmount + elif newMem < (oldMem << 10): + memDevs.reverse() + totRemoved = 0 for dev in memDevs: + size = dev.find('./target/size') + totRemoved += int(convert_data_size(size.text, + size.get('unit'), + 'KiB')) root.find('./devices').remove(dev) - elif newMem > (oldMem << 10): - newMem = newMem - (len(memDevs) * (1024 << 10)) - elif newMem < (oldMem << 10): - devsRemove = len(memDevs) - (oldMem - (newMem >> 10))/1024 - 1 - for dev in enumerate(memDevs): - if dev[0] > devsRemove: - root.find('./devices').remove(dev[1]) - newMem = \ - newMem - ( - len(root.findall('./devices/memory')) * 1024 << 10 - ) + if ((oldMem << 10) - totRemoved) <= newMem: + newMem = newMem - self._get_mem_dev_total_size( + ET.tostring(root)) + break elif newMem == (oldMem << 10): - newMem = newMem - ((len(memDevs) * 1024) << 10) + newMem = newMem - memDevsAmount def _get_slots(mem, maxMem): slots = (maxMem - mem) >> 10 >> 10 @@ -893,8 +896,11 @@ class VMModel(object): maxMemTag.text = str(newMaxMem) maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) elif (maxMemTag is not None) and (newMem == newMaxMem): - # Remove the tag - root.remove(maxMemTag) + if self._get_mem_dev_total_size(ET.tostring(root)) == 0: + # Remove the tag + root.remove(maxMemTag) + else: + maxMemTag.text = str(newMaxMem) # Update memory, if necessary if hasMem: @@ -919,7 +925,8 @@ class VMModel(object): memory.text = str(newMem) if (maxMemTag is not None) and (not hasMaxMem): - if newMem == newMaxMem: + if (newMem == newMaxMem and + (self._get_mem_dev_total_size(ET.tostring(root)) == 0)): root.remove(maxMemTag) else: maxMemTag.set('slots', str(_get_slots(newMem, newMaxMem))) @@ -971,6 +978,15 @@ class VMModel(object): dom.isActive()): self._update_memory_live(dom, params) + def _get_mem_dev_total_size(self, xml): + root = ET.fromstring(xml) + totMemDevs = 0 + for size in root.findall('./devices/memory/target/size'): + totMemDevs += convert_data_size(size.text, + size.get('unit'), + 'KiB') + return int(totMemDevs) + def _update_memory_live(self, dom, params): # Check if host supports memory device if not self.caps.mem_hotplug_support: @@ -979,56 +995,42 @@ class VMModel(object): xml = dom.XMLDesc(0) max_mem = xpath_get_text(xml, './maxMemory') if max_mem == []: - raise OperationFailed('KCHVM0042E', {'name': dom.name()}) + raise InvalidOperation('KCHVM0042E', {'name': dom.name()}) - # Memory live update must be done in chunks of 1024 Mib or 1Gib new_mem = params['memory']['current'] old_mem = int(xpath_get_text(xml, XPATH_DOMAIN_MEMORY)[0]) >> 10 - if new_mem < old_mem: - raise OperationFailed('KCHVM0043E') - if (new_mem - old_mem) % 1024 != 0: - raise OperationFailed('KCHVM0044E') + memory = new_mem - old_mem + flags = libvirt.VIR_DOMAIN_MEM_CONFIG | libvirt.VIR_DOMAIN_MEM_LIVE - # make sure memory is alingned in 256MiB in PowerPC distro, _, _ = platform.linux_distribution() - if (distro == "IBM_PowerKVM" and new_mem % PPC_MEM_ALIGN != 0): - raise InvalidParameter('KCHVM0071E', - {'param': "Memory", - 'mem': str(new_mem), - 'alignment': str(PPC_MEM_ALIGN)}) - - # Check slot spaces: - total_slots = int(xpath_get_text(xml, './maxMemory/@slots')[0]) - needed_slots = (new_mem - old_mem) >> 10 - used_slots = len(xpath_get_text(xml, './devices/memory')) - if needed_slots > (total_slots - used_slots): - raise OperationFailed('KCHVM0045E') - elif needed_slots == 0: - # New memory value is same that current memory set + if distro == "IBM_PowerKVM": + # make sure memory is alingned in 256MiB in PowerPC + if (new_mem % PPC_MEM_ALIGN != 0): + raise InvalidParameter('KCHVM0071E', + {'param': "Memory", + 'mem': str(new_mem), + 'alignment': str(PPC_MEM_ALIGN)}) + # PPC suports only 32 memory slots + if len(xpath_get_text(xml, './devices/memory')) == 32: + raise InvalidOperation('KCHVM0045E') + + if memory == 0: + # Nothing to do return + if memory < 0: + raise InvalidOperation('KCHVM0043E') - distro, _, _ = platform.linux_distribution() - if distro == "IBM_PowerKVM" and needed_slots > 32: - raise OperationFailed('KCHVM0045E') - - # Finally, we are ok to hot add the memory devices + # Finally HotPlug operation ( memory > 0 ) try: - self._hot_add_memory_devices(dom, needed_slots) + # Create memory device xml + tmp_xml = E.memory(E.target(E.size(str(memory), + unit='MiB')), model='dimm') + if has_cpu_numa(dom): + tmp_xml.find('target').append(E.node('0')) + dom.attachDeviceFlags(etree.tostring(tmp_xml), flags) except Exception as e: raise OperationFailed("KCHVM0047E", {'error': e.message}) - def _hot_add_memory_devices(self, dom, amount): - # 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 - 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) - def _has_video(self, dom): dom = ElementTree.fromstring(dom.XMLDesc(0)) return dom.find('devices/video') is not None @@ -1217,13 +1219,7 @@ class VMModel(object): 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 = curr_mem + totMemDevs + memory = curr_mem + (self._get_mem_dev_total_size(xml) >> 10) # assure there is no zombie process left for proc in self._serial_procs[:]: -- 2.1.0

1 0

Re: [Kimchi-devel] [PATCH] [Wok 2/2] fix for issue #114
by Suresh Babu Angadi 19 May '16

19 May '16

On 05/18/2016 07:47 AM, Aline Manera wrote: > > > On 05/16/2016 06:11 AM, sureshab(a)linux.vnet.ibm.com wrote: >> From: Suresh Babu Angadi <sureshab(a)in.ibm.com> >> >> added dita-hepl.xsl, css file for help pages and >> help page for "Settings" tab. >> >> Signed-off-by: Suresh Babu Angadi <sureshab(a)in.ibm.com> >> --- >> ui/pages/help/dita-help.xsl | 44 ++++++++ >> ui/pages/help/en_US/settings.dita | 43 ++++++++ >> ui/pages/help/wok.css | 208 >> ++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 295 insertions(+) >> create mode 100644 ui/pages/help/dita-help.xsl >> create mode 100644 ui/pages/help/en_US/settings.dita >> create mode 100644 ui/pages/help/wok.css >> >> diff --git a/ui/pages/help/dita-help.xsl b/ui/pages/help/dita-help.xsl >> new file mode 100644 >> index 0000000..fa75bf2 >> --- /dev/null >> +++ b/ui/pages/help/dita-help.xsl >> @@ -0,0 +1,44 @@ >> +<?xml version="1.0" encoding="UTF-8"?> >> + >> +<xsl:stylesheet version="1.0" >> + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >> + xmlns="http://www.w3.org/1999/xhtml"> >> + <xsl:output method="xml" indent="yes" encoding="UTF-8" /> >> + >> + <xsl:template match="/"> >> + <html> >> + <head> >> + <title><xsl:value-of select="/cshelp/title" /></title> >> + <meta charset="UTF-8" /> >> + <link rel="shortcut icon" >> href="../../images/logo.ico" /> >> + <link rel="stylesheet" type="text/css" >> href="../wok.css" /> >> + </head> >> + <body> >> + <xsl:apply-templates select="//cshelp" /> >> + </body> >> + </html> >> + </xsl:template> >> + >> + <xsl:template match="cshelp"> >> + <h1><xsl:value-of select="title" /></h1> >> + <p class="shortdesc"><xsl:value-of select="shortdesc" /></p> >> + <p class="csbody"><xsl:copy-of select="csbody/node()" /></p> >> + </xsl:template> >> +</xsl:stylesheet> >> diff --git a/ui/pages/help/en_US/settings.dita >> b/ui/pages/help/en_US/settings.dita >> new file mode 100644 >> index 0000000..e5b8465 >> --- /dev/null >> +++ b/ui/pages/help/en_US/settings.dita >> @@ -0,0 +1,43 @@ >> +<?xml version="1.0" encoding="UTF-8"?> >> + >> + >> +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN" >> + "..\dtd\cshelp.dtd"> >> +<?Pub Sty _display FontColor="red"?> >> +<?Pub Inc?> >> + >> +<cshelp id="settings" xml:lang="en-us"> >> +<title>Settings</title> >> +<csbody> >> +<dl><dlentry> >> +<dt>User Activity Log</dt> >> +<dd>This section is used to display activity log of all users.</dd> > > This section displays user log activity on Wok and its plugins. I would use - This section displays user activity log on Wok and its plugins. > >> +<dd>Supported operations on User activity log:</dd> >> +<dd>Advanced Search: Use this option to search logs of particular >> application(such as wok, ginger, gingerbase) or user, or with request >> type, or within particular time range.</dd> > > I'd replace the above 2 lines to something like: > > "To get any specific log result, please use the 'Advanced Search' > option. You can specify a particular application (such as wok, ginger, > gingerbase, kimchi), an user, request type or even date range." ok > > >> +<dd>Select "Reset to Default" option to clear the search criteria.</dd> >> +<dd>Download: Use this option to download user activity log.</dd> > > There is an extra space between 'activity' and 'log' thanks, will remove it. > >> +</dlentry> >> +</dl><?Pub Caret 2101?> >> +</csbody> >> +</cshelp> >> +<?Pub *0000003732?> >> diff --git a/ui/pages/help/wok.css b/ui/pages/help/wok.css >> new file mode 100644 >> index 0000000..e98eae8 >> --- /dev/null >> +++ b/ui/pages/help/wok.css >> @@ -0,0 +1,208 @@ >> +/* >> + * Project Wok >> + * >> + * Copyright IBM Corp, 2016 >> + * > > Is it a copy of a Kimchi/Ginger file ? If so, please add an > appropriated note to inform this code was derived from other project. okay > >> + * Licensed under the Apache License, Version 2.0 (the "License"); >> + * you may not use this file except in compliance with the License. >> + * You may obtain a copy of the License at >> + * >> + * http://www.apache.org/licenses/LICENSE-2.0 >> + * >> + * Unless required by applicable law or agreed to in writing, software >> + * distributed under the License is distributed on an "AS IS" BASIS, >> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or >> implied. >> + * See the License for the specific language governing permissions and >> + * limitations under the License. >> + */ >> +BODY { >> + background: #FFFFFF; >> + margin-bottom: 1em; >> + margin-left: .5em; >> +} >> + >> +bold { >> + font-weight: bold; >> +} >> + >> +boldItalic { >> + font-weight: bold; >> + font-style: italic; >> +} >> + >> +italic { >> + font-style: italic; >> +} >> + >> +underlined { >> + text-decoration: underline; >> +} >> + >> +uicontrol { >> + font-weight: bold; >> +} >> + >> +filepath { >> + font-family: monospace, monospace; >> +}.option { >> + font-family: monospace, monospace; >> +} >> + >> +cmdname { >> + font-weight: bold; >> + font-family: monospace, monospace; >> +} >> + >> +.defparmname { >> + font-weight: bold; >> + text-decoration: underline; >> + font-family: monospace, monospace; >> +} >> + >> +.kwd { >> + font-weight: bold; >> +} >> + >> +.defkwd { >> + font-weight: bold; >> + text-decoration: underline; >> +} >> + >> +var { >> + font-style : italic; >> +} >> + >> +strongwintitle { >> + font-weight : bold; >> +} >> + >> +parmname { >> + font-weight: bold; >> + font-family: monospace, monospace; >> + white-space: nowrap; >> +} >> + >> +code { >> + font-family: monospace, monospace; >> +} >> + >> +pre { >> + font-family: monospace, monospace; >> +} >> + >> +CITE { >> + font-style: italic; >> +} >> + >> +EM { >> + font-style: italic; >> +} >> + >> +STRONG { >> + font-weight: bold; >> +} >> + >> +VAR { >> + font-style: italic; >> +} >> + >> +dt { >> + font-weight: bold; >> +} >> + >> +/*********************************************************** >> + * Basic fonts >> + ***********************************************************/ >> +body, >> +td, >> +th, >> +caption { >> + font-family: Verdana, Arial, Helvetica, sans-serif; >> + font-size: 10pt; >> +} >> + >> +pre, code { >> + font-family: MS Courier New, Courier, monospace; >> +} >> + >> +h1, h2, h3 { >> + font-size: 12pt; >> + font-weight: bold; >> + color: #336699; >> +} >> + >> +h4 { >> + font-size: 10pt; >> + font-weight: bold; >> + color: #336699; >> +} >> + >> +/*********************************************************** >> + * Basic indents, padding, and margin >> + ***********************************************************/ >> +body { >> + color: black; >> + background-color: white; >> + margin: 0; >> + padding-top: 0.2em; >> + padding-left: 0.6em; >> + padding-right: 0.2em; >> + padding-bottom: 1em; >> +} >> + >> +h1, >> +h2, >> +h3, >> +h4, >> +h5, >> +h6 { >> + padding: 0; >> + margin-top: 1em; >> + margin-bottom: 0.75em; >> + margin-left: 0; >> + margin-right: 0; >> +} >> + >> +address, >> +dl, >> +li, >> +p { >> + padding: 0; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> + margin-left: 0; >> + margin-right: 0; >> + line-height: 125%; >> +} >> + >> +td dl { >> + margin-left: 2em; >> +} >> + >> +pre { >> + padding: 0; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> + margin-left: 2em; >> + margin-right: 0; >> +} >> + >> +ol, >> +ul { >> + padding: 0; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> + margin-left: 2.00em; >> + margin-right: 0; >> +} >> + >> +dd { >> + margin-left: 3.00em; >> + margin-top: 0.75em; >> + margin-bottom: 0.75em; >> +} >> + >> +dt { >> + margin-left: 1.00em; >> + margin-top: 0.75em; >> +} > -- Regards, Suresh Babu Angadi

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Isolate unit tests execution.
by Aline Manera 18 May '16

18 May '16

On 05/16/2016 11:16 PM, pvital(a)linux.vnet.ibm.com wrote: > From: Paulo Vital <pvital(a)linux.vnet.ibm.com> > > This patch isolates each unit test execution reducing the occurrences of tests > using data from previous unit tests and making results not reliable. > > In addition, it also simplifies the output of tests execution, printing the tags > PASSED and FAILED and the error/failed banners only when necessary. > > Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> > --- > tests/run_tests.sh.in | 53 +++++++++++++++++++++++++++++++++++++++------------ > 1 file changed, 41 insertions(+), 12 deletions(-) > > diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in > index 68dfa2e..d9c2661 100644 > --- a/tests/run_tests.sh.in > +++ b/tests/run_tests.sh.in > @@ -21,6 +21,10 @@ > HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ > PYTHON_VER=@PYTHON_VERSION@ > > +RED='\033[0;31m' > +GREEN='\033[0;32m' > +NC='\033[0m' # No Color > + > if [ "$1" = "-v" ]; then > OPTS="-v" > shift > @@ -40,19 +44,44 @@ else > CMD="python -m unittest" > fi > > -LIST=($ARGS) > -MODEL_LIST=() > -MOCK_LIST=() > -for ((i=0;i<${#LIST[@]};i++)); do > - > - if [[ ${LIST[$i]} == test_model* ]]; then > - MODEL_LIST+=(${LIST[$i]}) > +NUM_TESTS=0 > +TIME=0 > +declare -A FAILED_UT # dict to store failed unit tests and its OUTPUT_FILE > +for UT in $ARGS; do > + OUTPUT_FILE=$(mktemp) > + echo -n "***** Running unit test: $UT... " > + # ../../../../../ refers to the project root > + # ../../../../ refers to wok directory > + # ../../../ refers to plugins directory > + PYTHONPATH=../../../../../:../../../../:../../../ \ > + PYTHONWARNINGS="ignore:Unverified HTTPS request" \ > + $CMD $OPTS $UT &> $OUTPUT_FILE You can do: output=$($CMD $OPTS $UT) to get the test output. That way we don't need to create multiple temporary files. > + RES=$? > + if [ $RES -ne 0 ]; then > + # unit test has failed, so keep the OUTPUT_FILE and print the results > + echo -e "\t ${RED}FAILED${NC}" > + ERROR_LOG_BEGIN=$(grep -n "^\==*" $OUTPUT_FILE | head -n1 | cut -d":" -f1) > + ERROR_LOG_END=$(cat $OUTPUT_FILE | wc -l) > + tail -n $((${ERROR_LOG_END}-${ERROR_LOG_BEGIN}+1)) $OUTPUT_FILE > + FAILED_UT+=([$UT]=$OUTPUT_FILE) > + OUTPUT=$(grep "Ran" $OUTPUT_FILE) Following my suggestion to do not use temporary files, all the above block will be replace by: FAILED_UT+=$output > else > - MOCK_LIST+=(${LIST[$i]}) > + # unit test has passed, so print the results and delete the OUTPUT_FILE > + OUTPUT=$(grep "Ran" $OUTPUT_FILE) > + echo -e "\t ${GREEN}PASSED${NC} - $OUTPUT" > + rm -rf $OUTPUT_FILE > fi > + TES=$(echo $OUTPUT | cut -d" " -f2) > + NUM_TESTS=$(echo "$NUM_TESTS + $TES" | bc) > + TES=$(echo $OUTPUT | cut -d" " -f5) > + TIME=$(echo "$TIME + ${TES:0:-1}" | bc) > done > > -# ../../../../../ refers to the project root > -# ../../../../ refers to wok directory > -# ../../../ refers to plugins directory > -PYTHONPATH=../../../../../:../../../../:../../../ PYTHONWARNINGS="ignore:Unverified HTTPS request" $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} > +# Print summary results > +echo -e "======================================================================" > +echo -e "===================== Kimchi Unit Tests Summary ======================" > +echo -e "Ran $NUM_TESTS tests in $TIME seconds." > +for i in "${!FAILED_UT[@]}"; do > + FAIL_STATS=$(grep FAILED ${FAILED_UT[$i]} | cut -d" " -f2-4) > + echo -e "$i FAILED: $FAIL_STATS - log available at ${FAILED_UT[$i]}" > +done > -- > 2.5.5

1 0

[PATCH v2] [Kimchi 0/3] Adding passthrough forward mode to Macvtap
by dhbarboza82＠gmail.com 18 May '16

18 May '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - used interface now being displayed in UI and backend - fixed an issue where the newly created network would appear as 'passthrough' in the UI until a page refresh This patch set adds a new forward mode called 'passthrough' to the 'macvtap' network. Docs, model, test and UI changes included. Daniel Henrique Barboza (3): Adding 'passthrough' forward mode to Macvtap: doc changes Adding 'passthrough' forward mode to Macvtap: model and test changes Adding 'passthrough' forward mode to Macvtap: UI changes API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 1 + model/networks.py | 5 +++-- tests/test_networkxml.py | 14 ++++++++++++++ ui/js/src/kimchi.network.js | 1 + ui/js/src/kimchi.network_add_main.js | 12 ++++++++++-- ui/pages/network-add.html.tmpl | 3 ++- 8 files changed, 38 insertions(+), 5 deletions(-) -- 2.5.5

1 3

[PATCH] [Wok] Clear search when 'Reset to Default' button is clicked
by Lucio Correia 18 May '16

18 May '16

After a click in 'Reset to Default' button, the file downloaded through 'Download' button was still relative to the last 'Advanced search' done. This patch resets the search to default one (no search parameters). Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/js/wok.user-log.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index dd61748..e787ee6 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -229,6 +229,7 @@ wok.initUserLogWindow = function() { $("#"+wok.opts_user_log['gridId']).bootgrid("clear"); $("#"+wok.opts_user_log['gridId']).bootgrid("append", result); $("#reset-button").addClass('hidden'); + $("#download-button").data('search', ''); }, function(error) { wok.message.error(error.responseJSON.reason, '#message-container-area'); wok.hideBootgridLoading(wok.opts_user_log); -- 1.9.1

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi 0/3] Adding passthrough forward mode to Macvtap
by Daniel Henrique Barboza 18 May '16

18 May '16

On 05/18/2016 12:23 PM, Aline Manera wrote: > > Hi Daniel, > > The patch set looks good for me. > > I'd only recommend to you keep in touch with Socorro as it will impact > the edit virtual networks UI that she is working on. Just talked with her. She'll provide her inputs here when she is done rebasing/testing her work with the work I've done in this patch set. > > Please, send appropriate details on which is needed to edit a macvtap > passthrough mode if there is any difference from a macvtap bridge > network. There is no difference. The only difference is that the previous macvtap network provides a bridge to the guests, this new one will passthrough the network device to it. Usage is the same. > > Thanks, > Aline Manera > > On 05/17/2016 03:08 PM, dhbarboza82(a)gmail.com wrote: >> From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> >> >> This patch set adds a new forward mode called 'passthrough' to >> the 'macvtap' network. >> >> Docs, model, test and UI changes included. >> >> Daniel Henrique Barboza (3): >> Adding 'passthrough' forward mode to Macvtap: doc changes >> Adding 'passthrough' forward mode to Macvtap: model and test changes >> Adding 'passthrough' forward mode to Macvtap: UI changes >> >> API.json | 6 ++++++ >> docs/API.md | 1 + >> i18n.py | 1 + >> model/networks.py | 3 ++- >> tests/test_networkxml.py | 14 ++++++++++++++ >> ui/js/src/kimchi.network.js | 1 + >> ui/js/src/kimchi.network_add_main.js | 11 +++++++++-- >> ui/pages/network-add.html.tmpl | 3 ++- >> 8 files changed, 36 insertions(+), 4 deletions(-) >> >

2 4

[PATCH] [Kimchi 0/3] Adding passthrough forward mode to Macvtap
by dhbarboza82＠gmail.com 18 May '16

18 May '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set adds a new forward mode called 'passthrough' to the 'macvtap' network. Docs, model, test and UI changes included. Daniel Henrique Barboza (3): Adding 'passthrough' forward mode to Macvtap: doc changes Adding 'passthrough' forward mode to Macvtap: model and test changes Adding 'passthrough' forward mode to Macvtap: UI changes API.json | 6 ++++++ docs/API.md | 1 + i18n.py | 1 + model/networks.py | 3 ++- tests/test_networkxml.py | 14 ++++++++++++++ ui/js/src/kimchi.network.js | 1 + ui/js/src/kimchi.network_add_main.js | 11 +++++++++-- ui/pages/network-add.html.tmpl | 3 ++- 8 files changed, 36 insertions(+), 4 deletions(-) -- 2.5.5

3 5

[RFC] All plug-ins: accessibility changes in wok.message
by Daniel Henrique Barboza 18 May '16

18 May '16

Hi everyone, There is an accessibility issue in WoK concerning all messages launched by wok.message method: https://github.com/kimchi-project/wok/issues/79 Problem is that the message may disappear and the user might lose information. If we increase the timeout too much then the message becomes an annoyance. My proposal is to make *all* messages closeable by user interaction. This is made at this moment by the 'closeable' flag in the method: wok.message = function(msg, level, node, closeable, onclick) What I want to do is to get rid of the 'closeable' flag, together with the code that makes the message fade with timeout. After that, all WoK messages from all plug-ins would have the "X" icon to be closed manually. This will require changes in all plug-ins that instantiate any wok.message.* method. I am willing to do those changes too. Thoughts?

3 3

[PATCH][Kimchi] Update Fedora iso url to fix test
by Rodrigo Trujillo 18 May '16

18 May '16

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_rest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_rest.py b/tests/test_rest.py index b395bbb..0cbcc0e 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -811,8 +811,8 @@ class RestTests(unittest.TestCase): os.remove('/tmp/attach-volume') # Change path of storage cdrom - cdrom = u'http://mirrors.kernel.org/fedora/releases/21/Live/'\ - 'x86_64/Fedora-Live-KDE-x86_64-21-5.iso' + cdrom = u'http://mirrors.kernel.org/fedora/releases/23/Live/'\ + 'x86_64/Fedora-Live-KDE-x86_64-23-10.iso' req = json.dumps({'path': cdrom}) resp = self.request('/plugins/kimchi/vms/test-vm/storages/' + cd_dev, req, 'PUT') -- 2.1.0

2 1

Re: [Kimchi-devel] [PATCH][Kimchi] Update Fedora iso url to fix test
by Aline Manera 18 May '16

18 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi 0/2] Add translation support to user log
by Aline Manera 18 May '16

18 May '16

Applied. Thanks. Regards, Aline Manera

1 0

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

18 May '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> 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 | 29 +++++++++++++++++++++-------- model/libvirtconnection.py | 13 +++++++++++-- model/templates.py | 5 ++++- utils.py | 16 +++++++++++++++- 7 files changed, 58 insertions(+), 14 deletions(-) -- 2.5.5

4 7

Re: [Kimchi-devel] Fix issue on network update
by Aline Manera 18 May '16

18 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Wok 0/3] Add translation support to user log
by Aline Manera 18 May '16

18 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Wok 0/3] Introduced converters in line-chart and formatMeasurement
by pkulkark＠in.ibm.com 18 May '16

18 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> 1) Added converters in line-chart widget to format data in generic way. 2) Replaced locale formatting with converter. 3) Renamed wok.datetimeLocaleConverters to wok.localeConverters to have all the locale specific converters in one place. Pooja Kulkarni (3): Introduced converters in formatMeasurement Introduced converters in wok.line-chart widget Replaced wok.dateTimeLocaleConverters to wok.localeConverters ui/js/src/wok.line-chart.js | 19 +++++++++++++++++-- ui/js/src/wok.utils.js | 33 +++++++++++++++++++++++++-------- ui/js/wok.user-log.js | 2 +- 3 files changed, 43 insertions(+), 11 deletions(-) -- 2.1.0

2 4

[PATCH] [Wok 0/3] Introduced converters in line-chart and formatMeasurement
by pkulkark＠in.ibm.com 18 May '16

18 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> 1) Added converters in line-chart widget to format data in generic way. 2) Replaced locale formatting with converter. 3) Renamed wok.datetimeLocaleConverters to wok.localeConverters to have all the locale specific converters in one place. Pooja Kulkarni (3): Introduced converters in formatMeasurement Introduced converters in wok.line-chart widget Replaced wok.dateTimeLocaleConverters to wok.localeConverters ui/js/src/wok.line-chart.js | 19 +++++++++++++++++-- ui/js/src/wok.utils.js | 33 +++++++++++++++++++++++++-------- ui/js/wok.user-log.js | 2 +- 3 files changed, 43 insertions(+), 11 deletions(-) -- 2.1.0

2 4

[PATCH] [Wok 0/3] Introduced converters in line-chart and formatMeasurement
by pkulkark＠linux.vnet.ibm.com 18 May '16

18 May '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> 1) Added converters in line-chart widget to format data in generic way. 2) Replaced locale formatting with converter. 3) Renamed wok.datetimeLocaleConverters to wok.localeConverters to have all the locale specific converters in one place. Pooja Kulkarni (3): Introduced converters in formatMeasurement Introduced converters in wok.line-chart widget Replaced wok.dateTimeLocaleConverters to wok.localeConverters ui/js/src/wok.line-chart.js | 19 +++++++++++++++++-- ui/js/src/wok.utils.js | 33 +++++++++++++++++++++++++-------- ui/js/wok.user-log.js | 2 +- 3 files changed, 43 insertions(+), 11 deletions(-) -- 2.1.0

2 6

[PATCH] [Wok 0/2] fix for issue #114
by sureshab＠linux.vnet.ibm.com 18 May '16

18 May '16

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> Adding help page for "Settings" tab Suresh Babu Angadi (2): fix for issue #114 made changes in config, to add '/help' uri made Makefile.am and configure.ac changes to add "help" directory added dita-hepl.xsl, css file for help pages and help page for "Settings" tab. configure.ac | 2 + src/wok/config.py.in | 6 ++ tests/test_config.py.in | 5 + ui/pages/Makefile.am | 2 +- ui/pages/help/Makefile.am | 37 +++++++ ui/pages/help/dita-help.xsl | 44 ++++++++ ui/pages/help/en_US/Makefile.am | 26 +++++ ui/pages/help/en_US/settings.dita | 43 ++++++++ ui/pages/help/wok.css | 208 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 372 insertions(+), 1 deletion(-) create mode 100644 ui/pages/help/Makefile.am create mode 100644 ui/pages/help/dita-help.xsl create mode 100644 ui/pages/help/en_US/Makefile.am create mode 100644 ui/pages/help/en_US/settings.dita create mode 100644 ui/pages/help/wok.css -- 2.1.0

3 5

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

17 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 | 1 + model/libvirtevents.py | 25 +++++++++++++++++++++++++ model/model.py | 3 +++ 3 files changed, 29 insertions(+) Change in V2: - Rebase with latest master diff --git a/i18n.py b/i18n.py index 49b7f1c..c697d52 100644 --- a/i18n.py +++ b/i18n.py @@ -337,4 +337,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 ab5c17d..00e9433 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -22,6 +22,9 @@ 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 class LibvirtEvents(object): @@ -57,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

1 0

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

17 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 | 3 + model/libvirtevents.py | 59 ++++++++++ model/model.py | 5 +- tests/test_model_libvirtevents.py | 219 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 model/libvirtevents.py create mode 100644 tests/test_model_libvirtevents.py diff --git a/i18n.py b/i18n.py index 2301e60..49b7f1c 100644 --- a/i18n.py +++ b/i18n.py @@ -334,4 +334,7 @@ messages = { "KCHCONN0001E": _("Unable to establish connection with libvirt. Please check your libvirt URI which is often defined in /etc/libvirt/libvirt.conf"), "KCHCONN0002E": _("Libvirt service is not active. Please start the libvirt service in your host system."), + "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..ab5c17d --- /dev/null +++ b/model/libvirtevents.py @@ -0,0 +1,59 @@ +# +# 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 + + +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_model_libvirtevents.py b/tests/test_model_libvirtevents.py new file mode 100644 index 0000000..d7dc675 --- /dev/null +++ b/tests/test_model_libvirtevents.py @@ -0,0 +1,219 @@ +# -*- 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 json +import libvirt +import os +import shutil +import tempfile +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' +TMP_EVENT = None +EVENT_ID = 0 + + +def setUpModule(): + global TMP_DIR, TMP_EVENT + + if not os.path.exists(TMP_DIR): + os.makedirs(TMP_DIR) + + TMP_EVENT = tempfile.mktemp() + + 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(): + global TMP_DIR, TMP_EVENT + + os.unlink(TMP_EVENT) + 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 + + +def _store_event(data): + global TMP_EVENT + with open(TMP_EVENT, "a") as file: + file.write("%s\n" % data) + + +def _get_event(id): + global TMP_EVENT + with open(TMP_EVENT, "r") as file: + for event in [line.rstrip('\n') for line in file.readlines()]: + fields = event.split('|') + if fields[0] == id: + return fields[1] + + +class LibvirtEventsTests(unittest.TestCase): + def setUp(self): + self.tmp_store = tempfile.mktemp() + + 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")) + + data = {'domain': dom.name(), 'event': evStrings[event], + 'event_detail': evDetails[event][detail]} + _store_event('%s|%s' % (_get_next_event_id(), json.dumps(data))) + + def domain_event_reboot_cb(self, conn, dom, *args): + """ + Callback to handle Domain (VMs) events - VM Reboot. + """ + data = {'domain': dom.name(), 'event': 'Rebooted'} + _store_event('%s|%s' % (_get_next_event_id(), json.dumps(data))) + + @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 + conn = inst.conn.get() + + # Create a template and VM to test, and start lifecycle tests + with RollbackContext() as rollback: + # Register the most common Libvirt domain events to be handled. + 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: + ev_id = conn.domainEventRegisterAny(None, event, event_cb, + None) + rollback.prependDefer(conn.domainEventDeregisterAny, ev_id) + + # Create a template + template_params = {'name': 'ttest', + 'source_media': {'type': 'disk', + 'path': UBUNTU_ISO}} + + inst.templates_create(template_params) + rollback.prependDefer(inst.template_delete, 'ttest') + + # Create a VM (guest) + vm_params = {'name': 'kimchi-vm1', + 'template': '/plugins/kimchi/templates/ttest'} + 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) + # Check event of domain definition (addition) + res = json.loads(_get_event(str(_get_event_id()))) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Defined', res['event']) + self.assertEquals('Added', res['event_detail']) + + # Start the VM and check the event + inst.vm_start('kimchi-vm1') + time.sleep(5) + res = json.loads(_get_event(str(_get_event_id()))) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Started', res['event']) + self.assertEquals('Booted', res['event_detail']) + + # Suspend the VM and check the event + inst.vm_suspend('kimchi-vm1') + time.sleep(5) + res = json.loads(_get_event(str(_get_event_id()))) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Suspended', res['event']) + self.assertEquals('Paused', res['event_detail']) + + # Resume the VM and check the event + inst.vm_resume('kimchi-vm1') + time.sleep(5) + res = json.loads(_get_event(str(_get_event_id()))) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Resumed', res['event']) + self.assertEquals('Unpaused', res['event_detail']) + + # Reboot the VM and check the event + inst.vm_reset('kimchi-vm1') + time.sleep(5) + res = json.loads(_get_event(str(_get_event_id()))) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Rebooted', res['event']) + + # PowerOff (hard stop) the VM and check the event + inst.vm_poweroff('kimchi-vm1') + time.sleep(5) + res = json.loads(_get_event(str(_get_event_id()))) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Stopped', res['event']) + self.assertEquals('Destroyed', res['event_detail']) + + # Delete the VM and check the event + inst.vm_delete('kimchi-vm1') + time.sleep(5) + res = json.loads(_get_event(str(_get_event_id()))) + self.assertEquals('kimchi-vm1', res['domain']) + self.assertEquals('Undefined', res['event']) + self.assertEquals('Removed', res['event_detail']) -- 2.5.5

2 1

[PATCH] [Kimchi] Isolate unit tests execution.
by pvital＠linux.vnet.ibm.com 17 May '16

17 May '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch isolates each unit test execution reducing the occurrences of tests using data from previous unit tests and making results not reliable. In addition, it also simplifies the output of tests execution, printing the tags PASSED and FAILED and the error/failed banners only when necessary. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- tests/run_tests.sh.in | 53 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in index 68dfa2e..d9c2661 100644 --- a/tests/run_tests.sh.in +++ b/tests/run_tests.sh.in @@ -21,6 +21,10 @@ HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ PYTHON_VER=@PYTHON_VERSION@ +RED='\033[0;31m' +GREEN='\033[0;32m' +NC='\033[0m' # No Color + if [ "$1" = "-v" ]; then OPTS="-v" shift @@ -40,19 +44,44 @@ else CMD="python -m unittest" fi -LIST=($ARGS) -MODEL_LIST=() -MOCK_LIST=() -for ((i=0;i<${#LIST[@]};i++)); do - - if [[ ${LIST[$i]} == test_model* ]]; then - MODEL_LIST+=(${LIST[$i]}) +NUM_TESTS=0 +TIME=0 +declare -A FAILED_UT # dict to store failed unit tests and its OUTPUT_FILE +for UT in $ARGS; do + OUTPUT_FILE=$(mktemp) + echo -n "***** Running unit test: $UT... " + # ../../../../../ refers to the project root + # ../../../../ refers to wok directory + # ../../../ refers to plugins directory + PYTHONPATH=../../../../../:../../../../:../../../ \ + PYTHONWARNINGS="ignore:Unverified HTTPS request" \ + $CMD $OPTS $UT &> $OUTPUT_FILE + RES=$? + if [ $RES -ne 0 ]; then + # unit test has failed, so keep the OUTPUT_FILE and print the results + echo -e "\t ${RED}FAILED${NC}" + ERROR_LOG_BEGIN=$(grep -n "^\==*" $OUTPUT_FILE | head -n1 | cut -d":" -f1) + ERROR_LOG_END=$(cat $OUTPUT_FILE | wc -l) + tail -n $((${ERROR_LOG_END}-${ERROR_LOG_BEGIN}+1)) $OUTPUT_FILE + FAILED_UT+=([$UT]=$OUTPUT_FILE) + OUTPUT=$(grep "Ran" $OUTPUT_FILE) else - MOCK_LIST+=(${LIST[$i]}) + # unit test has passed, so print the results and delete the OUTPUT_FILE + OUTPUT=$(grep "Ran" $OUTPUT_FILE) + echo -e "\t ${GREEN}PASSED${NC} - $OUTPUT" + rm -rf $OUTPUT_FILE fi + TES=$(echo $OUTPUT | cut -d" " -f2) + NUM_TESTS=$(echo "$NUM_TESTS + $TES" | bc) + TES=$(echo $OUTPUT | cut -d" " -f5) + TIME=$(echo "$TIME + ${TES:0:-1}" | bc) done -# ../../../../../ refers to the project root -# ../../../../ refers to wok directory -# ../../../ refers to plugins directory -PYTHONPATH=../../../../../:../../../../:../../../ PYTHONWARNINGS="ignore:Unverified HTTPS request" $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} +# Print summary results +echo -e "======================================================================" +echo -e "===================== Kimchi Unit Tests Summary ======================" +echo -e "Ran $NUM_TESTS tests in $TIME seconds." +for i in "${!FAILED_UT[@]}"; do + FAIL_STATS=$(grep FAILED ${FAILED_UT[$i]} | cut -d" " -f2-4) + echo -e "$i FAILED: $FAIL_STATS - log available at ${FAILED_UT[$i]}" +done -- 2.5.5

1 0

[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