November 2015 - Kimchi-devel - oVirt List Archives

[PATCH V2] Create new storage volume when attaching disk to a guest.
by pvital＠linux.vnet.ibm.com 29 Jan '16

29 Jan '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Changes in V2: * Updated test cases * Modified dictionary return of parameters V1: Add back-end support to create new storage volume (new virtual disk) when attaching disk to a guest created before. There are three essential parameters to create the new volume: * vol: Storage volume name of disk image, that should be 'new_vol'. * capacity: The total space which can be used to store new volumes. The unit is bytes. * format: The format of the defined Storage Volume. Only used when creating a storage volume with 'capacity'. To test this patch: $ curl -k -u test -H "Content-Type: application/json" -H "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms/kimchi-vm-new/storages' -X POST -d '{ "vol": "new_vol", "type": "disk", "pool": "default", "format": "qcow2", "capacity": 1024 }' Enter host password for user 'test': { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683-e89015b3ba11 -1.img", "type":"disk", "dev":"vdb", "format":"qcow2" } $ curl -k -u test -H "Content-Type: application/json" -H "Accept: application/json" 'https://localhost:8001/plugins/kimchi/vms/kimchi-vm-new/storages' -X GET Enter host password for user 'test': [ { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683 -e89015b3ba11-0.img", "type":"disk", "dev":"vda", "format":"qcow2" }, { "bus":"virtio", "path":"/var/lib/libvirt/images/2477bfd8-a9e2-4887-a683 -e89015b3ba11-1.img", "type":"disk", "dev":"vdb", "format":"qcow2" }, { "bus":"ide", "path":"/var/lib/kimchi/tests/ubuntu14.04.iso", "type":"cdrom", "dev":"hdc", "format":"raw" } ] Paulo Vital (1): Create new storage volume when attaching disk to a guest. src/wok/plugins/kimchi/API.json | 12 ++++++++++++ src/wok/plugins/kimchi/docs/API.md | 6 +++++- src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/vmstorages.py | 28 +++++++++++++++++++++++++++- src/wok/plugins/kimchi/tests/test_model.py | 25 +++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 2 deletions(-) -- 2.4.3

5 7

Re: [Kimchi-devel] Guest disk: Allocate storage volume when attaching disk to vm
by Aline Manera 12 Jan '16

12 Jan '16

Adding Samuel and Andre to this discussion and also forward to Kimchi ML. On 16/11/2015 14:21, Aline Manera wrote: > > Hi Socorro, > > On 12/11/2015 21:20, Socorro Stoppler wrote: >> Hi Aline, >> >> I chatted w/Paulo about the UI portion of this. He stated that the >> user has the option to select to add a new volume (in which the the >> UI must execute two requests: one to create a volume, and other to >> attach the new volume to the guest being edited). So in this screen >> (I know it's the old UI but this shows better than current new UI :)): >> >> >> >> What do you think of 3. being radio buttons? - > > I think 2 should be that radio buttons. > > So: > > 1. Device type > <disk> > > 2. ( ) Create a new disk image > > ( ) Select existing disk image > > 3. Storage pool > <pools> > > 4. Capacity or Volume (depends on selection on 2.) > > Below is how virt-manage does it. > > > >> <New Volume> - >> Volume: Storage volume name of 'new_vol' --- we prob do not >> need to show this in the UI, right? >> Capacity: in bytes >> Format: qcow2 -- is this the only option we want to provide? >> <Create Button> >> >> <Existing Volume> - which consists of current combobox above >> >> Also, if user selects to do the new volume, then created it, but >> decided that they didn't want to attach it, is that ok? Not sure of >> the different scenarios we have >> or if I'm totally missing the intent here. >> >> Let me know if you had envisioned something else for this UI. >> >> Thanks >> -Socorro >> >> >

3 4

[PATCH 1/1] Library files for bootgrid plugin
by atreyee＠linux.vnet.ibm.com 11 Dec '15

11 Dec '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> Bootgrid is grid implemention for bootstrap and jquery with sorting, multiselect,searching featuers. --- configure.ac | 4 ++++ ui/libs/Makefile.am | 2 +- ui/libs/jquery-bootgrid/LICENSE | 17 +++++++++++++++++ ui/libs/jquery-bootgrid/Makefile.am | 20 ++++++++++++++++++++ ui/libs/jquery-bootgrid/dist/Makefile.am | 20 ++++++++++++++++++++ ui/libs/jquery-bootgrid/dist/css/Makefile.am | 22 ++++++++++++++++++++++ .../dist/css/jquery.bootgrid.min.css | 5 +++++ ui/libs/jquery-bootgrid/dist/js/Makefile.am | 22 ++++++++++++++++++++++ .../jquery-bootgrid/dist/js/jquery.bootgrid.min.js | 6 ++++++ ui/pages/wok-ui.html.tmpl | 2 ++ 10 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 ui/libs/jquery-bootgrid/LICENSE create mode 100644 ui/libs/jquery-bootgrid/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/css/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/css/jquery.bootgrid.min.css create mode 100644 ui/libs/jquery-bootgrid/dist/js/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js diff --git a/configure.ac b/configure.ac index dd3955e..f88fe04 100644 --- a/configure.ac +++ b/configure.ac @@ -125,6 +125,10 @@ AC_CONFIG_FILES([ ui/libs/bootstrap-select/dist/Makefile ui/libs/bootstrap-select/dist/js/Makefile ui/libs/bootstrap-select/dist/css/Makefile + ui/libs/jquery-bootgrid/Makefile + ui/libs/jquery-bootgrid/dist/Makefile + ui/libs/jquery-bootgrid/dist/js/Makefile + ui/libs/jquery-bootgrid/dist/css/Makefile ui/libs/es5-shim/Makefile ui/libs/jquery/Makefile ui/libs/jquery-i18n/Makefile diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am index d746df4..085e1f0 100644 --- a/ui/libs/Makefile.am +++ b/ui/libs/Makefile.am @@ -17,4 +17,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = bootstrap jquery jquery-ui bootstrap-select es5-shim jquery-i18n +SUBDIRS = bootstrap jquery jquery-ui bootstrap-select jquery-bootgrid es5-shim jquery-i18n diff --git a/ui/libs/jquery-bootgrid/LICENSE b/ui/libs/jquery-bootgrid/LICENSE new file mode 100644 index 0000000..0e3a7e1 --- /dev/null +++ b/ui/libs/jquery-bootgrid/LICENSE @@ -0,0 +1,17 @@ +The MIT License (MIT) +Copyright (c) 2014-2015 Rafael J. Staib +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/ui/libs/jquery-bootgrid/Makefile.am b/ui/libs/jquery-bootgrid/Makefile.am new file mode 100644 index 0000000..858b32a --- /dev/null +++ b/ui/libs/jquery-bootgrid/Makefile.am @@ -0,0 +1,20 @@ +# +# Project Wok +# +# Copyright IBM, Corp. 2015 +# +# Code derived from Project Kimchi +# +# 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. + +SUBDIRS = dist diff --git a/ui/libs/jquery-bootgrid/dist/Makefile.am b/ui/libs/jquery-bootgrid/dist/Makefile.am new file mode 100644 index 0000000..bb579e0 --- /dev/null +++ b/ui/libs/jquery-bootgrid/dist/Makefile.am @@ -0,0 +1,20 @@ +# +# Project Wok +# +# Copyright IBM, Corp. 2015 +# +# Code derived from Project Kimchi +# +# 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. + +SUBDIRS = css js diff --git a/ui/libs/jquery-bootgrid/dist/css/Makefile.am b/ui/libs/jquery-bootgrid/dist/css/Makefile.am new file mode 100644 index 0000000..d5ed1c2 --- /dev/null +++ b/ui/libs/jquery-bootgrid/dist/css/Makefile.am @@ -0,0 +1,22 @@ +# +# Project Wok +# +# Copyright IBM, Corp. 2015 +# +# Code derived from Project Kimchi +# +# 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. + +jquerybootgridcssdir = $(datadir)/wok/ui/libs/jquery-bootgrid/dist/css + +dist_jquerybootgridcss_DATA = $(wildcard *.css) $(NULL) diff --git a/ui/libs/jquery-bootgrid/dist/css/jquery.bootgrid.min.css b/ui/libs/jquery-bootgrid/dist/css/jquery.bootgrid.min.css new file mode 100644 index 0000000..4782a15 --- /dev/null +++ b/ui/libs/jquery-bootgrid/dist/css/jquery.bootgrid.min.css @@ -0,0 +1,5 @@ +/*! + * jQuery Bootgrid v1.3.1 - 09/11/2015 + * Copyright (c) 2014-2015 Rafael Staib (http://www.jquery-bootgrid.com) + * Licensed under MIT http://www.opensource.org/licenses/MIT + */.bootgrid-footer,.bootgrid-header{margin:15px 0}.bootgrid-footer a,.bootgrid-header a{outline:0}.bootgrid-footer .search,.bootgrid-header .search{display:inline-block;margin:0 20px 0 0;vertical-align:middle;width:180px}.bootgrid-footer .search .glyphicon,.bootgrid-header .search .glyphicon{top:0}.bootgrid-footer .search .fa,.bootgrid-header .search .fa{display:table-cell}.bootgrid-footer .search .search-field::-ms-clear,.bootgrid-footer .search.search-field::-ms-clear,.bootgrid-header .search .search-field::-ms-clear,.bootgrid-header .search.search-field::-ms-clear{display:none}.bootgrid-footer .pagination,.bootgrid-header .pagination{margin:0!important}.bootgrid-footer .infoBar,.bootgrid-header .actionBar{text-align:right}.bootgrid-footer .infoBar .btn-group>.btn-group .dropdown-menu,.bootgrid-header .actionBar .btn-group>.btn-group .dropdown-menu{text-align:left}.bootgrid-footer .infoBar .btn-group>.btn-group .dropdown-menu .dropdown-item,.bootgrid-header .actionBar .b! tn-group>.btn-group .dropdown-menu .dropdown-item{cursor:pointer;display:block;margin:0;padding:3px 20px;white-space:nowrap}.bootgrid-footer .infoBar .btn-group>.btn-group .dropdown-menu .dropdown-item:focus,.bootgrid-footer .infoBar .btn-group>.btn-group .dropdown-menu .dropdown-item:hover,.bootgrid-header .actionBar .btn-group>.btn-group .dropdown-menu .dropdown-item:focus,.bootgrid-header .actionBar .btn-group>.btn-group .dropdown-menu .dropdown-item:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.bootgrid-footer .infoBar .btn-group>.btn-group .dropdown-menu .dropdown-item .dropdown-item-checkbox,.bootgrid-footer .infoBar .btn-group>.btn-group .dropdown-menu .dropdown-item.dropdown-item-checkbox,.bootgrid-header .actionBar .btn-group>.btn-group .dropdown-menu .dropdown-item .dropdown-item-checkbox,.bootgrid-header .actionBar .btn-group>.btn-group .dropdown-menu .dropdown-item.dropdown-item-checkbox{margin:0 2px 4px 0;vertical-align:middle}.bootgrid-foo! ter .infoBar .btn-group>.btn-group .dropdown-menu .dropdown-item.disabled,.bootgrid-header .actionBar .btn-group>.btn-group .dropdown-menu .dropdown-item.disabled{cursor:not-allowed}.bootgrid-table{table-layout:fixed}.bootgrid-table a{outline:0}.bootgrid-table th>.column-header-anchor{color:#333;cursor:not-allowed;display:block;position:relative;text-decoration:none}.bootgrid-table th>.column-header-anchor.sortable{cursor:pointer}.bootgrid-table th>.column-header-anchor>.text{display:block;margin:0 16px 0 0;overflow:hidden;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}.bootgrid-table th>.column-header-anchor>.icon{display:block;position:absolute;right:0;top:2px}.bootgrid-table th:active,.bootgrid-table th:hover{background:#fafafa}.bootgrid-table td{overflow:hidden;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}.bootgrid-table td.loading,.bootgrid-table td.no-results{background:#! fff;text-align:center}.bootgrid-table td.select-cell,.bootgrid-table th! .select-cell{text-align:center;width:30px}.bootgrid-table td.select-cell .select-box,.bootgrid-table th.select-cell .select-box{margin:0;outline:0}.table-responsive .bootgrid-table{table-layout:inherit!important}.table-responsive .bootgrid-table td,.table-responsive .bootgrid-table th>.column-header-anchor>.text{overflow:inherit!important;-ms-text-overflow:inherit!important;-o-text-overflow:inherit!important;text-overflow:inherit!important;white-space:inherit!important} \ No newline at end of file diff --git a/ui/libs/jquery-bootgrid/dist/js/Makefile.am b/ui/libs/jquery-bootgrid/dist/js/Makefile.am new file mode 100644 index 0000000..86ad534 --- /dev/null +++ b/ui/libs/jquery-bootgrid/dist/js/Makefile.am @@ -0,0 +1,22 @@ +# +# Project Wok +# +# Copyright IBM, Corp. 2015 +# +# Code derived from Project Kimchi +# +# 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. + +jquerybootgridjsdir = $(datadir)/wok/ui/libs/jquery-bootgrid/dist/js + +dist_jquerybootgridjs_DATA = $(wildcard *.js) $(NULL) diff --git a/ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js b/ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js new file mode 100644 index 0000000..9c14ff3 --- /dev/null +++ b/ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js @@ -0,0 +1,6 @@ +/*! + * jQuery Bootgrid v1.3.1 - 09/11/2015 + * Copyright (c) 2014-2015 Rafael Staib (http://www.jquery-bootgrid.com) + * Licensed under MIT http://www.opensource.org/licenses/MIT + */ +!function(a,b,c){"use strict";function d(a){function b(b){return c.identifier&&b[c.identifier]===a[c.identifier]}var c=this;return this.rows.contains(b)?!1:(this.rows.push(a),!0)}function e(b){var c=this.footer?this.footer.find(b):a(),d=this.header?this.header.find(b):a();return a.merge(c,d)}function f(b){return b?a.extend({},this.cachedParams,{ctx:b}):this.cachedParams}function g(){var b={current:this.current,rowCount:this.rowCount,sort:this.sortDictionary,searchPhrase:this.searchPhrase},c=this.options.post;return c=a.isFunction(c)?c():c,this.options.requestHandler(a.extend(!0,b,c))}function h(b){return"."+a.trim(b).replace(/\s+/gm,".")}function i(){var b=this.options.url;return a.isFunction(b)?b():b}function j(){this.element.trigger("initialize"+H),m.call(this),this.selection=this.options.selection&&null!=this.identifier,o.call(this),q.call(this),C.call(this),A.call(this),r.call(this),n.call(this),this.element.trigger("initialized"+H)}function k(a){this.options.highlightR! ows}function l(a){return a.visible}function m(){var b=this,c=this.element.find("thead > tr").first(),d=!1;c.children().each(function(){var c=a(this),e=c.data(),f={id:e.columnId,identifier:null==b.identifier&&e.identifier||!1,converter:b.options.converters[e.converter||e.type]||b.options.converters.string,text:c.text(),align:e.align||"left",headerAlign:e.headerAlign||"left",cssClass:e.cssClass||"",headerCssClass:e.headerCssClass||"",formatter:b.options.formatters[e.formatter]||null,order:d||"asc"!==e.order&&"desc"!==e.order?null:e.order,searchable:!(e.searchable===!1),sortable:!(e.sortable===!1),visible:!(e.visible===!1),visibleInSelection:!(e.visibleInSelection===!1),width:a.isNumeric(e.width)?e.width+"px":"string"==typeof e.width?e.width:null};b.columns.push(f),null!=f.order&&(b.sortDictionary[f.id]=f.order),f.identifier&&(b.identifier=f.id,b.converter=f.converter),b.options.multiSort||null===f.order||(d=!0)})}function n(){function c(a){for(var b,c=new RegExp(e.searchPhras! e,e.options.caseSensitive?"g":"gi"),d=0;d<e.columns.length;d++)if(b=e.columns[d],b.searchable&&b.visible&&b.converter.to(a[b.id]).search(c)>-1)return!0;return!1}function d(a,b){e.currentRows=a,p.call(e,b),e.options.keepSelection||(e.selectedRows=[]),y.call(e,a),t.call(e),v.call(e),e.element._bgBusyAria(!1).trigger("loaded"+H)}var e=this;if(this.element._bgBusyAria(!0).trigger("load"+H),F.call(this),this.options.ajax){var f=g.call(this),h=i.call(this);if(null==h||"string"!=typeof h||0===h.length)throw new Error("Url setting must be a none empty string or a function that returns one.");this.xqr&&this.xqr.abort();var j={url:h,data:f,success:function(b){e.xqr=null,"string"==typeof b&&(b=a.parseJSON(b)),b=e.options.responseHandler(b),e.current=b.current,d(b.rows,b.total)},error:function(a,b,c){e.xqr=null,"abort"!==b&&(u.call(e),e.element._bgBusyAria(!1).trigger("loaded"+H))}};j=a.extend(this.options.ajaxSettings,j),this.xqr=a.ajax(j)}else{var k=this.searchPhrase.length>0?this.ro! ws.where(c):this.rows,l=k.length;-1!==this.rowCount&&(k=k.page(this.cur! rent,this.rowCount)),b.setTimeout(function(){d(k,l)},10)}}function o(){if(!this.options.ajax){var b=this,c=this.element.find("tbody > tr");c.each(function(){var c=a(this),e=c.children("td"),f={};a.each(b.columns,function(a,b){f[b.id]=b.converter.from(e.eq(a).text())}),d.call(b,f)}),p.call(this,this.rows.length),G.call(this)}}function p(a){this.total=a,this.totalPages=-1===this.rowCount?1:Math.ceil(this.total/this.rowCount)}function q(){var b=this.options.templates,c=this.element.parent().hasClass(this.options.css.responsiveTable)?this.element.parent():this.element;this.element.addClass(this.options.css.table),0===this.element.children("tbody").length&&this.element.append(b.body),1&this.options.navigation&&(this.header=a(b.header.resolve(f.call(this,{id:this.element._bgId()+"-header"}))),c.before(this.header)),2&this.options.navigation&&(this.footer=a(b.footer.resolve(f.call(this,{id:this.element._bgId()+"-footer"}))),c.after(this.footer))}function r(){if(0!==this.options.na! vigation){var b=this.options.css,c=h(b.actions),d=e.call(this,c);if(d.length>0){var g=this,i=this.options.templates,j=a(i.actions.resolve(f.call(this)));if(this.options.ajax){var k=i.icon.resolve(f.call(this,{iconCss:b.iconRefresh})),l=a(i.actionButton.resolve(f.call(this,{content:k,text:this.options.labels.refresh}))).on("click"+H,function(a){a.stopPropagation(),g.current=1,n.call(g)});j.append(l)}x.call(this,j),s.call(this,j),E.call(this,d,j)}}}function s(b){if(this.options.columnSelection&&this.columns.length>1){var c=this,d=this.options.css,e=this.options.templates,g=e.icon.resolve(f.call(this,{iconCss:d.iconColumns})),i=a(e.actionDropDown.resolve(f.call(this,{content:g}))),j=h(d.dropDownItem),k=h(d.dropDownItemCheckbox),m=h(d.dropDownMenuItems);a.each(this.columns,function(b,g){if(g.visibleInSelection){var o=a(e.actionDropDownCheckboxItem.resolve(f.call(c,{name:g.id,label:g.text,checked:g.visible}))).on("click"+H,j,function(b){b.stopPropagation();var d=a(this),e=d.find! (k);if(!e.prop("disabled")){g.visible=e.prop("checked");var f=c.columns! .where(l).length>1;d.parents(m).find(j+":has("+k+":checked)")._bgEnableAria(f).find(k)._bgEnableField(f),c.element.find("tbody").empty(),C.call(c),n.call(c)}});i.find(h(d.dropDownMenuItems)).append(o)}}),b.append(i)}}function t(){if(0!==this.options.navigation){var b=h(this.options.css.infos),c=e.call(this,b);if(c.length>0){var d=this.current*this.rowCount,g=a(this.options.templates.infos.resolve(f.call(this,{end:0===this.total||-1===d||d>this.total?this.total:d,start:0===this.total?0:d-this.rowCount+1,total:this.total})));E.call(this,c,g)}}}function u(){var a=this.element.children("tbody").first(),b=this.options.templates,c=this.columns.where(l).length;this.selection&&(c+=1),a.html(b.noResults.resolve(f.call(this,{columns:c})))}function v(){if(0!==this.options.navigation){var b=h(this.options.css.pagination),c=e.call(this,b)._bgShowAria(-1!==this.rowCount);if(-1!==this.rowCount&&c.length>0){var d=this.options.templates,g=this.current,i=this.totalPages,j=a(d.pagination.reso! lve(f.call(this))),k=i-g,l=-1*(this.options.padding-g),m=k>=this.options.padding?Math.max(l,1):Math.max(l-this.options.padding+k,1),n=2*this.options.padding+1,o=i>=n?n:i;w.call(this,j,"first","«","first")._bgEnableAria(g>1),w.call(this,j,"prev","<","prev")._bgEnableAria(g>1);for(var p=0;o>p;p++){var q=p+m;w.call(this,j,q,q,"page-"+q)._bgEnableAria()._bgSelectAria(q===g)}0===o&&w.call(this,j,1,1,"page-1")._bgEnableAria(!1)._bgSelectAria(),w.call(this,j,"next",">","next")._bgEnableAria(i>g),w.call(this,j,"last","»","last")._bgEnableAria(i>g),E.call(this,c,j)}}}function w(b,c,d,e){var g=this,i=this.options.templates,j=this.options.css,k=f.call(this,{css:e,text:d,page:c}),l=a(i.paginationItem.resolve(k)).on("click"+H,h(j.paginationButton),function(b){b.stopPropagation(),b.preventDefault();var c=a(this),d=c.parent();if(!d.hasClass("active")&&!d.hasClass("disabled")){var e={first:1,prev:g.current-1,next:g.current+1,last:g.totalPages},f=c.data("page");g.current=e! [f]||f,n.call(g)}c.trigger("blur")});return b.append(l),l}function x(b)! {function c(a){return-1===a?d.options.labels.all:a}var d=this,e=this.options.rowCount;if(a.isArray(e)){var g=this.options.css,i=this.options.templates,j=a(i.actionDropDown.resolve(f.call(this,{content:c(this.rowCount)}))),k=h(g.dropDownMenu),l=h(g.dropDownMenuText),m=h(g.dropDownMenuItems),o=h(g.dropDownItemButton);a.each(e,function(b,e){var g=a(i.actionDropDownItem.resolve(f.call(d,{text:c(e),action:e})))._bgSelectAria(e===d.rowCount).on("click"+H,o,function(b){b.preventDefault();var e=a(this),f=e.data("action");f!==d.rowCount&&(d.current=1,d.rowCount=f,e.parents(m).children().each(function(){var b=a(this),c=b.find(o).data("action");b._bgSelectAria(c===f)}),e.parents(k).find(l).text(c(f)),n.call(d))});j.find(m).append(g)}),b.append(j)}}function y(b){if(b.length>0){var c=this,d=this.options.css,e=this.options.templates,g=this.element.children("tbody").first(),i=!0,j="";a.each(b,function(b,g){var h="",k=' data-row-id="'+(null==c.identifier?b:g[c.identifier])+'"',l="";if(c.se! lection){var m=-1!==a.inArray(g[c.identifier],c.selectedRows),n=e.select.resolve(f.call(c,{type:"checkbox",value:g[c.identifier],checked:m}));h+=e.cell.resolve(f.call(c,{content:n,css:d.selectCell})),i=i&&m,m&&(l+=d.selected,k+=' aria-selected="true"')}var o=null!=g.status&&c.options.statusMapping[g.status];o&&(l+=o),a.each(c.columns,function(b,i){if(i.visible){var j=a.isFunction(i.formatter)?i.formatter.call(c,i,g):i.converter.to(g[i.id]),k=i.cssClass.length>0?" "+i.cssClass:"";h+=e.cell.resolve(f.call(c,{content:null==j||""===j?" ":j,css:("right"===i.align?d.right:"center"===i.align?d.center:d.left)+k,style:null==i.width?"":"width:"+i.width+";"}))}}),l.length>0&&(k+=' class="'+l+'"'),j+=e.row.resolve(f.call(c,{attr:k,cells:h}))}),c.element.find("thead "+h(c.options.css.selectBox)).prop("checked",i),g.html(j),z.call(this,g)}else u.call(this)}function z(b){var c=this,d=h(this.options.css.selectBox);this.selection&&b.off("click"+H,d).on("click"+H,d,function(b){b.stopPro! pagation();var d=a(this),e=c.converter.from(d.val());d.prop("checked")?! c.select([e]):c.deselect([e])}),b.off("click"+H,"> tr").on("click"+H,"> tr",function(b){b.stopPropagation();var d=a(this),e=null==c.identifier?d.data("row-id"):c.converter.from(d.data("row-id")+""),f=null==c.identifier?c.currentRows[e]:c.currentRows.first(function(a){return a[c.identifier]===e});c.selection&&c.options.rowSelect&&(d.hasClass(c.options.css.selected)?c.deselect([e]):c.select([e])),c.element.trigger("click"+H,[c.columns,f])})}function A(){if(0!==this.options.navigation){var c=this.options.css,d=h(c.search),g=e.call(this,d);if(g.length>0){var i=this,j=this.options.templates,k=null,l="",m=h(c.searchField),n=a(j.search.resolve(f.call(this))),o=n.is(m)?n:n.find(m);o.on("keyup"+H,function(c){c.stopPropagation();var d=a(this).val();(l!==d||13===c.which&&""!==d)&&(l=d,(13===c.which||0===d.length||d.length>=i.options.searchSettings.characters)&&(b.clearTimeout(k),k=b.setTimeout(function(){B.call(i,d)},i.options.searchSettings.delay)))}),E.call(this,g,n)}}}function B(a)! {this.searchPhrase!==a&&(this.current=1,this.searchPhrase=a,n.call(this))}function C(){var b=this,c=this.element.find("thead > tr"),d=this.options.css,e=this.options.templates,g="",i=this.options.sorting;if(this.selection){var j=this.options.multiSelect?e.select.resolve(f.call(b,{type:"checkbox",value:"all"})):"";g+=e.rawHeaderCell.resolve(f.call(b,{content:j,css:d.selectCell}))}if(a.each(this.columns,function(a,c){if(c.visible){var h=b.sortDictionary[c.id],j=i&&h&&"asc"===h?d.iconUp:i&&h&&"desc"===h?d.iconDown:"",k=e.icon.resolve(f.call(b,{iconCss:j})),l=c.headerAlign,m=c.headerCssClass.length>0?" "+c.headerCssClass:"";g+=e.headerCell.resolve(f.call(b,{column:c,icon:k,sortable:i&&c.sortable&&d.sortable||"",css:("right"===l?d.right:"center"===l?d.center:d.left)+m,style:null==c.width?"":"width:"+c.width+";"}))}}),c.html(g),i){var k=h(d.sortable);c.off("click"+H,k).on("click"+H,k,function(c){c.preventDefault(),D.call(b,a(this)),G.call(b),n.call(b)})}if(this.selection&&this.op! tions.multiSelect){var l=h(d.selectBox);c.off("click"+H,l).on("click"+H! ,l,function(c){c.stopPropagation(),a(this).prop("checked")?b.select():b.deselect()})}}function D(a){var b=this.options.css,c=h(b.icon),d=a.data("column-id")||a.parents("th").first().data("column-id"),e=this.sortDictionary[d],f=a.find(c);if(this.options.multiSort||(a.parents("tr").first().find(c).removeClass(b.iconDown+" "+b.iconUp),this.sortDictionary={}),e&&"asc"===e)this.sortDictionary[d]="desc",f.removeClass(b.iconUp).addClass(b.iconDown);else if(e&&"desc"===e)if(this.options.multiSort){var g={};for(var i in this.sortDictionary)i!==d&&(g[i]=this.sortDictionary[i]);this.sortDictionary=g,f.removeClass(b.iconDown)}else this.sortDictionary[d]="asc",f.removeClass(b.iconDown).addClass(b.iconUp);else this.sortDictionary[d]="asc",f.addClass(b.iconUp)}function E(b,c){b.each(function(b,d){a(d).before(c.clone(!0)).remove()})}function F(){var a=this;b.setTimeout(function(){if("true"===a.element._bgAria("busy")){var b=a.options.templates,c=a.element.children("thead").first(),d=a.elem! ent.children("tbody").first(),e=d.find("tr > td").first(),g=a.element.height()-c.height()-(e.height()+20),h=a.columns.where(l).length;a.selection&&(h+=1),d.html(b.loading.resolve(f.call(a,{columns:h}))),-1!==a.rowCount&&g>0&&d.find("tr > td").css("padding","20px 0 "+g+"px")}},250)}function G(){function a(c,d,e){function f(a){return"asc"===h.order?a:-1*a}e=e||0;var g=e+1,h=b[e];return c[h.id]>d[h.id]?f(1):c[h.id]<d[h.id]?f(-1):b.length>g?a(c,d,g):0}var b=[];if(!this.options.ajax){for(var c in this.sortDictionary)(this.options.multiSort||0===b.length)&&b.push({id:c,order:this.sortDictionary[c]});b.length>0&&this.rows.sort(a)}}var H=".rs.jquery.bootgrid",I=function(b,c){this.element=a(b),this.origin=this.element.clone(),this.options=a.extend(!0,{},I.defaults,this.element.data(),c);var d=this.options.rowCount=this.element.data().rowCount||c.rowCount||this.options.rowCount;this.columns=[],this.current=1,this.currentRows=[],this.identifier=null,this.selection=!1,this.converter=nu! ll,this.rowCount=a.isArray(d)?d[0]:d,this.rows=[],this.searchPhrase="",! this.selectedRows=[],this.sortDictionary={},this.total=0,this.totalPages=0,this.cachedParams={lbl:this.options.labels,css:this.options.css,ctx:{}},this.header=null,this.footer=null,this.xqr=null};if(I.defaults={navigation:3,padding:2,columnSelection:!0,rowCount:[10,25,50,-1],selection:!1,multiSelect:!1,rowSelect:!1,keepSelection:!1,highlightRows:!1,sorting:!0,multiSort:!1,searchSettings:{delay:250,characters:1},ajax:!1,ajaxSettings:{method:"POST"},post:{},url:"",caseSensitive:!0,requestHandler:function(a){return a},responseHandler:function(a){return a},converters:{numeric:{from:function(a){return+a},to:function(a){return a+""}},string:{from:function(a){return a},to:function(a){return a}}},css:{actions:"actions btn-group",center:"text-center",columnHeaderAnchor:"column-header-anchor",columnHeaderText:"text",dropDownItem:"dropdown-item",dropDownItemButton:"dropdown-item-button",dropDownItemCheckbox:"dropdown-item-checkbox",dropDownMenu:"dropdown btn-group",dropDownMenuItems:"! dropdown-menu pull-right",dropDownMenuText:"dropdown-text",footer:"bootgrid-footer container-fluid",header:"bootgrid-header container-fluid",icon:"icon glyphicon",iconColumns:"glyphicon-th-list",iconDown:"glyphicon-chevron-down",iconRefresh:"glyphicon-refresh",iconSearch:"glyphicon-search",iconUp:"glyphicon-chevron-up",infos:"infos",left:"text-left",pagination:"pagination",paginationButton:"button",responsiveTable:"table-responsive",right:"text-right",search:"search form-group",searchField:"search-field form-control",selectBox:"select-box",selectCell:"select-cell",selected:"active",sortable:"sortable",table:"bootgrid-table table"},formatters:{},labels:{all:"All",infos:"Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries",loading:"Loading...",noResults:"No results found!",refresh:"Refresh",search:"Search"},statusMapping:{0:"success",1:"info",2:"warning",3:"danger"},templates:{actionButton:'<button class="btn btn-default" type="button" title="{{ctx.text}}">{{ctx.con! tent}}</button>',actionDropDown:'<div class="{{css.dropDownMenu}}"><but! ton class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"><span class="{{css.dropDownMenuText}}">{{ctx.content}}</span> <span class="caret"></span></button><ul class="{{css.dropDownMenuItems}}" role="menu"></ul></div>',actionDropDownItem:'<li><a data-action="{{ctx.action}}" class="{{css.dropDownItem}} {{css.dropDownItemButton}}">{{ctx.text}}</a></li>',actionDropDownCheckboxItem:'<li><label class="{{css.dropDownItem}}"><input name="{{ctx.name}}" type="checkbox" value="1" class="{{css.dropDownItemCheckbox}}" {{ctx.checked}} /> {{ctx.label}}</label></li>',actions:'<div class="{{css.actions}}"></div>',body:"<tbody></tbody>",cell:'<td class="{{ctx.css}}" style="{{ctx.style}}">{{ctx.content}}</td>',footer:'<div id="{{ctx.id}}" class="{{css.footer}}"><div class="row"><div class="col-sm-6"><p class="{{css.pagination}}"></p></div><div class="col-sm-6 infoBar"><p class="{{css.infos}}"></p></div></div></div>',header:'<div id="{{ctx.id}}" class="{{css.header}}"><! div class="row"><div class="col-sm-12 actionBar"><p class="{{css.search}}"></p><p class="{{css.actions}}"></p></div></div></div>',headerCell:'<th data-column-id="{{ctx.column.id}}" class="{{ctx.css}}" style="{{ctx.style}}"><a href="javascript:void(0);" class="{{css.columnHeaderAnchor}} {{ctx.sortable}}"><span class="{{css.columnHeaderText}}">{{ctx.column.text}}</span>{{ctx.icon}}</a></th>',icon:'<span class="{{css.icon}} {{ctx.iconCss}}"></span>',infos:'<div class="{{css.infos}}">{{lbl.infos}}</div>',loading:'<tr><td colspan="{{ctx.columns}}" class="loading">{{lbl.loading}}</td></tr>',noResults:'<tr><td colspan="{{ctx.columns}}" class="no-results">{{lbl.noResults}}</td></tr>',pagination:'<ul class="{{css.pagination}}"></ul>',paginationItem:'<li class="{{ctx.css}}"><a data-page="{{ctx.page}}" class="{{css.paginationButton}}">{{ctx.text}}</a></li>',rawHeaderCell:'<th class="{{ctx.css}}">{{ctx.content}}</th>',row:"<tr{{ctx.attr}}>{{ctx.cells}}</tr>",search:'<div class="{{css.s! earch}}"><div class="input-group"><span class="{{css.icon}} input-group! -addon {{css.iconSearch}}"></span> <input type="text" class="{{css.searchField}}" placeholder="{{lbl.search}}" /></div></div>',select:'<input name="select" type="{{ctx.type}}" class="{{css.selectBox}}" value="{{ctx.value}}" {{ctx.checked}} />'}},I.prototype.append=function(a){if(this.options.ajax);else{for(var b=[],c=0;c<a.length;c++)d.call(this,a[c])&&b.push(a[c]);G.call(this),k.call(this,b),n.call(this),this.element.trigger("appended"+H,[b])}return this},I.prototype.clear=function(){if(this.options.ajax);else{var b=a.extend([],this.rows);this.rows=[],this.current=1,this.total=0,n.call(this),this.element.trigger("cleared"+H,[b])}return this},I.prototype.destroy=function(){return a(b).off(H),1&this.options.navigation&&this.header.remove(),2&this.options.navigation&&this.footer.remove(),this.element.before(this.origin).remove(),this},I.prototype.reload=function(){return this.current=1,n.call(this),this},I.prototype.remove=function(a){if(null!=this.identifier){if(this.options! .ajax);else{a=a||this.selectedRows;for(var b,c=[],d=0;d<a.length;d++){b=a[d];for(var e=0;e<this.rows.length;e++)if(this.rows[e][this.identifier]===b){c.push(this.rows[e]),this.rows.splice(e,1);break}}this.current=1,n.call(this),this.element.trigger("removed"+H,[c])}}return this},I.prototype.search=function(a){if(a=a||"",this.searchPhrase!==a){var b=h(this.options.css.searchField),c=e.call(this,b);c.val(a)}return B.call(this,a),this},I.prototype.select=function(b){if(this.selection){b=b||this.currentRows.propValues(this.identifier);for(var c,d,e=[];b.length>0&&(this.options.multiSelect||1!==e.length);)if(c=b.pop(),-1===a.inArray(c,this.selectedRows))for(d=0;d<this.currentRows.length;d++)if(this.currentRows[d][this.identifier]===c){e.push(this.currentRows[d]),this.selectedRows.push(c);break}if(e.length>0){var f=h(this.options.css.selectBox),g=this.selectedRows.length>=this.currentRows.length;for(d=0;!this.options.keepSelection&&g&&d<this.currentRows.length;)g=-1!==a.inArray(t! his.currentRows[d++][this.identifier],this.selectedRows);for(this.eleme! nt.find("thead "+f).prop("checked",g),this.options.multiSelect||this.element.find("tbody > tr "+f+":checked").trigger("click"+H),d=0;d<this.selectedRows.length;d++)this.element.find('tbody > tr[data-row-id="'+this.selectedRows[d]+'"]').addClass(this.options.css.selected)._bgAria("selected","true").find(f).prop("checked",!0);this.element.trigger("selected"+H,[e])}}return this},I.prototype.deselect=function(b){if(this.selection){b=b||this.currentRows.propValues(this.identifier);for(var c,d,e,f=[];b.length>0;)if(c=b.pop(),e=a.inArray(c,this.selectedRows),-1!==e)for(d=0;d<this.currentRows.length;d++)if(this.currentRows[d][this.identifier]===c){f.push(this.currentRows[d]),this.selectedRows.splice(e,1);break}if(f.length>0){var g=h(this.options.css.selectBox);for(this.element.find("thead "+g).prop("checked",!1),d=0;d<f.length;d++)this.element.find('tbody > tr[data-row-id="'+f[d][this.identifier]+'"]').removeClass(this.options.css.selected)._bgAria("selected","false").find(g).prop(! "checked",!1);this.element.trigger("deselected"+H,[f])}}return this},I..prototype.sort=function(b){var c=b?a.extend({},b):{};return c===this.sortDictionary?this:(this.sortDictionary=c,C.call(this),G.call(this),n.call(this),this)},I.prototype.getColumnSettings=function(){return a.merge([],this.columns)},I.prototype.getCurrentPage=function(){return this.current},I.prototype.getCurrentRows=function(){return a.merge([],this.currentRows)},I.prototype.getRowCount=function(){return this.rowCount},I.prototype.getSearchPhrase=function(){return this.searchPhrase},I.prototype.getSelectedRows=function(){return a.merge([],this.selectedRows)},I.prototype.getSortDictionary=function(){return a.extend({},this.sortDictionary)},I.prototype.getTotalPageCount=function(){return this.totalPages},I.prototype.getTotalRowCount=function(){return this.total},a.fn.extend({_bgAria:function(a,b){return b?this.attr("aria-"+a,b):this.attr("aria-"+a)},_bgBusyAria:function(a){return null==a||a?this._bgAria("! busy","true"):this._bgAria("busy","false")},_bgRemoveAria:function(a){re! turn this.removeAttr("aria-"+a)},_bgEnableAria:function(a){return null==a||a?this.removeClass("disabled")._bgAria("disabled","false"):this.addClass("disabled")._bgAria("disabled","true")},_bgEnableField:function(a){return null==a||a?this.removeAttr("disabled"):this.attr("disabled","disable")},_bgShowAria:function(a){return null==a||a?this.show()._bgAria("hidden","false"):this.hide()._bgAria("hidden","true")},_bgSelectAria:function(a){return null==a||a?this.addClass("active")._bgAria("selected","true"):this.removeClass("active")._bgAria("selected","false")},_bgId:function(a){return a?this.attr("id",a):this.attr("id")}}),!String.prototype.resolve){var J={checked:function(a){return"boolean"==typeof a?a?'checked="checked"':"":a}};String.prototype.resolve=function(b,c){var d=this;return a.each(b,function(b,e){if(null!=e&&"function"!=typeof e)if("object"==typeof e){var f=c?a.extend([],c):[];f.push(b),d=d.resolve(e,f)+""}else{J&&J[b]&&"function"==typeof J[b]&&(e=J[b](e)),b=c?c.joi! n(".")+"."+b:b;var g=new RegExp("\\{\\{"+b+"\\}\\}","gm");d=d.replace(g,e.replace?e.replace(/\$/gi,"$"):e)}}),d}}Array.prototype.first||(Array.prototype.first=function(a){for(var b=0;b<this.length;b++){var c=this[b];if(a(c))return c}return null}),Array.prototype.contains||(Array.prototype.contains=function(a){for(var b=0;b<this.length;b++){var c=this[b];if(a(c))return!0}return!1}),Array.prototype.page||(Array.prototype.page=function(a,b){var c=(a-1)*b,d=c+b;return this.length>c?this.length>d?this.slice(c,d):this.slice(c):[]}),Array.prototype.where||(Array.prototype.where=function(a){for(var b=[],c=0;c<this.length;c++){var d=this[c];a(d)&&b.push(d)}return b}),Array.prototype.propValues||(Array.prototype.propValues=function(a){for(var b=[],c=0;c<this.length;c++)b.push(this[c][a]);return b});var K=a.fn.bootgrid;a.fn.bootgrid=function(b){var c=Array.prototype.slice.call(arguments,1),d=null,e=this.each(function(e){var f=a(this),g=f.data(H),h="object"==typeof b&&b;if((g||"des! troy"!==b)&&(g||(f.data(H,g=new I(this,h)),j.call(g)),"string"==typeof ! b))if(0===b.indexOf("get")&&0===e)d=g[b].apply(g,c);else if(0!==b.indexOf("get"))return g[b].apply(g,c)});return"string"==typeof b&&0===b.indexOf("get")?d:e},a.fn.bootgrid.Constructor=I,a.fn.bootgrid.noConflict=function(){return a.fn.bootgrid=K,this},a('[data-toggle="bootgrid"]').bootgrid()}(jQuery,window); \ No newline at end of file diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index 395c661..d5bac63 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -54,6 +54,7 @@ <link rel="stylesheet" href="$href('css/jquery-ui.custom.css')"> <link rel="stylesheet" href="$href('css/bootstrap.custom.css')"> <link rel="stylesheet" href="$href('libs/bootstrap-select/dist/css/bootstrap-select.min.css')"> + <link rel="stylesheet" href="$href('libs/jquery-bootgrid/dist/css/jquery.bootgrid.min.css')"> <link rel="stylesheet" href="$href('css/fontawesome/fontawesome.css')"> <link rel="stylesheet" href="$href('css/opensans/opensans.css')"> <link rel="stylesheet" href="$href('css/bootstrap-select.custom.css')"> @@ -65,6 +66,7 @@ <script src="$href('libs/jquery-i18n/jquery.i18n.min.js')"></script> <script src="$href('libs/bootstrap/bootstrap.min.js')"></script> <script src="$href('libs/bootstrap-select/dist/js/bootstrap-select.min.js')"></script> + <script src="$href('libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js')"></script> <script src="$href('base64/jquery.base64.js')"></script> <script src="$href('js/wok.min.js')"></script>  -- 2.4.3

4 3

[PATCH 0/1] Library files for bootgrid plugin
by atreyee＠linux.vnet.ibm.com 11 Dec '15

11 Dec '15

From: Chandra Shekhar Reddy Potula <chandra(a)linux.vnet.ibm.com> Bootgrid is grid implemention for bootstrap and jquery with sorting, multiselect,searching featuers. Atreyee Mukhopadhyay (1): Library files for bootgrid plugin configure.ac | 4 ++++ ui/libs/Makefile.am | 2 +- ui/libs/jquery-bootgrid/LICENSE | 17 +++++++++++++++++ ui/libs/jquery-bootgrid/Makefile.am | 20 ++++++++++++++++++++ ui/libs/jquery-bootgrid/dist/Makefile.am | 20 ++++++++++++++++++++ ui/libs/jquery-bootgrid/dist/css/Makefile.am | 22 ++++++++++++++++++++++ .../dist/css/jquery.bootgrid.min.css | 5 +++++ ui/libs/jquery-bootgrid/dist/js/Makefile.am | 22 ++++++++++++++++++++++ .../jquery-bootgrid/dist/js/jquery.bootgrid.min.js | 6 ++++++ ui/pages/wok-ui.html.tmpl | 2 ++ 10 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 ui/libs/jquery-bootgrid/LICENSE create mode 100644 ui/libs/jquery-bootgrid/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/css/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/css/jquery.bootgrid.min.css create mode 100644 ui/libs/jquery-bootgrid/dist/js/Makefile.am create mode 100644 ui/libs/jquery-bootgrid/dist/js/jquery.bootgrid.min.js -- 2.4.3

4 6

[PATCH 00/10] FVT testcases base framework
by archus＠linux.vnet.ibm.com 08 Dec '15

08 Dec '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> Patch for adding FVT testcases base framework which can be used across plugins. The changes are: 1) Added fvt package inside tests directory. 2) Added config file inside fvt package to have session details. 3) restapilib.py to have common classes/methods for REST API calls. 4) fvt_base.py, a base test class to take care of doing common setup and treadown required for any fvt test cases like creating/destroying session using config file and restapilib.py. 5) run_test.sh.in script to install all the dependencies and to run all FVT. 6) make file changes to have 'make check-fvt' for running all the FVT. Archana Singh (10): Package for functional verification testcases Wok level config file to have sections required for functional verification test common across plugins. Lists all dependecies for fvt testcases. Common classes/methods for API calls as per config file configuration. Base test class, takes care common actions required for any FVT test cases like creating/destoring session, authorization using wok level fvt config file, creating JSON validator and logging. Install all the dependencies from requirements.txt in python virtualenv and runs all the FVT test cases. Makefile needed for build and run fvt. Added fvt as subdirs and check-fvt to run fvt testcases using make. Added FVT Makefile in AC_CONFIG_FILES list. Added check-fvt to run FVT testcases using make and venv dir to be cleaned. Makefile.am | 8 +- configure.ac | 1 + tests/Makefile.am | 6 + tests/fvt/Makefile.am | 43 +++ tests/fvt/__init__.py | 18 ++ tests/fvt/config | 7 + tests/fvt/fvt_base.py | 92 ++++++ tests/fvt/requirements.txt | 23 ++ tests/fvt/restapilib.py | 760 +++++++++++++++++++++++++++++++++++++++++++++ tests/fvt/run_tests.sh.in | 92 ++++++ 10 files changed, 1048 insertions(+), 2 deletions(-) create mode 100644 tests/fvt/Makefile.am create mode 100644 tests/fvt/__init__.py create mode 100644 tests/fvt/config create mode 100644 tests/fvt/fvt_base.py create mode 100644 tests/fvt/requirements.txt create mode 100644 tests/fvt/restapilib.py create mode 100755 tests/fvt/run_tests.sh.in -- 2.1.0

3 12

[RFC] UI changes for Linux bridge/OVS bridge support
by Lucio Correia 03 Dec '15

03 Dec '15

Hi team, This is a proposal for UI changes to reflect the new API options for "add network". Network tab -> User clicks on add (+) button Currently, there are 3 options in "Network Type": Isolated, NAT, Bridged (which sets macvtap bridges as of now). The API is changing for Kimchi 2.0: "Bridged" option will now be used for creating networks tied to Linux bridges, while a 4th option "macvtap" will be added for creating networks tied to macvtap bridges. Changes in Bridged option: 1) Change description of "Bridged" option to refer to Linux bridges 2) When "Bridged" is selected, "Destination" will show all the interfaces it currently shows plus OVS bridges 3) "Enable VLAN" is not showed 4) "Bridged" option will call network_create API with "bridge" as value for "connection" parameter New macvtap option: 5) Add a new option "macvtap" to Network Type 6) When macvtap option is selected, "Destination" will show the same that is currently showed for "Bridged" option (no OVS bridges) 7) "Enable VLAN" option is showed 8) macvtap option will call network create API with "macvtap" as "connection" parameter value Please let me know your thoughts. Thanks, -- Lucio Correia Software Engineer IBM LTC Brazil

1 1

[PATCH 0/4 - v333] Add multiple disks in Template
by Rodrigo Trujillo 02 Dec '15

02 Dec '15

V3 - Addresses Aline's comments * fixes backend, API.md and API.json * fixes test cases and add new test V2 - Rebase over latest new UI patches V1 - Initial version Rodrigo Trujillo (4): Fix Template backend create/update for multiple disks UI - Implement multiple disks support in Template edit window Test: Fix and add test related to disks in templates Fix pep8 problems src/wok/plugins/kimchi/API.json | 19 +- src/wok/plugins/kimchi/docs/API.md | 3 + src/wok/plugins/kimchi/model/templates.py | 9 +- src/wok/plugins/kimchi/model/vms.py | 6 +- src/wok/plugins/kimchi/osinfo.py | 1 + src/wok/plugins/kimchi/tests/test_rest.py | 8 +- src/wok/plugins/kimchi/tests/test_template.py | 36 ++- .../kimchi/ui/js/src/kimchi.template_edit_main.js | 246 ++++++++++----------- .../kimchi/ui/pages/template-edit.html.tmpl | 5 +- src/wok/plugins/kimchi/vmtemplate.py | 13 +- 10 files changed, 204 insertions(+), 142 deletions(-) -- 2.1.0

2 8

[PATCH] Update VCPU by using libvirt function
by Jose Ricardo Ziviani 02 Dec '15

02 Dec '15

From: Crístian Deives <cristiandeives(a)gmail.com> Currently, the VCPU count is updated by editing the configuration XML (tag: <vcpu>). However, in some cases, editing that tag will only update the maximum VCPU count, not the current one. For example, if the VM has the following XML tag: <vcpu current='2'>8</vcpu> and the user updates the VCPU value to 10, Kimchi will update the XML tag to: <vcpu current='2'>10</vcpu> Use the libvirt function "setVcpusFlags" to update the current and the maximum VCPU values to the one specified by the user. * This patch also changes vcpu setting when guest is being created. Now 'current' is always set and is the total of cpus from the Template and maxVcpu is the >= 255 or (sockets * cores * threads) in PPC. In x86 it is the value of libvirt getMaxVcpu. * Change NUMA management. Sets all cpus to 0. There is not impact to the guest. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> Signed-off-by: Crístian Deives <cristiandeives(a)gmail.com> Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/i18n.py | 3 + src/wok/plugins/kimchi/mockmodel.py | 51 +++++------ src/wok/plugins/kimchi/model/vms.py | 144 +++++++++++++++++++++++++++--- src/wok/plugins/kimchi/tests/test_rest.py | 10 ++- src/wok/plugins/kimchi/vmtemplate.py | 26 +++++- 5 files changed, 186 insertions(+), 48 deletions(-) diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index de7962a..29a7222 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -128,6 +128,9 @@ messages = { "KCHVM0069E": _("Password field must be a string."), "KCHVM0070E": _("Error creating local host ssh rsa key of user 'root'."), "KCHVM0071E": _("Memory value %(mem)s must be aligned to %(alignment)sMiB."), + "KCHVM0072E": _("Unable to update the following parameters while the VM is offline: %(params)s"), + "KCHVM0073E": _("Unable to update the following parameters while the VM is online: %(params)s"), + "KCHVM0074E": _("Cannot change VCPU value because '%(vm)s' has a topology defined - sockets: %(sockets)s, cores: %(cores)s, threads: %(threads)s."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/wok/plugins/kimchi/mockmodel.py b/src/wok/plugins/kimchi/mockmodel.py index 9186f78..cca38e5 100644 --- a/src/wok/plugins/kimchi/mockmodel.py +++ b/src/wok/plugins/kimchi/mockmodel.py @@ -21,6 +21,8 @@ import libvirt import lxml.etree as ET import os import time + +from collections import defaultdict from lxml import objectify from lxml.builder import E @@ -60,10 +62,9 @@ storagevolumes.VALID_RAW_CONTENT = ['dos/mbr boot sector', class MockModel(Model): - _mock_vms = {} + _mock_vms = defaultdict(list) _mock_snapshots = {} _XMLDesc = libvirt.virDomain.XMLDesc - _defineXML = libvirt.virConnect.defineXML _undefineDomain = libvirt.virDomain.undefine _libvirt_get_vol_path = LibvirtVMTemplate._get_volume_path @@ -81,7 +82,6 @@ class MockModel(Model): cpuinfo.get_topo_capabilities = MockModel.get_topo_capabilities vmifaces.getDHCPLeases = MockModel.getDHCPLeases - libvirt.virConnect.defineXML = MockModel.domainDefineXML libvirt.virDomain.XMLDesc = MockModel.domainXMLDesc libvirt.virDomain.undefine = MockModel.undefineDomain libvirt.virDomain.attachDeviceFlags = MockModel.attachDeviceFlags @@ -124,7 +124,7 @@ class MockModel(Model): imageinfo.probe_image = self._probe_image def reset(self): - MockModel._mock_vms = {} + MockModel._mock_vms = defaultdict(list) MockModel._mock_snapshots = {} if hasattr(self, 'objstore'): @@ -157,21 +157,15 @@ class MockModel(Model): return ET.fromstring(xml) @staticmethod - def domainDefineXML(conn, xml): - name = objectify.fromstring(xml).name.text - try: - dom = conn.lookupByName(name) - if not dom.isActive(): - MockModel._mock_vms[name] = xml - except: - pass + def domainXMLDesc(dom, flags=0): + xml = MockModel._XMLDesc(dom, flags) + root = objectify.fromstring(xml) - return MockModel._defineXML(conn, xml) + for dev_xml in MockModel._mock_vms.get(dom.name(), []): + dev = objectify.fromstring(dev_xml) + root.devices.append(dev) - @staticmethod - def domainXMLDesc(dom, flags=0): - return MockModel._mock_vms.get(dom.name(), - MockModel._XMLDesc(dom, flags)) + return ET.tostring(root, encoding="utf-8") @staticmethod def undefineDomain(dom): @@ -182,12 +176,7 @@ class MockModel(Model): @staticmethod def attachDeviceFlags(dom, xml, flags=0): - old_xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) - root = objectify.fromstring(old_xml) - dev = objectify.fromstring(xml) - root.devices.append(dev) - - MockModel._mock_vms[dom.name()] = ET.tostring(root, encoding="utf-8") + MockModel._mock_vms[dom.name()].append(xml) @staticmethod def _get_device_node(dom, xml): @@ -213,16 +202,18 @@ class MockModel(Model): @staticmethod def detachDeviceFlags(dom, xml, flags=0): - root, dev = MockModel._get_device_node(dom, xml) - root.devices.remove(dev) - - MockModel._mock_vms[dom.name()] = ET.tostring(root, encoding="utf-8") + node = ET.fromstring(xml) + xml = ET.tostring(node, encoding="utf-8", pretty_print=True) + if xml in MockModel._mock_vms[dom.name()]: + MockModel._mock_vms[dom.name()].remove(xml) @staticmethod def updateDeviceFlags(dom, xml, flags=0): - root, old_dev = MockModel._get_device_node(dom, xml) - root.devices.replace(old_dev, objectify.fromstring(xml)) - MockModel._mock_vms[dom.name()] = ET.tostring(root, encoding="utf-8") + _, old_dev = MockModel._get_device_node(dom, xml) + old_xml = ET.tostring(old_dev, encoding="utf-8", pretty_print=True) + if old_xml in MockModel._mock_vms[dom.name()]: + MockModel._mock_vms[dom.name()].remove(old_xml) + MockModel._mock_vms[dom.name()].append(xml) @staticmethod def volResize(vol, size, flags=0): diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py index 7e12b91..a67044d 100644 --- a/src/wok/plugins/kimchi/model/vms.py +++ b/src/wok/plugins/kimchi/model/vms.py @@ -56,6 +56,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.model.cpuinfo import CPUInfoModel from wok.plugins.kimchi.screenshot import VMScreenshot from wok.plugins.kimchi.utils import template_name_from_uri from wok.plugins.kimchi.xmlutils.cpu import get_cpu_xml, get_numa_xml @@ -71,10 +72,15 @@ DOM_STATE_MAP = {0: 'nostate', 6: 'crashed', 7: 'pmsuspended'} -VM_STATIC_UPDATE_PARAMS = {'name': './name', - 'cpus': './vcpu'} +VM_STATIC_UPDATE_PARAMS = {'name': './name'} VM_LIVE_UPDATE_PARAMS = {} +# update parameters which are updatable when the VM is online +VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] +# update parameters which are updatable when the VM is offline +VM_OFFLINE_UPDATE_PARAMS = ['cpus', 'graphics', 'groups', 'memory', 'name', + 'users'] + XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" XPATH_DOMAIN_NAME = '/domain/name' @@ -84,9 +90,12 @@ XPATH_DOMAIN_MAC_BY_ADDRESS = "./devices/interface[@type='network']/"\ XPATH_DOMAIN_MEMORY = '/domain/memory' XPATH_DOMAIN_MEMORY_UNIT = '/domain/memory/@unit' XPATH_DOMAIN_UUID = '/domain/uuid' +XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id' XPATH_NUMA_CELL = './cpu/numa/cell' +XPATH_TOPOLOGY = './cpu/topology' + # key: VM name; value: lock object vm_locks = {} @@ -98,6 +107,17 @@ class VMsModel(object): self.caps = CapabilitiesModel(**kargs) self.task = TaskModel(**kargs) + def _get_host_maxcpu(self): + if os.uname()[4] in ['ppc', 'ppc64', 'ppc64le']: + cpu_model = CPUInfoModel(conn=self.conn) + max_vcpu_val = (cpu_model.cores_available * + cpu_model.threads_per_core) + if max_vcpu_val > 255: + max_vcpu_val = 255 + else: + max_vcpu_val = self.conn.get().getMaxVcpus('kvm') + return max_vcpu_val + def create(self, params): t_name = template_name_from_uri(params['template']) vm_list = self.get_list() @@ -163,7 +183,8 @@ class VMsModel(object): xml = t.to_vm_xml(name, vm_uuid, libvirt_stream_protocols=stream_protocols, graphics=graphics, - volumes=vol_list) + volumes=vol_list, + max_vcpus=self._get_host_maxcpu()) cb('Defining new VM') try: @@ -231,6 +252,30 @@ class VMModel(object): self.vmsnapshots = cls(**kargs) self.stats = {} + def has_topology(self, dom): + xml = dom.XMLDesc(0) + sockets = xpath_get_text(xml, XPATH_TOPOLOGY + '/@sockets') + cores = xpath_get_text(xml, XPATH_TOPOLOGY + '/@cores') + threads = xpath_get_text(xml, XPATH_TOPOLOGY + '/@threads') + return sockets and cores and threads + + def get_vm_max_sockets(self, dom): + return int(xpath_get_text(dom.XMLDesc(0), + XPATH_TOPOLOGY + '/@sockets')[0]) + + def get_vm_sockets(self, dom): + current_vcpu = dom.vcpusFlags(libvirt.VIR_DOMAIN_AFFECT_CURRENT) + return (current_vcpu / self.get_vm_cores(dom) / + self.get_vm_threads(dom)) + + def get_vm_cores(self, dom): + return int(xpath_get_text(dom.XMLDesc(0), + XPATH_TOPOLOGY + '/@cores')[0]) + + def get_vm_threads(self, dom): + return int(xpath_get_text(dom.XMLDesc(0), + XPATH_TOPOLOGY + '/@threads')[0]) + def update(self, name, params): lock = vm_locks.get(name) if lock is None: @@ -247,8 +292,20 @@ class VMModel(object): 'alignment': str(PPC_MEM_ALIGN)}) dom = self.get_vm(name, self.conn) - vm_name, dom = self._static_vm_update(name, dom, params) + + if DOM_STATE_MAP[dom.info()[0]] == 'shutoff': + ext_params = set(params.keys()) - set(VM_OFFLINE_UPDATE_PARAMS) + if len(ext_params) > 0: + raise InvalidParameter('KCHVM0072E', + {'params': ', '.join(ext_params)}) + else: + ext_params = set(params.keys()) - set(VM_ONLINE_UPDATE_PARAMS) + if len(ext_params) > 0: + raise InvalidParameter('KCHVM0073E', + {'params': ', '.join(ext_params)}) + self._live_vm_update(dom, params) + vm_name, dom = self._static_vm_update(name, dom, params) return vm_name def clone(self, name): @@ -713,23 +770,34 @@ class VMModel(object): params['name'], nonascii_name = get_ascii_nonascii_name(name) for key, val in params.items(): + change_numa = True if key in VM_STATIC_UPDATE_PARAMS: if type(val) == int: val = str(val) xpath = VM_STATIC_UPDATE_PARAMS[key] - new_xml = xml_item_update(new_xml, xpath, val) + attrib = None + if key == 'cpus': + if self.has_topology(dom) or dom.isActive(): + change_numa = False + continue + # Update maxvcpu firstly + new_xml = xml_item_update(new_xml, xpath, + str(self._get_host_maxcpu()), + attrib) + # Update current vcpu + attrib = 'current' + new_xml = xml_item_update(new_xml, xpath, val, attrib) # Updating memory and NUMA if necessary, if vm is offline if not dom.isActive(): if 'memory' in params: new_xml = self._update_memory_config(new_xml, params) - elif 'cpus' in params and \ + elif 'cpus' in params and change_numa and \ (xpath_get_text(new_xml, XPATH_NUMA_CELL + '/@memory') != []): - vcpus = params['cpus'] new_xml = xml_item_update( new_xml, XPATH_NUMA_CELL, - value='0-' + str(vcpus - 1) if vcpus > 1 else '0', + value='0', attr='cpus') if 'graphics' in params: @@ -764,6 +832,8 @@ class VMModel(object): raise OperationFailed("KCHVM0008E", {'name': vm_name, 'err': e.get_error_message()}) + if name is not None: + vm_name = name return (nonascii_name if nonascii_name is not None else vm_name, dom) def _update_memory_config(self, xml, params): @@ -775,21 +845,20 @@ class VMModel(object): vcpus = params.get('cpus') if numa_mem == []: if vcpus is None: - vcpus = int(xpath_get_text(xml, - VM_STATIC_UPDATE_PARAMS['cpus'])[0]) + vcpus = int(xpath_get_text(xml, 'vcpu')[0]) cpu = root.find('./cpu') if cpu is None: - cpu = get_cpu_xml(vcpus, params['memory'] << 10) + cpu = get_cpu_xml(0, params['memory'] << 10) root.insert(0, ET.fromstring(cpu)) else: - numa_element = get_numa_xml(vcpus, params['memory'] << 10) + numa_element = get_numa_xml(0, params['memory'] << 10) cpu.insert(0, ET.fromstring(numa_element)) else: if vcpus is not None: xml = xml_item_update( xml, XPATH_NUMA_CELL, - value='0-' + str(vcpus - 1) if vcpus > 1 else '0', + value='0', attr='cpus') root = ET.fromstring(xml_item_update(xml, XPATH_NUMA_CELL, str(params['memory'] << 10), @@ -853,11 +922,60 @@ class VMModel(object): return new_xml return ET.tostring(root, encoding="utf-8") + def _get_host_maxcpu(self): + if os.uname()[4] in ['ppc', 'ppc64', 'ppc64le']: + cpu_model = CPUInfoModel(conn=self.conn) + max_vcpu_val = (cpu_model.cores_available * + cpu_model.threads_per_core) + if max_vcpu_val > 255: + max_vcpu_val = 255 + else: + max_vcpu_val = self.conn.get().getMaxVcpus('kvm') + return max_vcpu_val + def _live_vm_update(self, dom, params): self._vm_update_access_metadata(dom, params) if 'memory' in params and dom.isActive(): self._update_memory_live(dom, params) + if 'cpus' in params: + cpus = params['cpus'] + + if DOM_STATE_MAP[dom.info()[0]] == 'shutoff': + + # user cannot change vcpu if topology is defined. In this case + # vcpu must always be sockets * cores * threads. + current_vcpu = dom.vcpusFlags(libvirt.VIR_DOMAIN_VCPU_MAXIMUM) + + if self.has_topology(dom): + if current_vcpu != cpus: + raise InvalidOperation('KCHVM0074E', + {'vm': dom.name(), + 'sockets': + self.get_vm_max_sockets(), + 'cores': + self.get_vm_cores(), + 'threads': + self.get_vm_threads()}) + + # do not need to update vcpu if the value edit did not + # change + else: + return + + try: + # set maximum VCPU count + max_vcpus = self._get_host_maxcpu() + dom.setVcpusFlags(max_vcpus, + libvirt.VIR_DOMAIN_AFFECT_CONFIG | + libvirt.VIR_DOMAIN_VCPU_MAXIMUM) + + # set current VCPU count + dom.setVcpusFlags(cpus, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + except libvirt.libvirtError, e: + raise OperationFailed('KCHVM0008E', {'name': dom.name(), + 'err': e.message}) + def _update_memory_live(self, dom, params): # Check if host supports memory device if not self.caps.mem_hotplug_support: diff --git a/src/wok/plugins/kimchi/tests/test_rest.py b/src/wok/plugins/kimchi/tests/test_rest.py index 544f2e6..9fa8c8d 100644 --- a/src/wok/plugins/kimchi/tests/test_rest.py +++ b/src/wok/plugins/kimchi/tests/test_rest.py @@ -144,6 +144,10 @@ class RestTests(unittest.TestCase): vm = json.loads(self.request('/plugins/kimchi/vms/vm-1').read()) self.assertEquals('vm-1', vm['name']) + req = json.dumps({'cpus': 3}) + resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) + resp = self.request('/plugins/kimchi/vms/vm-1/start', '{}', 'POST') self.assertEquals(200, resp.status) @@ -155,9 +159,10 @@ class RestTests(unittest.TestCase): resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') self.assertEquals(400, resp.status) - req = json.dumps({'cpus': 3}) + # Unable to do CPU hotplug + req = json.dumps({'cpus': 5}) resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') - self.assertEquals(200, resp.status) + self.assertEquals(400, resp.status) # Check if there is support to memory hotplug, once vm is running resp = self.request('/plugins/kimchi/config/capabilities').read() @@ -171,6 +176,7 @@ class RestTests(unittest.TestCase): req = json.dumps({"graphics": {'passwd': "abcdef"}}) resp = self.request('/plugins/kimchi/vms/vm-1', req, 'PUT') + self.assertEquals(200, resp.status) info = json.loads(resp.read()) self.assertEquals('abcdef', info["graphics"]["passwd"]) self.assertEquals(None, info["graphics"]["passwdValidTo"]) diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index 3097b66..8d669db 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -298,7 +298,7 @@ class VMTemplate(object): cpu_info = self.info.get('cpu_info') if cpu_info is not None: cpu_topo = cpu_info.get('topology') - return get_cpu_xml(self.info.get('cpus'), + return get_cpu_xml(0, self.info.get('memory') << 10, cpu_topo) @@ -311,7 +311,6 @@ class VMTemplate(object): params['qemu-namespace'] = '' params['cdroms'] = '' params['qemu-stream-cmdline'] = '' - params['cpu_info'] = self._get_cpu_xml() params['disks'] = self._get_disks_xml(vm_uuid) params['serial'] = get_serial_xml(params) @@ -322,6 +321,8 @@ class VMTemplate(object): libvirt_stream_protocols = kwargs.get('libvirt_stream_protocols', []) cdrom_xml = self._get_cdrom_xml(libvirt_stream_protocols) + max_vcpus = kwargs.get('max_vcpus', 1) + if not urlparse.urlparse(self.info.get('cdrom', "")).scheme in \ libvirt_stream_protocols and \ params.get('iso_stream', False): @@ -344,6 +345,25 @@ class VMTemplate(object): if distro == "IBM_PowerKVM": params['slots'] = 32 + cpu_topo = self.info.get('cpu_info').get('topology') + if (cpu_topo is not None): + sockets = int(max_vcpus / (cpu_topo['cores'] * + cpu_topo['threads'])) + self.info['cpu_info']['topology']['sockets'] = sockets + + # Reduce maxvcpu to fit number of sockets if necessary + total_max_vcpu = sockets * cpu_topo['cores'] * cpu_topo['threads'] + if total_max_vcpu != max_vcpus: + max_vcpus = total_max_vcpu + + params['vcpus'] = "<vcpu current='%s'>%d</vcpu>" % \ + (params['cpus'], max_vcpus) + else: + params['vcpus'] = "<vcpu current='%s'>%d</vcpu>" % \ + (params['cpus'], max_vcpus) + + params['cpu_info'] = self._get_cpu_xml() + xml = """ <domain type='%(domain)s'> %(qemu-stream-cmdline)s @@ -351,7 +371,7 @@ class VMTemplate(object): <uuid>%(uuid)s</uuid> <maxMemory slots='%(slots)s' unit='KiB'>%(max_memory)s</maxMemory> <memory unit='MiB'>%(memory)s</memory> - <vcpu>%(cpus)s</vcpu> + %(vcpus)s %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> -- 1.9.1

3 4

[PATCH 0/5I -V4] Add multiple disks in Template, add max vcpu and topology support
by Rodrigo Trujillo 02 Dec '15

02 Dec '15

V4 - Include patch with support to max vcpu and other changes in vm backend to support cpu hot plug in the future. - Fixes vm update problem (offline update was not atomic) V3 - Addresses Aline's comments * fixes backend, API.md and API.json * fixes test cases and add new test V2 - Rebase over latest new UI patches V1 - Initial version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit *** BLURB HERE *** Rodrigo Trujillo (5): Fix Template backend create/update for multiple disks Enable create guests with multiple disks from different pools UI - Implement multiple disks support in Template edit window Test: Fix and add test related to disks in templates Update VCPU by using libvirt function src/wok/plugins/kimchi/API.json | 19 +- src/wok/plugins/kimchi/docs/API.md | 6 + src/wok/plugins/kimchi/i18n.py | 4 + src/wok/plugins/kimchi/mockmodel.py | 57 +++-- src/wok/plugins/kimchi/model/templates.py | 30 ++- src/wok/plugins/kimchi/model/vms.py | 130 +++++++++-- src/wok/plugins/kimchi/osinfo.py | 1 + src/wok/plugins/kimchi/tests/test_model.py | 13 ++ src/wok/plugins/kimchi/tests/test_rest.py | 15 +- src/wok/plugins/kimchi/tests/test_template.py | 44 +++- .../kimchi/ui/js/src/kimchi.template_edit_main.js | 246 ++++++++++----------- .../kimchi/ui/pages/template-edit.html.tmpl | 5 +- src/wok/plugins/kimchi/vmtemplate.py | 81 +++++-- 13 files changed, 425 insertions(+), 226 deletions(-) -- 2.1.0

2 17

Ginger Base has its own repository!
by Aline Manera 30 Nov '15

30 Nov '15

Hi all, As planned, Ginger Base now has its own repository: https://github.com/kimchi-project/gingerbase And it is now part of Ginger community. Please, follow the Ginger community instructions to submit patches to Ginger Base. All the Ginger Base code was removed from Kimchi repository. Please, use git-submodule to get access to the Ginger Base code through Kimchi repository. Let me know on any problem on that. Regards, Aline Manera

2 1

[PATCH V2] Fix issue 766 - Define network interface in libvirt
by Lucio Correia 30 Nov '15

30 Nov '15

When a network interface was only visible to the system and not to libvirt, libvirt throws an error when user asks a bridged network to be created using that interface, since it is not visible to libvirt. This patch adds network interface redefinition code to make it visible to libvirt, allowing the bridged network to be created. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> Changes in V2: - Daniel's review - Removed error message - Default interface type changed to 'network' in get_iface_xml --- src/wok/plugins/kimchi/i18n.py | 1 - src/wok/plugins/kimchi/model/networks.py | 25 ++++++++++++++++++++----- src/wok/plugins/kimchi/network.py | 5 +++++ src/wok/plugins/kimchi/xmlutils/interface.py | 20 ++++++++++++++++---- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index de7962a..b3414e2 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -267,7 +267,6 @@ messages = { "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), - "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), "KCHNET0026E": _("Open VSwitch bridges can only host bridged networks."), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 7f50003..403996a 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -33,6 +33,7 @@ from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml from wok.plugins.kimchi.xmlutils.network import get_no_network_config_xml @@ -240,13 +241,29 @@ class NetworksModel(object): # get xml definition of interface iface_xml = self._get_interface_desc_xml(interface) + # interface not defined in libvirt: try to define it + iface_defined = False + conn = self.conn.get() + if iface_xml is None: + try: + mac = knetwork.get_dev_macaddr(str(interface)) + iface_xml = get_iface_xml({'type': 'ethernet', + 'name': interface, + 'mac': mac, + 'startmode': "onboot"}) + conn.interfaceDefineXML(iface_xml.encode("utf-8")) + iface_defined = True + except libvirt.libvirtError, e: + raise OperationFailed("KCHNET0024E", {'name': interface, + 'err': e.get_error_message()}) + # Truncate the interface name if it exceeds 13 characters to make sure # the length of bridge name is less than 15 (its maximum value). br_name = KIMCHI_BRIDGE_PREFIX + interface[-13:] br_xml = create_linux_bridge_xml(br_name, interface, iface_xml) # drop network config from interface - self._redefine_iface_no_network(interface) + iface_defined or self._redefine_iface_no_network(interface, iface_xml) # create and start bridge self._create_bridge(br_name, br_xml) @@ -270,16 +287,14 @@ class NetworksModel(object): iface = conn.interfaceLookupByName(name) xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) except libvirt.libvirtError, e: - raise OperationFailed("KCHNET0023E", - {'name': name, 'err': e.get_error_message()}) + return None return xml - def _redefine_iface_no_network(self, name): + def _redefine_iface_no_network(self, name, iface_xml): conn = self.conn.get() # drop network config from definition of interface - iface_xml = self._get_interface_desc_xml(name) xml = get_no_network_config_xml(iface_xml.encode("utf-8")) try: diff --git a/src/wok/plugins/kimchi/network.py b/src/wok/plugins/kimchi/network.py index 1433b8a..eee0e8c 100644 --- a/src/wok/plugins/kimchi/network.py +++ b/src/wok/plugins/kimchi/network.py @@ -31,6 +31,11 @@ DefaultNetsPool = [ipaddr.IPNetwork('192.168.122.0/23'), ipaddr.IPNetwork('192.168.128.0/17')] +def get_dev_macaddr(dev): + info = ethtool.get_interfaces_info(dev)[0] + return info.mac_address + + def get_dev_netaddr(dev): info = ethtool.get_interfaces_info(dev)[0] return (info.ipv4_address and diff --git a/src/wok/plugins/kimchi/xmlutils/interface.py b/src/wok/plugins/kimchi/xmlutils/interface.py index 64df8cd..814caf9 100644 --- a/src/wok/plugins/kimchi/xmlutils/interface.py +++ b/src/wok/plugins/kimchi/xmlutils/interface.py @@ -26,15 +26,27 @@ from wok.plugins.kimchi import osinfo def get_iface_xml(params, arch=None, os_distro=None, os_version=None): """ - <interface type='network'> + <interface type='network' name='ethX'> + <start mode='onboot'/> <source network='default'/> <model type='virtio'/> </interface> """ - interface = E.interface(type=params['type']) - interface.append(E.source(network=params['network'])) + name = params.get('name', None) + if name: + interface = E.interface(type=params.get('type', 'network'), name=name) + else: + interface = E.interface(type=params.get('type', 'network')) - model = params.get('model') + stmode = params.get('startmode', None) + if stmode: + interface.append(E.start(mode=stmode)) + + nw = params.get('network', None) + if nw: + interface.append(E.source(network=nw)) + + model = params.get('model', None) # no model specified; let's try querying osinfo if model is None: -- 1.9.1

2 1

[PATCH V3 0/1] Debugreport generation
by mesmriti＠linux.vnet.ibm.com 30 Nov '15

30 Nov '15

From: Megha Smriti <mesmriti(a)linux.vnet.ibm.com> Fixed the comments as a part of which removed the check for platform s390x.Modified the log_errors to wok_log. Removed the replacement of underscore in the sosreport name and check for /usr/sbin/dbginfo.sh command in system_reports_tools. root (1): Fixed the comments for debugreports in report tool and removed the check for platform s390x and introduced wok_log errors in log_errors. src/wok/plugins/gingerbase/i18n.py | 4 +- src/wok/plugins/gingerbase/model/debugreports.py | 181 ++++++++++++++++++----- 2 files changed, 143 insertions(+), 42 deletions(-) -- 2.4.3

2 2

[PATCH] Issue 769 : kimchi dependancy update to gingerbase instead wok
by chandra＠linux.vnet.ibm.com 30 Nov '15

30 Nov '15

From: Chandra Shekhar Reddy Potula <chandra(a)linux.vnet.ibm.com> Kimchi should be pointing to gingerbase than wok, as plugin kimchi have dependeny on gingerbase common files (like disks.py) Taken care of README.md to shows png files correctly when browse it --- src/wok/plugins/kimchi/contrib/DEBIAN/control.in | 2 +- src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in | 2 +- src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in | 2 +- src/wok/plugins/kimchi/docs/README.md | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/wok/plugins/kimchi/contrib/DEBIAN/control.in b/src/wok/plugins/kimchi/contrib/DEBIAN/control.in index ba528a1..7a111ed 100644 --- a/src/wok/plugins/kimchi/contrib/DEBIAN/control.in +++ b/src/wok/plugins/kimchi/contrib/DEBIAN/control.in @@ -3,7 +3,7 @@ Version: @PACKAGE_VERSION@ Section: base Priority: optional Architecture: all -Depends: wok, +Depends: ginger-base, python-imaging, python-configobj, websockify, diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in index d1e0046..457bdb4 100644 --- a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in +++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in @@ -7,7 +7,7 @@ BuildArch: noarch Group: System Environment/Base License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz -Requires: wok +Requires: ginger-base Requires: qemu-kvm Requires: gettext Requires: libvirt diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in index 640ade9..80ca4bc 100644 --- a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in +++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in @@ -7,7 +7,7 @@ BuildArch: noarch Group: System Environment/Base License: LGPL/ASL2 Source0: %{name}-%{version}.tar.gz -Requires: wok +Requires: ginger-base Requires: kvm Requires: gettext-tools Requires: libvirt diff --git a/src/wok/plugins/kimchi/docs/README.md b/src/wok/plugins/kimchi/docs/README.md index 23db018..628d3b9 100644 --- a/src/wok/plugins/kimchi/docs/README.md +++ b/src/wok/plugins/kimchi/docs/README.md @@ -48,7 +48,7 @@ Install Dependencies **For fedora and RHEL:** - $ sudo yum install wok libvirt-python libvirt \ + $ sudo yum install ginger-base libvirt-python libvirt \ libvirt-daemon-config-network python-imaging \ qemu-kvm python-ethtool sos python-ipaddr \ nfs-utils iscsi-initiator-utils pyparted \ @@ -76,7 +76,7 @@ channel at RHN Classic or Red Hat Satellite. **For Ubuntu (Debian-based):** - $ sudo apt-get install wok python-imaging python-configobj websockify \ + $ sudo apt-get install ginger-base python-imaging python-configobj websockify \ novnc python-libvirt libvirt-bin nfs-common \ qemu-kvm python-parted python-ethtool sosreport \ xsltproc python-ipaddr python-lxml open-iscsi \ @@ -88,7 +88,7 @@ channel at RHN Classic or Red Hat Satellite. **For openSUSE:** - $ sudo zypper install wok libvirt-python libvirt \ + $ sudo zypper install ginger-base libvirt-python libvirt \ libvirt-daemon-config-network python-imaging \ kvm python-ethtool python-ipaddr nfs-client \ open-iscsi python-parted python-libguestfs \ @@ -178,13 +178,13 @@ Usage Connect your browser to https://localhost:8001. You should see a screen like: -![Wok Login Screen](/docs/kimchi-login.png) +![Wok Login Screen](docs/kimchi-login.png) Wok uses PAM to authenticate users so you can log in with the same username and password that you would use to log in to the machine itself. Once logged in you will see a screen like: -![Kimchi Guest View](/docs/kimchi-guest.png) +![Kimchi Guest View](docs/kimchi-guest.png) This shows you the list of running guests including a live screenshot of the guest session. You can use the action buttons to shutdown the guests @@ -198,7 +198,7 @@ top navigation bar. The template screen looks like: -![Kimchi Template View](/docs/kimchi-templates.png) +![Kimchi Template View](docs/kimchi-templates.png) From this view, you can change the parameters of a template or create a new template using the "+" button in the upper right corner. -- 2.4.3

2 1

[PATCH 0/2 V2] #749 Dbginfo report generation
by mesmriti＠linux.vnet.ibm.com 30 Nov '15

30 Nov '15

From: Megha Smriti <mesmriti(a)linux.vnet.ibm.com> The reveiw comments have been fixed.We have now different methods for sosreport generation and dbginfo report generation combined with sosreport for s390x platform.Modifications were made in the dbginfo.sh command such that the dbginfo reports can now be generated in the desired location. So the sosreport and dbgreport are generated in /var/tmp path and finally compressed and moved to config.path() root (1): Dbginfo report generation src/wok/plugins/gingerbase/i18n.py | 4 +- src/wok/plugins/gingerbase/model/debugreports.py | 212 ++++++++++++++++++----- 2 files changed, 167 insertions(+), 49 deletions(-) -- 2.4.3

3 4

[PATCH 0/2] Live Migration UI
by sguimaraes943＠gmail.com 27 Nov '15

27 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch addes Live Migration functionality to the new-ui. I'm attaching Socorro initial commit because I had to merge and resolve conflicts with the current new-ui version of Guests tab. The "Delete this VM when the migration is completed" checkbox is currently disabled because it wasn't working properly (trying to delete VM before migration was complete). Socorro Stoppler (1): Initial checkin for live migration UI support samhenri (1): Fixing Live Migration for the new-ui Guests tab src/wok/plugins/ginger | 2 +- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 3 +- .../kimchi/ui/js/src/kimchi.guest_livemigration.js | 109 +++++++++++++++++++++ .../plugins/kimchi/ui/js/src/kimchi.guest_main.js | 41 +++++++- .../kimchi/ui/pages/guest-migration.html.tmpl | 67 +++++++++++++ src/wok/plugins/kimchi/ui/pages/guest.html.tmpl | 3 +- src/wok/plugins/kimchi/ui/pages/i18n.json.tmpl | 2 + src/wok/plugins/kimchi/ui/pages/network.html.tmpl | 1 - 8 files changed, 219 insertions(+), 9 deletions(-) create mode 100644 src/wok/plugins/kimchi/ui/js/src/kimchi.guest_livemigration.js create mode 100644 src/wok/plugins/kimchi/ui/pages/guest-migration.html.tmpl -- 1.9.3

2 3

[PATCH 0/8] [new-ui] Ginger / Administration
by sguimaraes943＠gmail.com 27 Nov '15

27 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch adds the new-ui to Ginger. Andre Teodoro (8): Changing Collapse from Admin Screen to Bootstrap Accodion Applying new-ui at SAN Adapters Admin panel Applying new ui at Administration tab Applying new-ui at SEP Configuration Panel Applying new-ui at SEP Configuration Modal Applying new ui at Admin User Management Modal Applying new ui at Admin Backup Batch Delete Modal Fixing minor issues at Admin Backup Batch Delete Modal ui/css/src/host-admin.scss | 75 +++- ui/js/host-admin.js | 846 +++++++++++++++++++++--------------------- ui/pages/host-admin.html.tmpl | 589 +++++++++++++++++++---------- 3 files changed, 874 insertions(+), 636 deletions(-) -- 1.9.3

1 8

[PATCH 0/3] [new-ui] Guests tab and Admin SCSS
by sguimaraes943＠gmail.com 26 Nov '15

26 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch adds new-ui to Guests page and some styles for new-ui in Ginger. Andre Teodoro (1): [new-ui] Adding new-ui to Administration tab * If applied may break some jQuery-UI collapsible elements samhenri (2): Minor CSS fixes in the new-ui [new-ui] Guests tab .../plugins/kimchi/ui/css/theme-default/list.css | 330 ---------- .../plugins/kimchi/ui/js/src/kimchi.guest_main.js | 676 +++++++++++++-------- src/wok/plugins/kimchi/ui/pages/guest.html.tmpl | 125 ++-- src/wok/plugins/kimchi/ui/pages/guests.html.tmpl | 33 +- ui/css/src/modules/_administration.scss | 340 +++++++++++ ui/css/src/modules/_guests.scss | 241 ++++++++ ui/css/src/modules/_network.scss | 2 +- ui/css/src/modules/_storage.scss | 2 +- ui/css/src/modules/_wok-grid.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 9 +- ui/images/theme-default/icon-unknown.png | Bin 761 -> 3797 bytes 11 files changed, 1115 insertions(+), 645 deletions(-) delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/list.css -- 1.9.3

3 12

[PATCH 0/3] [new-ui] Guests tab and Admin SCSS v2
by sguimaraes943＠gmail.com 26 Nov '15

26 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch adds new-ui to Guests page and fixes some bugs in Templates. It also removes Administration / Ginger references from SCSS files. A patch will be sent to Ginger community with the modified files. Andre Teodoro (1): [new-ui] Removed Administration / Ginger references from WOK ui assets samhenri (2): [new-ui] Templates tab and modal windows bugfixes [new-ui] Guests tab .../plugins/kimchi/ui/css/theme-default/list.css | 330 ---------- .../plugins/kimchi/ui/js/src/kimchi.guest_main.js | 677 +++++++++++++-------- .../kimchi/ui/js/src/kimchi.template_add_main.js | 10 +- src/wok/plugins/kimchi/ui/pages/guest.html.tmpl | 122 ++-- src/wok/plugins/kimchi/ui/pages/guests.html.tmpl | 33 +- .../plugins/kimchi/ui/pages/template-add.html.tmpl | 3 +- .../plugins/kimchi/ui/pages/templates.html.tmpl | 2 +- ui/css/src/modules/_administration.scss | 0 ui/css/src/modules/_guests.scss | 237 ++++++++ ui/css/src/modules/_network.scss | 2 +- ui/css/src/modules/_storage.scss | 2 +- ui/css/src/modules/_templates.scss | 2 +- ui/css/src/modules/_wok-grid.scss | 2 +- ui/css/src/modules/_wok-variables.scss | 9 +- ui/css/src/wok.scss | 2 - ui/images/theme-default/icon-unknown.png | Bin 761 -> 3797 bytes 16 files changed, 776 insertions(+), 657 deletions(-) delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/list.css delete mode 100644 ui/css/src/modules/_administration.scss -- 1.9.3

2 4

[PATCH v2] Support Linux Bridge creation
by Ramon Medeiros 26 Nov '15

26 Nov '15

Create linux-bridge with libvirt API. Kimchi was only creating macvtap devices, with has some limitation. For further information, take a look at Kimchi wiki discuss: https://github.com/kimchi-project/kimchi/wiki/Create-guest-network Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v2: Remove unused imports and constants Fix pep8 issues Testing: In my case, i create a new bridge over the interface enp0s25 with name ramon curl -u root -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/plugins/kimchi/networks" -X POST -d '{"name": "ramon", "connection":"bridge", "interface":"enp0s25", "mode":"linux-bridge"}' To delete, you can remove by UI or: curl -u root -H "Content-Type: application/json" -H "Accept: application/json" "http://localhost:8010/plugins/kimchi/networks/ramon" -X DELETE -d '' --- src/wok/plugins/kimchi/model/networks.py | 35 ++++++++++++++++++++++++++++-- src/wok/plugins/kimchi/network.py | 19 ++++++++++++++++ src/wok/plugins/kimchi/xmlutils/network.py | 12 ++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 71ea595..c17a3bf 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -30,12 +30,13 @@ from wok.rollbackcontext import RollbackContext from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text + from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml from wok.plugins.kimchi.xmlutils.network import to_network_xml - +from wok.plugins.kimchi.xmlutils.network import create_linux_bridge KIMCHI_BRIDGE_PREFIX = 'kb' @@ -160,7 +161,10 @@ class NetworksModel(object): def _set_network_bridge(self, params): try: iface = params['interface'] - if iface in self.get_all_networks_interfaces(): + + if params["mode"] == "linux-bridge": + iface = self._create_linux_bridge(iface) + elif iface in self.get_all_networks_interfaces(): msg_args = {'iface': iface, 'network': params['name']} raise InvalidParameter("KCHNET0006E", msg_args) except KeyError: @@ -196,6 +200,33 @@ class NetworksModel(object): net_dict['bridge'] and interfaces.append(net_dict['bridge']) return interfaces + def _create_linux_bridge(self, interface): + newBridge = KIMCHI_BRIDGE_PREFIX + interface[-8:] + bridges_list = knetwork.list_bridges() + + bridges = [] + for bridge in bridges_list: + bridges.append(bridge["bridge"]) + + # bridge already exists: create new name + if newBridge in bridges: + for i in range(0, 10): + newBridge = KIMCHI_BRIDGE_PREFIX + interface[-7:] + str(i) + if newBridge not in bridges: + break + + # create linux bridge by libvirt + try: + conn = self.conn.get() + iface = conn.interfaceDefineXML(create_linux_bridge(newBridge, + interface)) + iface.create() + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0008E", + {'name': newBridge, + 'err': e.get_error_message()}) + return newBridge + def _create_vlan_tagged_bridge(self, interface, vlan_id): # Truncate the interface name if it exceeds 8 characters to make sure # the length of bridge name is less than 15 (its maximum value). diff --git a/src/wok/plugins/kimchi/network.py b/src/wok/plugins/kimchi/network.py index 1433b8a..18df281 100644 --- a/src/wok/plugins/kimchi/network.py +++ b/src/wok/plugins/kimchi/network.py @@ -21,6 +21,7 @@ import ethtool import ipaddr +from wok.utils import run_command APrivateNets = ipaddr.IPNetwork("10.0.0.0/8") BPrivateNets = ipaddr.IPNetwork("172.16.0.0/12") @@ -60,3 +61,21 @@ def get_one_free_network(used_nets, nets_pool=PrivateNets): if net: return net return None + +def list_bridges(): + # get all bridges + _, err, rc = run_command(['brctl', 'show']) + output = _.splitlines() + + # iterate over output + i = 1 + bridges = [] + while (i < len(output)): + + # get bridge name + bridges.append({"bridge": output[i].split('\t')[0], + "interface": output[i].split('\t')[5]}) + i += 1 + + return bridges + diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index c73aad9..2fdf8d4 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -120,3 +120,15 @@ def create_vlan_tagged_bridge_xml(bridge, interface, vlan_id): type='bridge', name=bridge) return ET.tostring(m) + +def create_linux_bridge(bridge, interface): + m = E.interface( + E.start(mode='onboot'), + E.bridge( + E.interface( + type='ethernet', + name=interface)), + type='bridge', + name=bridge) + return ET.tostring(m) + -- 2.1.0

3 5

[PATCH V4] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 26 Nov '15

26 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> V3 - V4: fixed get_cpus() bug for s390x V2 -V3: Changed test_host.py to check memory(Aline) added description for get_total_cpus() of lscpu(Rodrigo) V1 to V2 changes: Changed cpus and memory object to be same across all platforms(aline) Changed API.md and lookup as per review comments(aline & abhiram) As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set from Chandra will include UI changes to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine(ppc o/p will be similar to x86): curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":{ "offline":0, "online":7933902848 } } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus also includes shared and dedicated cpus for s390x split memory to show online and offline additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 18 +- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 60 ++++++ src/wok/plugins/gingerbase/model/host.py | 259 ++++++++++++++++++++++---- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 307 insertions(+), 43 deletions(-) -- 2.1.0

2 2

[PATCH 0/3] Host tab functionality split into Dashboard and Updates
by chandra＠linux.vnet.ibm.com 26 Nov '15

26 Nov '15

From: Chandra Shekhar Reddy Potula <chandra(a)linux.vnet.ibm.com> Host tab functionality split into Dashboard and Updates Splitting host tab functionality into two tabs 1. Dashboard a. restart, shutdown buttons b. statistics c. debug reports 2. Updates a. Repositories b. Software updates Ginger Base screen shot change to reflect new ui New UI screen shot shows 1. New UI page 2. Feature tab split Issue 728 : processor info displays blank for system z UI changes to accommodate the basic system info 1. memory shows online, offline memory info 2. cpu shows online, offline cpu info On s390x deidcated, shared cpu info shown 3. On s390x hypervisor, LPAR details shown Note : Stage 1, debug reports is not moved to Administration tab. Have to experiment on having single tab hosting multiple plugin features. Till that time individual tab host single plugin features. Chandra Shekhar Reddy Potula (3): Host tab functionality split into Dashboard and Updates Ginger Base screen shot change to reflect new ui Issue 728 : processor info displays blank for system z .../gingerbase/docs/gingerbase-host-tab.png | Bin 79669 -> 105906 bytes src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 10 +- .../gingerbase/ui/css/src/modules/_host.scss | 9 +- .../ui/js/src/gingerbase.host-dashboard.js | 614 ++++++++++++++ .../gingerbase/ui/js/src/gingerbase.host-update.js | 405 +++++++++ .../gingerbase/ui/js/src/gingerbase.host.js | 928 --------------------- .../gingerbase/ui/pages/host-dashboard.html.tmpl | 143 ++++ .../gingerbase/ui/pages/host-update.html.tmpl | 90 ++ src/wok/plugins/gingerbase/ui/pages/host.html.tmpl | 156 ---- 9 files changed, 1265 insertions(+), 1090 deletions(-) create mode 100644 src/wok/plugins/gingerbase/ui/js/src/gingerbase.host-dashboard.js create mode 100644 src/wok/plugins/gingerbase/ui/js/src/gingerbase.host-update.js delete mode 100644 src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js create mode 100644 src/wok/plugins/gingerbase/ui/pages/host-dashboard.html.tmpl create mode 100644 src/wok/plugins/gingerbase/ui/pages/host-update.html.tmpl delete mode 100644 src/wok/plugins/gingerbase/ui/pages/host.html.tmpl -- 2.4.0

2 6

[PATCH] Issue 769 : kimchi dependancy update to gingerbase instead wok
by chandra＠linux.vnet.ibm.com 26 Nov '15

26 Nov '15

From: Chandra Shekhar Reddy Potula <chandra(a)linux.vnet.ibm.com> Kimchi should be pointing to gingerbase than wok, as plugin kimchi have dependeny on gingerbase common files (like disks.py) All the spec file changes to reflect the dependancy as gingerbase Update the README.md to relect the dependancy as gingerbase Taken care of README.md to shows png files correctly when browse it Chandra Shekhar Reddy Potula (1): Issue 769 : kimchi dependancy update to gingerbase instead wok src/wok/plugins/kimchi/contrib/DEBIAN/control.in | 2 +- src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in | 2 +- src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in | 2 +- src/wok/plugins/kimchi/docs/README.md | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) -- 2.4.3

1 0

[PATCH] [new-ui] Added SCSS assets
by sguimaraes943＠gmail.com 26 Nov '15

26 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch updates the UI build process to use python-libsass to compile SCSS files. It also includes the latest changes in the new-ui CSS (these changes will only take effect only when the patches for each panel is sent to the ML and ginger.css and host-admin.css were deleted from local branch) samhenri (1): [new-ui] Added SCSS assets .gitignore | 1 + ui/css/Makefile.am | 12 +- ui/css/ginger.css | 1 - ui/css/host-admin.css | 586 ------------------------------- ui/css/src/ginger.scss | 1 + ui/css/src/host-admin.scss | 595 ++++++++++++++++++++++++++++++++ ui/css/src/modules/_administration.scss | 372 ++++++++++++++++++++ 7 files changed, 976 insertions(+), 592 deletions(-) delete mode 100644 ui/css/ginger.css delete mode 100644 ui/css/host-admin.css create mode 100644 ui/css/src/ginger.scss create mode 100644 ui/css/src/host-admin.scss create mode 100644 ui/css/src/modules/_administration.scss -- 1.9.3

1 1

[PATCH] Fix issue 766 - Define network interface in libvirt
by Lucio Correia 26 Nov '15

26 Nov '15

When a network interface was only visible to the system and not to libvirt, libvirt throws an error when user asks a bridged network to be created using that interface, since it is not visible to libvirt. This patch adds network interface redefinition code to make it visible to libvirt, allowing the bridged network to be created. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/networks.py | 40 +++++++++++++++------------- src/wok/plugins/kimchi/network.py | 5 ++++ src/wok/plugins/kimchi/xmlutils/interface.py | 20 +++++++++++--- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 7f50003..25640a4 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -33,6 +33,7 @@ from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml from wok.plugins.kimchi.xmlutils.network import get_no_network_config_xml @@ -237,8 +238,23 @@ class NetworksModel(object): 'err': e.get_error_message()}) def _create_linux_bridge(self, interface): - # get xml definition of interface - iface_xml = self._get_interface_desc_xml(interface) + iface_defined = False + try: + # get xml definition of configured interface + conn = self.conn.get() + iface = conn.interfaceLookupByName(interface) + iface_xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) + except libvirt.libvirtError, e: + try: + # try to define that interface in libvirt + mac = knetwork.get_dev_macaddr(str(interface)) + iface_xml = get_iface_xml({'name': interface, 'mac': mac, + 'startmode': "onboot"}) + conn.interfaceDefineXML(iface_xml.encode("utf-8")) + iface_defined = True + except libvirt.libvirtError, e: + raise OperationFailed("KCHNET0023E", {'name': interface, + 'err': e.get_error_message()}) # Truncate the interface name if it exceeds 13 characters to make sure # the length of bridge name is less than 15 (its maximum value). @@ -246,7 +262,7 @@ class NetworksModel(object): br_xml = create_linux_bridge_xml(br_name, interface, iface_xml) # drop network config from interface - self._redefine_iface_no_network(interface) + iface_defined or self._redefine_iface_no_network(interface, iface_xml) # create and start bridge self._create_bridge(br_name, br_xml) @@ -263,27 +279,13 @@ class NetworksModel(object): return br_name - def _get_interface_desc_xml(self, name): - conn = self.conn.get() - - try: - iface = conn.interfaceLookupByName(name) - xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) - except libvirt.libvirtError, e: - raise OperationFailed("KCHNET0023E", - {'name': name, 'err': e.get_error_message()}) - - return xml - - def _redefine_iface_no_network(self, name): - conn = self.conn.get() - + def _redefine_iface_no_network(self, name, iface_xml): # drop network config from definition of interface - iface_xml = self._get_interface_desc_xml(name) xml = get_no_network_config_xml(iface_xml.encode("utf-8")) try: # redefine interface + conn = self.conn.get() conn.interfaceDefineXML(xml.encode("utf-8")) except libvirt.libvirtError as e: raise OperationFailed("KCHNET0024E", {'name': name, diff --git a/src/wok/plugins/kimchi/network.py b/src/wok/plugins/kimchi/network.py index 1433b8a..eee0e8c 100644 --- a/src/wok/plugins/kimchi/network.py +++ b/src/wok/plugins/kimchi/network.py @@ -31,6 +31,11 @@ DefaultNetsPool = [ipaddr.IPNetwork('192.168.122.0/23'), ipaddr.IPNetwork('192.168.128.0/17')] +def get_dev_macaddr(dev): + info = ethtool.get_interfaces_info(dev)[0] + return info.mac_address + + def get_dev_netaddr(dev): info = ethtool.get_interfaces_info(dev)[0] return (info.ipv4_address and diff --git a/src/wok/plugins/kimchi/xmlutils/interface.py b/src/wok/plugins/kimchi/xmlutils/interface.py index 64df8cd..7730407 100644 --- a/src/wok/plugins/kimchi/xmlutils/interface.py +++ b/src/wok/plugins/kimchi/xmlutils/interface.py @@ -26,15 +26,27 @@ from wok.plugins.kimchi import osinfo def get_iface_xml(params, arch=None, os_distro=None, os_version=None): """ - <interface type='network'> + <interface type='network' name='ethX'> + <start mode='onboot'/> <source network='default'/> <model type='virtio'/> </interface> """ - interface = E.interface(type=params['type']) - interface.append(E.source(network=params['network'])) + name = params.get('name', None) + if name: + interface = E.interface(type=params.get('type', 'ethernet'), name=name) + else: + interface = E.interface(type=params.get('type', 'ethernet')) - model = params.get('model') + stmode = params.get('startmode', None) + if stmode: + interface.append(E.start(mode=stmode)) + + nw = params.get('network', None) + if nw: + interface.append(E.source(network=nw)) + + model = params.get('model', None) # no model specified; let's try querying osinfo if model is None: -- 1.9.1

2 2

[PATCH] Live Migration UI Support
by Socorro Stoppler 26 Nov '15

26 Nov '15

TODO: - Error-handling - Text not in i18n - Getting data from user input in UI to be passed in to backend There are places in kimchi.guest_main.js that I've tagged with //TODO I've tested migrateGuest (in kimchi.api.js) by using hard-coded values to be passed in to the backend so I know that API works. Hopefully just minimal modifications are needed for the actual panel itself. The main piece missing is the user input from UI to be passed into the backend. Socorro Stoppler (1): Initial checkin for live migration UI support src/wok/plugins/ginger | 2 +- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 3 +- .../plugins/kimchi/ui/js/src/kimchi.guest_main.js | 46 ++++++++++++++- .../kimchi/ui/pages/guest-migration.html.tmpl | 65 ++++++++++++++++++++++ src/wok/plugins/kimchi/ui/pages/guest.html.tmpl | 1 + 5 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 src/wok/plugins/kimchi/ui/pages/guest-migration.html.tmpl -- 1.9.1

3 3

[PATCH v2] Add checking for UI codes when running make check-local
by Ramon Medeiros 26 Nov '15

26 Nov '15

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Changes: v2: Add Copyright text Use diff to expose ui codes not used --- Makefile.am | 1 + check_ui_code_errors.sh | 31 ++++++++++++++++++++++++++ src/wok/plugins/kimchi/Makefile.am | 2 +- src/wok/plugins/kimchi/check_ui_code_errors.sh | 31 ++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/vms.py | 6 ++--- 5 files changed, 67 insertions(+), 4 deletions(-) create mode 100755 check_ui_code_errors.sh create mode 100755 src/wok/plugins/kimchi/check_ui_code_errors.sh diff --git a/Makefile.am b/Makefile.am index 027344f..106a577 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ check-local: $(PEP8) --version $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" . + /bin/bash check_ui_code_errors.sh # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/check_ui_code_errors.sh b/check_ui_code_errors.sh new file mode 100755 index 0000000..58e5990 --- /dev/null +++ b/check_ui_code_errors.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# 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 + +errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'WOK[0-9A-Z]*'| sort)" +uiErrors="$(grep -Ro 'WOK[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" + +# all errors on i18n are present in js/html files: success +if [ "$errors" == "$uiErrors" ]; then + echo "UI errors codes are correct" +else + echo "Error while checking UI errors codes." + diff <(echo "$errors" ) <(echo "$uiErrors") +fi diff --git a/src/wok/plugins/kimchi/Makefile.am b/src/wok/plugins/kimchi/Makefile.am index 8a55b23..250dc83 100644 --- a/src/wok/plugins/kimchi/Makefile.am +++ b/src/wok/plugins/kimchi/Makefile.am @@ -65,7 +65,7 @@ check-local: $(PEP8) --version $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" . - + ./check_ui_code_errors.sh # Link built mo files in the source tree to enable use of translations from # within the source tree diff --git a/src/wok/plugins/kimchi/check_ui_code_errors.sh b/src/wok/plugins/kimchi/check_ui_code_errors.sh new file mode 100755 index 0000000..e44c688 --- /dev/null +++ b/src/wok/plugins/kimchi/check_ui_code_errors.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# 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 + +errors="$(cat ui/pages/i18n.json.tmpl | grep -o 'KCH[0-9A-Z]*'| sort)" +uiErrors="$(grep -Ro 'KCH[0-9A-Z]*' ui/js/ | cut -d: -f2 | sort| uniq)" + +# all errors on i18n are present in js/html files: success +if [ "$errors" == "$uiErrors" ]; then + echo "UI errors codes are correct" +else + echo "Error while checking UI errors codes." + diff <(echo "$errors" ) <(echo "$uiErrors") +fi diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py index 7e12b91..366f1b4 100644 --- a/src/wok/plugins/kimchi/model/vms.py +++ b/src/wok/plugins/kimchi/model/vms.py @@ -1520,9 +1520,9 @@ class VMModel(object): def migration_pre_check(self, remote_host, user, password): self._check_if_host_not_localhost(remote_host) self._check_if_password_less_login_enabled( - remote_host, - user, - password + remote_host, + user, + password ) self._check_if_migrating_same_arch_hypervisor(remote_host, user) -- 2.1.0

2 1

[PATCH] Add OVS bridges recognition support
by Lucio Correia 26 Nov '15

26 Nov '15

In some distributions, i.e. Fedora, the directories "bridge" and "brif" are not created for OVS bridges, and they are the method Kimchi uses to detect bridges. This patch fixes that by recognizing OVS bridges through OVS commands, allowing networks to be created using OVS bridges in those distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/networks.py | 2 +- src/wok/plugins/kimchi/netinfo.py | 55 ++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 71ea595..d78b88e 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -167,7 +167,7 @@ class NetworksModel(object): raise MissingParameter("KCHNET0004E", {'name': params['name']}) self._ensure_iface_up(iface) - if netinfo.is_bridge(iface): + if netinfo.is_bridge(iface) or netinfo.is_ovs_bridge(iface): if 'vlan_id' in params: raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface diff --git a/src/wok/plugins/kimchi/netinfo.py b/src/wok/plugins/kimchi/netinfo.py index c5746d7..f210da8 100644 --- a/src/wok/plugins/kimchi/netinfo.py +++ b/src/wok/plugins/kimchi/netinfo.py @@ -21,6 +21,8 @@ import ethtool import glob import os +from distutils.spawn import find_executable +from wok.utils import run_command NET_PATH = '/sys/class/net' NIC_PATH = '/sys/class/net/*/device' @@ -79,6 +81,39 @@ def bridges(): def is_bridge(iface): return iface in bridges() +# OVS bridges need special handling because in some distributions, like Fedora, +# the files bridge and brif are not created under /sys/class/net/<ovsbridge>. +def ovs_bridges(): + ovs_cmd = find_executable("ovs-vsctl") + + # OVS not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-br']) + if rc != 0 or len(out) == 0: + return [] + + return list(set(out.split('\n')) - set([''])) + + +def is_ovs_bridge(iface): + return iface in ovs_bridges() + + +def ovs_bridge_ports(ovsbr): + ovs_cmd = find_executable("ovs-vsctl") + + # OVS not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-ports', ovsbr]) + if rc != 0 or len(out) == 0: + return [] + + return list(set(out.split('\n')) - set([''])) + def all_interfaces(): return [d.rsplit("/", 1)[-1] for d in glob.glob(NET_PATH + '/*')] @@ -91,7 +126,12 @@ def slaves(bonding): def ports(bridge): - return os.listdir(BRIDGE_PORTS % bridge) + if bridge in bridges(): + return os.listdir(BRIDGE_PORTS % bridge) + elif bridge in ovs_bridges(): + return ovs_bridge_ports(bridge) + + raise ValueError('unknown bridge %s' % bridge) def is_brport(nic): @@ -136,9 +176,11 @@ def get_vlan_device(vlan): def get_bridge_port_device(bridge): """Return the nics list that belongs to bridge.""" - # br --- v --- bond --- nic1 - if bridge not in bridges(): + + if bridge not in bridges() and bridge not in ovs_bridges(): raise ValueError('unknown bridge %s' % bridge) + + # br --- v --- bond --- nic1 nics = [] for port in ports(bridge): if port in vlans(): @@ -155,9 +197,10 @@ def get_bridge_port_device(bridge): def aggregated_bridges(): - return [bridge for bridge in bridges() if - (set(get_bridge_port_device(bridge)) & set(nics()))] + all_bridges = list(set(bridges() + ovs_bridges())) + return [bridge for bridge in all_bridges if + (set(get_bridge_port_device(bridge)) & set(nics()))] def bare_nics(): "The nic is not a port of a bridge or a slave of bond." @@ -184,7 +227,7 @@ def get_interface_type(iface): return "nic" if is_bonding(iface): return "bonding" - if is_bridge(iface): + if is_bridge(iface) or is_ovs_bridge(iface): return "bridge" if is_vlan(iface): return "vlan" -- 1.9.1

3 3

[PATCH V3] Support Linux Bridge creation
by Lucio Correia 26 Nov '15

26 Nov '15

From: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> This commit adds a new option to bridged network creation API: "macvtap". When it is chosen, the usual behavior for option "bridge" will be applied. This commit also changes the behavior for the already existing "bridge" option. Now, when that option is chosen, a Linux bridge will be created, not a macvtap one. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> V3: - applied code review (including API change) Test case results in ubuntu (no additional error added): MASTER: Ran 108 tests in 340.323s FAILED (failures=2, errors=2, skipped=7) This branch: Ran 110 tests in 344.527s FAILED (failures=2, errors=2, skipped=7) IMPORTANT: This patch only changes backend. UI needs to be adapted in a further patch. --- src/wok/plugins/kimchi/API.json | 2 +- src/wok/plugins/kimchi/docs/API.md | 11 +- src/wok/plugins/kimchi/i18n.py | 5 +- src/wok/plugins/kimchi/model/networks.py | 114 +++++++++++++++------ src/wok/plugins/kimchi/tests/test_mock_network.py | 16 ++- src/wok/plugins/kimchi/tests/test_model_network.py | 2 + src/wok/plugins/kimchi/tests/test_networkxml.py | 24 +++++ src/wok/plugins/kimchi/xmlutils/network.py | 25 +++++ 8 files changed, 161 insertions(+), 38 deletions(-) diff --git a/src/wok/plugins/kimchi/API.json b/src/wok/plugins/kimchi/API.json index 961f35f..5b86ee1 100644 --- a/src/wok/plugins/kimchi/API.json +++ b/src/wok/plugins/kimchi/API.json @@ -342,7 +342,7 @@ "connection": { "description": "Specifies how this network should be connected to the other networks", "type": "string", - "pattern": "^isolated|nat|bridge$", + "pattern": "^isolated|nat|bridge|macvtap$", "required": true, "error": "KCHNET0012E" }, diff --git a/src/wok/plugins/kimchi/docs/API.md b/src/wok/plugins/kimchi/docs/API.md index 52368b7..6cbe913 100644 --- a/src/wok/plugins/kimchi/docs/API.md +++ b/src/wok/plugins/kimchi/docs/API.md @@ -623,13 +623,16 @@ A interface represents available interface on host. networks visible to this host. * isolated: Create a private, isolated virtual network. * nat: Outgoing traffic will be routed through the host. - * bridge: All traffic on this network will be bridged through the indicated - interface. + * macvtap: All traffic on this network will be bridged through the + specified interface. + * bridge: All traffic on this network will be bridged through a Linux + bridged, which is created upon specified interface in case + it is not already a Linux bridge. * subnet *(optional)*: Network segment in slash-separated format with ip address and prefix or netmask used to create nat network. * interface *(optional)*: The name of a network interface on the host. - For bridge network, the interface can be a bridge or nic/bonding - device. + For "macvtap" and "bridge" connections, the + interface can be a nic, bridge or bonding device. * vlan_id *(optional)*: VLAN tagging ID for the bridge network. ### Resource: Network diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index 59b61de..8de3a19 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -242,7 +242,7 @@ messages = { "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"), "KCHNET0010E": _("The interface %(iface)s already exists."), "KCHNET0011E": _("Network name must be a string without slashes (/) or quotes (\")"), - "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"), + "KCHNET0012E": _("Supported network types are isolated, NAT, macvtap and bridge"), "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"), "KCHNET0014E": _("Network interface must be a string"), "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"), @@ -253,6 +253,9 @@ messages = { "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), + "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), + "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), + "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 71ea595..54cb0ea 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -21,19 +21,21 @@ import ipaddr import libvirt import sys import time +from libvirt import VIR_INTERFACE_XML_INACTIVE from xml.sax.saxutils import escape from wok.config import PluginPaths from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.rollbackcontext import RollbackContext from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml +from wok.plugins.kimchi.xmlutils.network import get_no_network_config_xml from wok.plugins.kimchi.xmlutils.network import to_network_xml @@ -90,7 +92,7 @@ class NetworksModel(object): self._set_network_subnet(params) # only bridge network need bridge(linux bridge) or interface(macvtap) - if connection == 'bridge': + if connection in ['bridge', 'macvtap']: self._set_network_bridge(params) params['name'] = escape(params['name']) @@ -159,6 +161,7 @@ class NetworksModel(object): def _set_network_bridge(self, params): try: + # fails if host interface is already in use by a libvirt network iface = params['interface'] if iface in self.get_all_networks_interfaces(): msg_args = {'iface': iface, 'network': params['name']} @@ -166,11 +169,23 @@ class NetworksModel(object): except KeyError: raise MissingParameter("KCHNET0004E", {'name': params['name']}) + # Linux bridges cannot be the trunk device of a VLAN + if 'vlan_id' in params and \ + (netinfo.is_bridge(iface) or params['connection'] == "bridge"): + raise InvalidParameter('KCHNET0019E', {'name': iface}) + + # User specified bridge interface, simply use it self._ensure_iface_up(iface) if netinfo.is_bridge(iface): - if 'vlan_id' in params: - raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface + + # User wants Linux bridge network, but didn't specify bridge interface + elif params['connection'] == "bridge": + # create Linux bridge interface first and use it as actual iface + iface = self._create_linux_bridge(iface) + params['bridge'] = iface + + # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: params['forward']['dev'] = iface @@ -190,42 +205,79 @@ class NetworksModel(object): xml = network.XMLDesc(0) net_dict = NetworkModel.get_network_from_xml(xml) forward = net_dict['forward'] - (forward['mode'] == 'bridge' and forward['interface'] and + (forward['mode'] == 'macvtap' and forward['interface'] and interfaces.append(forward['interface'][0]) is None or interfaces.extend(forward['interface'] + forward['pf'])) net_dict['bridge'] and interfaces.append(net_dict['bridge']) return interfaces + def _create_bridge(self, name, xml): + conn = self.conn.get() + + # check if name exists + if name in netinfo.all_interfaces(): + raise InvalidOperation("KCHNET0010E", {'iface': name}) + + # create bridge through libvirt + try: + bridge = conn.interfaceDefineXML(xml) + bridge.create() + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0025E", {'name': name, + 'err': e.get_error_message()}) + + def _create_linux_bridge(self, interface): + # get xml definition of interface + iface_xml = self._get_interface_desc_xml(interface) + + # Truncate the interface name if it exceeds 13 characters to make sure + # the length of bridge name is less than 15 (its maximum value). + br_name = KIMCHI_BRIDGE_PREFIX + interface[-13:] + br_xml = create_linux_bridge_xml(br_name, interface, iface_xml) + + # drop network config from interface + self._redefine_iface_no_network(interface) + + # create and start bridge + self._create_bridge(br_name, br_xml) + + return br_name + def _create_vlan_tagged_bridge(self, interface, vlan_id): # Truncate the interface name if it exceeds 8 characters to make sure # the length of bridge name is less than 15 (its maximum value). br_name = KIMCHI_BRIDGE_PREFIX + interface[-8:] + '-' + vlan_id br_xml = create_vlan_tagged_bridge_xml(br_name, interface, vlan_id) + + self._create_bridge(br_name, br_xml) + + return br_name + + def _get_interface_desc_xml(self, name): conn = self.conn.get() - bridges = [] - for net in conn.listAllNetworks(): - # Bridged networks do not have a bridge name - # So in those cases, libvirt raises an error when trying to get - # the bridge name - try: - bridges.append(net.bridgeName()) - except libvirt.libvirtError, e: - wok_log.error(e.message) + try: + iface = conn.interfaceLookupByName(name) + xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) + except libvirt.libvirtError, e: + raise OperationFailed("KCHNET0023E", + {'name': name, 'err': e.get_error_message()}) - if br_name in bridges: - raise InvalidOperation("KCHNET0010E", {'iface': br_name}) + return xml - with RollbackContext() as rollback: - try: - vlan_tagged_br = conn.interfaceDefineXML(br_xml, 0) - rollback.prependDefer(vlan_tagged_br.destroy) - vlan_tagged_br.create(0) - except libvirt.libvirtError as e: - raise OperationFailed(e.message) - else: - return br_name + def _redefine_iface_no_network(self, name): + conn = self.conn.get() + # drop network config from definition of interface + iface_xml = self._get_interface_desc_xml(name) + xml = get_no_network_config_xml(iface_xml.encode("utf-8")) + + try: + # redefine interface + iface = conn.interfaceDefineXML(xml.encode("utf-8")) + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0024E", {'name': name, + 'err': e.get_error_message()}) class NetworkModel(object): def __init__(self, **kargs): @@ -243,10 +295,12 @@ class NetworkModel(object): connection = forward['mode'] or "isolated" # FIXME, if we want to support other forward mode well. - if connection == 'bridge': - # macvtap bridge + # macvtap + if connection == 'macvtap': interface = interface or forward['interface'][0] - # exposing the network on linux bridge or macvtap interface + + # exposing the network on Linux bridge or macvtap interface + if connection in ['bridge', 'macvtap']: interface_subnet = knetwork.get_dev_netaddr(interface) subnet = subnet if subnet else interface_subnet @@ -333,7 +387,7 @@ class NetworkModel(object): if network.isActive(): raise InvalidOperation("KCHNET0005E", {'name': name}) - self._remove_vlan_tagged_bridge(network) + self._remove_bridge(network) network.undefine() @staticmethod @@ -369,7 +423,7 @@ class NetworkModel(object): 'interface': forward_if, 'pf': forward_pf}} - def _remove_vlan_tagged_bridge(self, network): + def _remove_bridge(self, network): try: bridge = network.bridgeName() except libvirt.libvirtError: diff --git a/src/wok/plugins/kimchi/tests/test_mock_network.py b/src/wok/plugins/kimchi/tests/test_mock_network.py index 4e2a939..e47f8ec 100644 --- a/src/wok/plugins/kimchi/tests/test_mock_network.py +++ b/src/wok/plugins/kimchi/tests/test_mock_network.py @@ -68,6 +68,18 @@ class MockNetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] - _do_network_test(self, model, {'name': u'bridge-network', - 'connection': 'bridge', + _do_network_test(self, model, {'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface, 'vlan_id': 987}) + + def test_linux_bridge(self): + # Verify the current system has at least one interface to create a + # bridged network + interfaces = json.loads( + self.request('/plugins/kimchi/interfaces?type=nic').read() + ) + if len(interfaces) > 0: + iface = interfaces[0]['name'] + _do_network_test(self, model, {'name': u'bridged-network', + 'connection': 'bridge', + 'interface': iface}) diff --git a/src/wok/plugins/kimchi/tests/test_model_network.py b/src/wok/plugins/kimchi/tests/test_model_network.py index e4cf5ef..aad8a95 100644 --- a/src/wok/plugins/kimchi/tests/test_model_network.py +++ b/src/wok/plugins/kimchi/tests/test_model_network.py @@ -142,6 +142,8 @@ class NetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] + networks.append({'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface}) networks.append({'name': u'bridge-network', 'connection': 'bridge', 'interface': iface}) diff --git a/src/wok/plugins/kimchi/tests/test_networkxml.py b/src/wok/plugins/kimchi/tests/test_networkxml.py index a64b6c2..e9485a8 100644 --- a/src/wok/plugins/kimchi/tests/test_networkxml.py +++ b/src/wok/plugins/kimchi/tests/test_networkxml.py @@ -170,3 +170,27 @@ class InterfaceXmlTests(unittest.TestCase): """ actual_xml = nxml.create_vlan_tagged_bridge_xml('br10', 'em1', '10') self.assertEquals(actual_xml, utils.normalize_xml(expected_xml)) + + def test_linux_bridge_no_ip(self): + em1_xml = """ + <interface type='ethernet' name='em1'> + <start mode='onboot'/> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + expected_xml = """ + <interface type='bridge' name='br10'> + <start mode='onboot'/> + <bridge> + <interface type='ethernet' name='em1' /> + </bridge> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + actual_xml = nxml.create_linux_bridge_xml('br10', 'em1', + utils.normalize_xml(em1_xml)) + self.assertEquals(actual_xml, utils.normalize_xml(expected_xml)) diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index c73aad9..14c7e13 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -120,3 +120,28 @@ def create_vlan_tagged_bridge_xml(bridge, interface, vlan_id): type='bridge', name=bridge) return ET.tostring(m) + +def create_linux_bridge_xml(bridge, interface, iface_xml): + m = E.interface( + E.start(mode='onboot'), + E.bridge( + E.interface( + type='ethernet', + name=interface)), + type='bridge', + name=bridge) + + # use same network configuration of lower interface + iface = ET.fromstring(iface_xml) + for element in iface.iter("protocol"): + m.append(element) + + return ET.tostring(m) + +def get_no_network_config_xml(iface_xml): + # remove all protocol elements from interface xml + xml = ET.fromstring(iface_xml) + for element in xml.iter("protocol"): + element.getparent().remove(element) + + return ET.tostring(xml) -- 1.9.1

2 4

[PATCH V3] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 26 Nov '15

26 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> V2 -V3: Changed test_host.py to check memory(Aline) added description for get_total_cpus() of lscpu(Rodrigo) V1 to V2 changes: Changed cpus and memory object to be same across all platforms(aline) Changed API.md and lookup as per review comments(aline & abhiram) As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set from Chandra will include UI changes to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine(ppc o/p will be similar to x86): curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":{ "offline":0, "online":7933902848 } } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus also includes shared and dedicated cpus for s390x split memory to show online and offline additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 18 +- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 60 ++++++ src/wok/plugins/gingerbase/model/host.py | 259 ++++++++++++++++++++++---- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 307 insertions(+), 43 deletions(-) -- 2.1.0

3 4

[PATCH V2] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 26 Nov '15

26 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> V1 to V2 changes: Changed cpus and memory object to be same across all platforms(aline) Changed API.md and lookup as per review comments(aline & abhiram) As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set for UI changes will follow to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine(ppc o/p will be similar to x86): curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":{ "offline":0, "online":7933902848 } } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus also includes shared and dedicated cpus for s390x split memory to show online and offline additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 18 +- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 60 ++++++ src/wok/plugins/gingerbase/model/host.py | 259 ++++++++++++++++++++++---- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 307 insertions(+), 43 deletions(-) -- 2.1.0

5 8

Fwd: Re: [PATCH] Dbginfo report generation
by Megha Smriti 26 Nov '15

26 Nov '15

-------- Forwarded Message -------- Subject: Re: [PATCH] Dbginfo report generation Date: Wed, 25 Nov 2015 11:27:20 +0530 From: Megha Smriti <mesmriti(a)linux.vnet.ibm.com> To: Aline Manera <alinefm(a)linux.vnet.ibm.com> Hi Aline, Please find my comments inline and few suggestions. Thanks & Regards, Megha Smriti On 17/11/2015 20:05, mesmriti(a)linux.vnet.ibm.com wrote: > From: root <root(a)localhost.localdomain> > > Signed-off-by: root <root(a)localhost.localdomain> > --- > src/wok/plugins/gingerbase/i18n.py | 4 +- > src/wok/plugins/gingerbase/model/debugreports.py | 212 > ++++++++++++++++++----- > 2 files changed, 167 insertions(+), 49 deletions(-) > > diff --git a/src/wok/plugins/gingerbase/i18n.py > b/src/wok/plugins/gingerbase/i18n.py > index af75c70..6ff783b 100644 > --- a/src/wok/plugins/gingerbase/i18n.py > +++ b/src/wok/plugins/gingerbase/i18n.py > @@ -36,7 +36,9 @@ messages = { > "GGBDR0007E": _("Debug report name must be a string. Only > letters, digits, underscore ('_') and " > "hyphen ('-') are allowed."), > "GGBDR0008E": _("The debug report with specified name > \"%(name)s\" already exists. Please use another one."), > - > + "GGBDR0009E": _("Unable to create dbginfo report with > %(retcode)s. Details: %(err)s"), > + "GGBDR0010E": _("Unable to compress the final debug report tar > file with %(retcode)s. Details: %(error)s"), > + "GGBDR0011E": _("Unable to generate final debug report %(name)s. > Details: %(err)s"), > "GGBHOST0001E": _("Unable to shutdown host machine as there are > running virtual machines"), > "GGBHOST0002E": _("Unable to reboot host machine as there are > running virtual machines"), > "GGBHOST0003E": _("There may be virtual machines running on the > host"), > diff --git a/src/wok/plugins/gingerbase/model/debugreports.py > b/src/wok/plugins/gingerbase/model/debugreports.py > index 94ab7fe..927e173 100644 > --- a/src/wok/plugins/gingerbase/model/debugreports.py > +++ b/src/wok/plugins/gingerbase/model/debugreports.py > @@ -19,13 +19,14 @@ > # 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 fnmatch > import glob > import logging > import os > import shutil > import subprocess > import time > +import platform > +import re > > from wok.exception import InvalidParameter, NotFoundError, > OperationFailed > from wok.exception import WokException > @@ -71,54 +72,109 @@ class DebugReportsModel(object): > raise OperationFailed("GGBDR0002E") > > @staticmethod > - def sosreport_generate(cb, name): > + def debugreport_generate(cb, name): > def log_error(e): > log = logging.getLogger('Model') > log.warning('Exception in generating debug file: %s', e) I know it is already there prior to your patch, but we should use wok_log to log the errors. This special wrapper can be removed. I will incorporate this in my next patch > try: > - command = ['sosreport', '--batch', '--name=%s' % name] > - output, error, retcode = run_command(command) > - > - if retcode != 0: > - raise OperationFailed("GGBDR0003E", {'name': name, > - 'err': retcode}) > - > - # SOSREPORT might create file in /tmp or /var/tmp > - # FIXME: The right way should be passing the tar.xz file > directory > - # though the parameter '--tmp-dir', but it is failing in > Fedora 20 > - patterns = ['/tmp/sosreport-%s-*', > '/var/tmp/sosreport-%s-*'] > - reports = [] > - reportFile = None > - for p in patterns: > - reports = reports + [f for f in glob.glob(p % name)] > - for f in reports: > - if not fnmatch.fnmatch(f, '*.md5'): > - reportFile = f > - break > - # Some error in sosreport happened > - if reportFile is None: > - wok_log.error('Debug report file not found. See > sosreport ' > - 'output for detail:\n%s', output) > - fname = (patterns[0] % name).split('/')[-1] > - raise OperationFailed('GGBDR0004E', {'name': fname}) > - > - md5_report_file = reportFile + '.md5' > - report_file_extension = '.' + reportFile.split('.', 1)[1] > + # Sosreport generation > + sosreport_file = sosreport_collection(name) > + md5_report_file = sosreport_file + '.md5' > + report_file_extension = '.' + sosreport_file.split('.', > 1)[1] > + # If the platform is a system Z machine. > + if platform.machine().startswith('s390'): The debugreport_generate() function will be called only if the system has the dbginfo command So you don't need to rely in the system arch to decide on that. So the 'if' statement above can be safely removed. Will take care of this in my next patch. > + path_debugreport = '/var/tmp/' > + dbgreport_regex = '(\S+\s+)(' + path_debugreport + \ > + 'DBGINFO-[\d+]{4}-[\d+]{2}' \ > + '-[\d+]{2}-[\d+]{2}-[\d+]{2}' \ > + '-[\d+]{2}-\w+-\d+\S+)(\s+\S+)' > + command = ['/usr/sbin/dbginfo.sh', '-d', > path_debugreport] > + output, error, retcode = run_command(command) > + if retcode != 0: > + raise OperationFailed("GGBDR0009E", > + {'retcode': retcode, 'err': > error}) > + output = output.splitlines() > + dbginfo_report = None > + for line in output: > + line = line.strip() > + n = re.match(dbgreport_regex, line) > + if n: > + dbginfo_report = n.groups()[1] > + break > + final_tar_report_name = name + report_file_extension > + if dbginfo_report is not None: > + sosreport_tar = sosreport_file.split('/', 3)[3] > + dbginfo_tar = dbginfo_report.split('/', 3)[3] > + msg = 'Compressing the sosreport and debug info > files into ' \ > + 'final report file' > + wok_log.info(msg) > + # Compressing the sosreport and dbginfo reports > into one > + # tar file > + command = ['tar', '-cvzf', '%s' % > final_tar_report_name, > + '-C', path_debugreport, dbginfo_tar, > + sosreport_tar] You can use final_tar_report_name with the right debug report location to avoid need to move the file after that. Instead of the direct location compressing it would be good to do in var/tmp and then moving it to target directory rather trying to do any operation on the target directory. In some cases if developer makes a mistake it is possible that previous reports might get deleted . Please correct me if any other suggestions. > + output, error, retcode = run_command(command) > + if retcode != 0: > + raise OperationFailed("GGBDR0010E", > + {'retcode': retcode, > + 'error': error}) > + path = config.get_debugreports_path() > + dbg_target = os.path.join(path, > + name + > report_file_extension) Use the dbg_target value while running the 'tar' command above. So we don't need to move the file. Same as my comment above. > + # Moving final tar file to debugreports path > + msg = 'Moving final debug report file "%s" to > "%s"' % \ > + (final_tar_report_name, dbg_target) > + wok_log.info(msg) > + shutil.move(final_tar_report_name, dbg_target) The above block can be removed. > + # Deleting the sosreport md5 file > + delete_the_sosreport_md5_file(md5_report_file) > + # Deleting the dbingo report file > + msg = 'Deleting the dbginfo file "%s" ' \ > + % dbginfo_report > + wok_log.info(msg) > + os.remove(dbginfo_report) > + # Deleting the sosreport file > + msg = 'Deleting the sosreport file "%s" ' % > sosreport_file > + wok_log.info(msg) > + os.remove(sosreport_file) > + wok_log.info('The debug report file has been moved') > + cb('OK', True) > + return > + > + except WokException as e: > + log_error(e) > + raise > + > + except OSError as e: > + log_error(e) > + raise > + > + except Exception, e: > + # No need to call cb to update the task status here. > + # The task object will catch the exception raised here > + # and update the task status there > + log_error(e) > + raise OperationFailed("GGBDR0011E", {'name': name, 'err': > e}) > + > + @staticmethod > + def sosreport_generate(cb, name): > + def log_error(e): > + log = logging.getLogger('Model') > + log.warning('Exception in generating debug file: %s', e) The same I commented before. We can use wok_log to log the errors. I will incorporate this in my next patch > + try: > + # Sosreport collection > + sosreport_file = sosreport_collection(name) > + md5_report_file = sosreport_file + '.md5' > + report_file_extension = '.' + sosreport_file.split('.', > 1)[1] > path = config.get_debugreports_path() > - target = os.path.join(path, name + report_file_extension) > - # Moving report > - msg = 'Moving debug report file "%s" to "%s"' % (reportFile, > - target) > + sosreport_target = os.path.join(path, > + name + > report_file_extension) > + msg = 'Moving debug report file "%s" to "%s"' \ > + % (sosreport_file, sosreport_target) > wok_log.info(msg) > - shutil.move(reportFile, target) > - # Deleting md5 > - msg = 'Deleting report md5 file: "%s"' % (md5_report_file) > - wok_log.info(msg) > - with open(md5_report_file) as f: > - md5 = f.read().strip() > - wok_log.info('Md5 file content: "%s"', md5) > - os.remove(md5_report_file) > + shutil.move(sosreport_file, sosreport_target) As we are using --tmp-dir option, we know exactly where the sosreport will be saved. So we don't need to move the file around. When the sosreport is generated md5 file is generated along with the sosreport. That is why we generate the sosreport in a var/tmp dir and remove the md5 file and then move the final file to the target location to avoid doing all the operations on the target directory. > + delete_the_sosreport_md5_file(md5_report_file) > cb('OK', True) > return > > @@ -142,17 +198,27 @@ class DebugReportsModel(object): > # Please add new possible debug report command here > # and implement the report generating function > # based on the new report command > - report_tools = ({'cmd': 'sosreport --help', > + report_tools = ({'cmd': '/usr/sbin/dbginfo.sh --help', > + 'fn': DebugReportsModel.debugreport_generate}, > + {'cmd': 'sosreport --help', > 'fn': DebugReportsModel.sosreport_generate},) > > # check if the command can be found by shell one by one > for helper_tool in report_tools: > try: > - retcode = subprocess.call(helper_tool['cmd'], > shell=True, > - stdout=subprocess.PIPE, > - stderr=subprocess.PIPE) > - if retcode == 0: > - return helper_tool['fn'] > + if 'cmd' == '/usr/sbin/dbginfo.sh --help': > + retcode = subprocess.call(helper_tool['cmd'], > shell=True, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE) > + if retcode == 0: > + return helper_tool['fn'] You don't need to a special condition to cover the dbginfo command. The former code already does that. I ll make the changes. > + else: > + > + retcode = subprocess.call(helper_tool['cmd'], > shell=True, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE) > + if retcode == 0: > + return helper_tool['fn'] > except Exception, e: > wok_log.info('Exception running command: %s', e) > > @@ -213,3 +279,53 @@ class DebugReportContentModel(object): > > def lookup(self, name): > return self._debugreport.lookup(name) > + > + > +def delete_the_sosreport_md5_file(md5_file): > + """ > + Deleting md5 file and displaying the contents of the same. > + """ > + msg = 'Deleting report md5 file: "%s"' % md5_file > + wok_log.info(msg) > + with open(md5_file) as f: > + md5 = f.read().strip() > + wok_log.info('Md5 file content: "%s"', md5) > + os.remove(md5_file) > + > + > +def sosreport_collection(name): > + """ > + Code for the collection of sosreport n the path > + /var/tmp as specified in the command. > + """ > + path_sosreport = '/var/tmp/' > + command = ['sosreport', '--batch', '--name=%s' % name, > + '--tmp-dir=%s' % path_sosreport] > + output, error, retcode = run_command(command) > + if retcode != 0: > + raise OperationFailed("GGBDR0003E", {'name': name, > + 'err': retcode}) > + > + # SOSREPORT might create file in /tmp or /var/tmp > + # FIXME: The right way should be passing the tar.xz file directory > + # though the parameter '--tmp-dir', but it is failing in Fedora 20 You can remove this comment. > + sosreport_name = name.replace('_', '') The same I commented before. We should not change the user input without informing user about it. So it is better to block underscore in the debug report name. Please, update API.json accordingly. I ll make the required changes. > + sosreport_name_regex = '(\s+)(' + path_sosreport + \ > + ')(sosreport-' +\ > + sosreport_name + '-\d+.tar.xz)' > + sosreport_file = None > + output = output.splitlines() > + for line in output: > + if line: > + matched_name = re.match(sosreport_name_regex, line) > + if matched_name: > + path = matched_name.groups()[1] > + fname = matched_name.groups()[2] > + sosreport_file = path + fname While using --tmp-dir you know exactly where the sosreport file will be: <tmp-dir>-sosreport-<name>.tar.gz So you can need to parse the command output. I will take care of this in the next patch. > + break > + # Some error in sosreport happened > + if sosreport_file is None: > + wok_log.error('Debug report file not found. See sosreport ' > + 'output for detail:\n%s', output) > + raise OperationFailed('GGBDR0004E', {'name': name}) > + return sosreport_file

3 4

[PATCH] Fix ISO error messages
by Ramon Medeiros 25 Nov '15

25 Nov '15

Make distinct "no ISO found" and "invalid iso format". Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/vmtemplate.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index 283d94d..0c35611 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -130,11 +130,15 @@ class VMTemplate(object): iso_prefixes = ['/', 'http', 'https', 'ftp', 'ftps', 'tftp'] if len(filter(iso.startswith, iso_prefixes)) == 0: raise InvalidParameter("KCHTMPL0006E", {'param': iso}) + else: + if not os.path.exists(iso): + raise InvalidParameter("KCHISO0001E", {'filename': iso}) + try: iso_img = IsoImage(iso) return iso_img.probe() except IsoFormatError: - raise InvalidParameter("KCHISO0001E", {'filename': iso}) + raise InvalidParameter("KCHISO0007E", {'filename': iso}) def _get_cdrom_xml(self, libvirt_stream_protocols): if 'cdrom' not in self.info: -- 2.1.0

1 1

[RFC] Usage of jquery boot grid implementation (http://www.jquery-bootgrid.com/) for plugins ginger, gingers390x new ui developments
by Chandra Shekhar Reddy Potula 25 Nov '15

25 Nov '15

Hi All, I would like propose the use of jquery boot grid implementation (http://www.jquery-bootgrid.com/) for displaying the data tables which support features like individual, multiple row selects, column sorting, Search based on filters, for plugins ginger, gingers390x new ui developments. Nice thing about the code is, it is seamlessly fitting in to the current UI designs we already implemented in other areas. Official Github location of jquery bootgrid implementation is @ https://github.com/rstaib/jquery-bootgrid. jquery bootgrid code is of license type MIT so I guess it can be used safely. Please feel free to comment on this topic and have your opinion. Thanks in advance, Regards Chandra

2 1

[PATCH 0/3] Fix UI code errors and messages
by Ramon Medeiros 25 Nov '15

25 Nov '15

Ramon Medeiros (3): Remove unused messages in Kimchi UI Fix WOK UI error messages Add checking for UI codes when running make check-local Makefile.am | 1 + check_ui_code_errors.sh | 11 ++ src/wok/plugins/kimchi/Makefile.am | 2 +- src/wok/plugins/kimchi/check_ui_code_errors.sh | 11 ++ src/wok/plugins/kimchi/model/vms.py | 6 +- src/wok/plugins/kimchi/ui/pages/i18n.json.tmpl | 81 ------------ ui/js/src/wok.confirm.js | 4 +- ui/js/src/wok.grid.js | 10 +- ui/js/src/wok.line-chart.js | 2 +- ui/js/src/wok.list.js | 10 +- ui/js/src/wok.main.js | 2 +- ui/js/widgets/filter-select.js | 4 +- ui/pages/i18n.json.tmpl | 168 ++----------------------- 13 files changed, 52 insertions(+), 260 deletions(-) create mode 100755 check_ui_code_errors.sh create mode 100755 src/wok/plugins/kimchi/check_ui_code_errors.sh -- 2.1.0

3 7

[PATCH 0/2] Add support to update guest maxMemory {backend}
by Rodrigo Trujillo 25 Nov '15

25 Nov '15

V1: In order to test, you can run something like this command: curl -k -u <U>:<PW> -H "Content-Type: application/json" -H "Accept: application/json" "<HOST>/plugins/kimchi/vms/<VM>" -X PUT -d '{"maxmemory": 3072}' Rodrigo Trujillo (2): Implement support to change guest maxMemory tag Add and fixes tests for maxMemory tag src/wok/plugins/kimchi/API.json | 6 ++ src/wok/plugins/kimchi/i18n.py | 6 +- src/wok/plugins/kimchi/model/vms.py | 119 +++++++++++++++++------------- src/wok/plugins/kimchi/tests/test_rest.py | 23 ++++++ 4 files changed, 101 insertions(+), 53 deletions(-) -- 2.1.0

2 3

[PATCH] [new-ui] Edit Guests
by sguimaraes943＠gmail.com 25 Nov '15

25 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> New-UI added to Edit Guest modal window. This patch includes guest IP address from previous patches (added enough space for IPV6 addresses). Includes some minor fixes such as: *Added doctype to wok-ui.html.tmpl *Fixed Edit Templates modal window in Firefox *Some minor fixes to wok.message instances showing behind modal windows samhenri (1): [new-ui] Edit Guests modal window .../kimchi/ui/css/theme-default/guest-edit.css | 420 ---------------- .../ui/css/theme-default/guest-storage-add.css | 81 --- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 6 +- .../kimchi/ui/js/src/kimchi.guest_edit_main.js | 550 +++++++++++---------- .../ui/js/src/kimchi.guest_storage_add.main.js | 39 +- .../plugins/kimchi/ui/pages/guest-edit.html.tmpl | 257 +++++----- .../kimchi/ui/pages/guest-storage-add.html.tmpl | 99 ++-- ui/css/src/modules/_edit-guests.scss | 362 ++++++++++++++ ui/css/src/modules/_modal-flat.scss | 19 +- ui/css/src/modules/_templates.scss | 16 +- ui/css/src/wok.scss | 2 + ui/pages/wok-ui.html.tmpl | 1 + 12 files changed, 873 insertions(+), 979 deletions(-) delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-edit.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-storage-add.css create mode 100644 ui/css/src/modules/_edit-guests.scss -- 1.9.3

2 3

[PATCH] [new-ui] Edit Guests v2
by sguimaraes943＠gmail.com 25 Nov '15

25 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> New-UI added to Edit Guest modal window. This patch includes guest IP address from previous patches (added enough space for IPV6 addresses). Includes some minor fixes such as: *Added doctype to wok-ui.html.tmpl *Fixed Edit Templates modal window in Firefox *Some minor fixes to wok.message instances showing behind modal windows V2 *Fixed new navigation bar to work with HTML5 strict mode. (markup was camelcase, CSS in lowercase) *Other minor CSS issues with Storages and Network samhenri (1): [new-ui] Edit Guests modal window .../kimchi/ui/css/theme-default/guest-edit.css | 420 ---------------- .../ui/css/theme-default/guest-storage-add.css | 81 --- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 6 +- .../kimchi/ui/js/src/kimchi.guest_edit_main.js | 550 +++++++++++---------- .../ui/js/src/kimchi.guest_storage_add.main.js | 39 +- .../plugins/kimchi/ui/pages/guest-edit.html.tmpl | 257 +++++----- .../kimchi/ui/pages/guest-storage-add.html.tmpl | 99 ++-- ui/css/src/modules/_edit-guests.scss | 362 ++++++++++++++ ui/css/src/modules/_modal-flat.scss | 19 +- ui/css/src/modules/_network.scss | 1 - ui/css/src/modules/_storage.scss | 2 - ui/css/src/modules/_templates.scss | 16 +- ui/css/src/modules/_toolbar.scss | 46 +- ui/css/src/wok.scss | 2 + ui/js/src/wok.main.js | 13 +- ui/pages/wok-ui.html.tmpl | 1 + 16 files changed, 897 insertions(+), 1017 deletions(-) delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-edit.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/guest-storage-add.css create mode 100644 ui/css/src/modules/_edit-guests.scss -- 1.9.3

2 2

[RFC] Add disk type checking while creating template
by Ramon Medeiros 25 Nov '15

25 Nov '15

At template creation, add a checking to verify if the ISO or the disk match the correct format, to avoid mistake like creating a disk template with ISO. Doubts: Which disk types we are going to support? (raw, qcow2)? There is only one type of ISO supported? (ISO 9600) ? Thanks -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH V3] Add OVS bridges recognition support
by Lucio Correia 25 Nov '15

25 Nov '15

Allow bridged networks to be created from OVS bridges, and adapt VM XML to work with OVS networks. In some distributions, i.e. Fedora, the directories "bridge" and "brif" are not created for OVS bridges, and they are the method Kimchi uses to detect bridges. This patch also fixes that by recognizing OVS bridges through OVS commands, allowing networks to be created using OVS bridges in those distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> This patch depends on [PATCH V4] Support Linux Bridge creation. Changes in V3: - Added error KCHNET0026E --- src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/networks.py | 8 +++++ src/wok/plugins/kimchi/netinfo.py | 53 ++++++++++++++++++++++++++++-- src/wok/plugins/kimchi/xmlutils/network.py | 5 +++ 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index a72f1ee..de7962a 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -270,6 +270,7 @@ messages = { "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), + "KCHNET0026E": _("Open VSwitch bridges can only host bridged networks."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 89c8c3a..3e75d7f 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -178,9 +178,17 @@ class NetworksModel(object): # User specified bridge interface, simply use it self._ensure_iface_up(iface) + params['ovs'] = False if netinfo.is_bridge(iface): params['bridge'] = iface + if netinfo.is_ovs_bridge(iface): + params['ovs'] = True + + # OVS bridges don't work with macvtap + if params['connection'] != "bridge": + raise InvalidParameter('KCHNET0026E') + # User wants Linux bridge network, but didn't specify bridge interface elif params['connection'] == "bridge": # create Linux bridge interface first and use it as actual iface diff --git a/src/wok/plugins/kimchi/netinfo.py b/src/wok/plugins/kimchi/netinfo.py index c5746d7..ff91489 100644 --- a/src/wok/plugins/kimchi/netinfo.py +++ b/src/wok/plugins/kimchi/netinfo.py @@ -21,6 +21,9 @@ import ethtool import glob import os +from distutils.spawn import find_executable +from wok.utils import run_command +from wok.utils import wok_log NET_PATH = '/sys/class/net' NIC_PATH = '/sys/class/net/*/device' @@ -73,13 +76,51 @@ def is_vlan(iface): def bridges(): - return [b.split('/')[-2] for b in glob.glob(BRIDGE_PATH)] + return list(set([b.split('/')[-2] for b in glob.glob(BRIDGE_PATH)] + + ovs_bridges())) def is_bridge(iface): return iface in bridges() +# In some distributions, like Fedora, the files bridge and brif are not created +# under /sys/class/net/<ovsbridge> for OVS bridges. These specific functions +# allows one to differentiate OVS bridges from other types of bridges. +def ovs_bridges(): + ovs_cmd = find_executable("ovs-vsctl") + + # openvswitch not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-br']) + if rc != 0: + wok_log.info("Error listing OVS bridges") + return [] + + return list(set(out.split('\n')) - set([''])) + + +def is_ovs_bridge(iface): + return iface in ovs_bridges() + + +def ovs_bridge_ports(ovsbr): + ovs_cmd = find_executable("ovs-vsctl") + + # openvswitch not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-ports', ovsbr]) + if rc != 0: + wok_log.info("Error listing OVS bridge ports for %s" % str(ovsbr)) + return [] + + return list(set(out.split('\n')) - set([''])) + + def all_interfaces(): return [d.rsplit("/", 1)[-1] for d in glob.glob(NET_PATH + '/*')] @@ -91,11 +132,19 @@ def slaves(bonding): def ports(bridge): + if bridge in ovs_bridges(): + return ovs_bridge_ports(bridge) + return os.listdir(BRIDGE_PORTS % bridge) def is_brport(nic): - return os.path.exists(NET_BRPORT % nic) + ovs_brports = [] + + for ovsbr in ovs_bridges(): + ovs_brports += ovs_bridge_ports(ovsbr) + + return os.path.exists(NET_BRPORT % nic) or nic in ovs_brports def is_bondlave(nic): diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index 14c7e13..f9594e6 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -95,6 +95,11 @@ def to_network_xml(**kwargs): if bridge: network.append(E.bridge(name=bridge)) + # Add virtualport element for openvswitch bridges + ovs = kwargs.get('ovs') + if ovs: + network.append(E.virtualport(type='openvswitch')) + # None means is Isolated network, {} means default mode nat params = kwargs.get('forward', {"mode": None}) forward = _get_forward_elem(**params) -- 1.9.1

2 1

[PATCH] Add support for serial console
by Ramon Medeiros 25 Nov '15

25 Nov '15

Automatically create serial console device. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/vmtemplate.py | 7 +++++- src/wok/plugins/kimchi/xmlutils/serial.py | 40 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/kimchi/xmlutils/serial.py diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index 283d94d..d8f2f7f 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -37,7 +37,7 @@ from wok.plugins.kimchi.xmlutils.disk import get_disk_xml from wok.plugins.kimchi.xmlutils.graphics import get_graphics_xml from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.qemucmdline import get_qemucmdline_xml - +from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): def __init__(self, args, scan=False): @@ -312,6 +312,10 @@ class VMTemplate(object): params['cpu_info'] = self._get_cpu_xml() params['disks'] = self._get_disks_xml(vm_uuid) + params['serial'] = '' + if params['arch'] not in ['ppc', 'ppc64']: + params['serial'] = get_serial_xml() + graphics = dict(self.info['graphics']) graphics.update(kwargs.get('graphics', {})) params['graphics'] = get_graphics_xml(graphics) @@ -365,6 +369,7 @@ class VMTemplate(object): %(networks)s %(graphics)s %(input_output)s + %(serial)s <memballoon model='virtio' /> </devices> </domain> diff --git a/src/wok/plugins/kimchi/xmlutils/serial.py b/src/wok/plugins/kimchi/xmlutils/serial.py new file mode 100644 index 0000000..2892c45 --- /dev/null +++ b/src/wok/plugins/kimchi/xmlutils/serial.py @@ -0,0 +1,40 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# 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 lxml.etree as ET +from lxml.builder import E + +def get_serial_xml(): + """ + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + """ + serial = E.serial(type="pty") + serial.append(E.target(port='0')) + console = E.console(type="pty") + console.append(E.target(type="serial", port='0')) + return ET.tostring(serial, encoding='utf-8', pretty_print=True) + \ + ET.tostring(console, encoding='utf-8', pretty_print=True) + + + -- 2.1.0

3 4

[PATCH V4] Support Linux Bridge creation
by Lucio Correia 25 Nov '15

25 Nov '15

From: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> This commit adds a new option to bridged network creation API: "macvtap". When it is chosen, the usual behavior for option "bridge" will be applied. This commit also changes the behavior for the already existing "bridge" option. Now, when that option is chosen, a Linux bridge will be created, not a macvtap one. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>i Changes in V4: - Fixed tests - Fixed macvtap use case --- src/wok/plugins/kimchi/API.json | 2 +- src/wok/plugins/kimchi/docs/API.md | 11 ++- src/wok/plugins/kimchi/i18n.py | 5 +- src/wok/plugins/kimchi/model/networks.py | 108 +++++++++++++++------ src/wok/plugins/kimchi/tests/test_mock_network.py | 4 +- src/wok/plugins/kimchi/tests/test_model_network.py | 5 + src/wok/plugins/kimchi/tests/test_networkxml.py | 24 +++++ src/wok/plugins/kimchi/xmlutils/network.py | 25 +++++ 8 files changed, 149 insertions(+), 35 deletions(-) diff --git a/src/wok/plugins/kimchi/API.json b/src/wok/plugins/kimchi/API.json index ab9ac9b..7addfc7 100644 --- a/src/wok/plugins/kimchi/API.json +++ b/src/wok/plugins/kimchi/API.json @@ -353,7 +353,7 @@ "connection": { "description": "Specifies how this network should be connected to the other networks", "type": "string", - "pattern": "^isolated|nat|bridge$", + "pattern": "^isolated|nat|bridge|macvtap$", "required": true, "error": "KCHNET0012E" }, diff --git a/src/wok/plugins/kimchi/docs/API.md b/src/wok/plugins/kimchi/docs/API.md index 5787755..e1c9396 100644 --- a/src/wok/plugins/kimchi/docs/API.md +++ b/src/wok/plugins/kimchi/docs/API.md @@ -627,13 +627,16 @@ A interface represents available interface on host. networks visible to this host. * isolated: Create a private, isolated virtual network. * nat: Outgoing traffic will be routed through the host. - * bridge: All traffic on this network will be bridged through the indicated - interface. + * macvtap: All traffic on this network will be bridged through the + specified interface. + * bridge: All traffic on this network will be bridged through a Linux + bridged, which is created upon specified interface in case + it is not already a Linux bridge. * subnet *(optional)*: Network segment in slash-separated format with ip address and prefix or netmask used to create nat network. * interface *(optional)*: The name of a network interface on the host. - For bridge network, the interface can be a bridge or nic/bonding - device. + For "macvtap" and "bridge" connections, the + interface can be a nic, bridge or bonding device. * vlan_id *(optional)*: VLAN tagging ID for the bridge network. ### Resource: Network diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index aede103..a72f1ee 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -256,7 +256,7 @@ messages = { "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"), "KCHNET0010E": _("The interface %(iface)s already exists."), "KCHNET0011E": _("Network name must be a string without slashes (/) or quotes (\")"), - "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"), + "KCHNET0012E": _("Supported network types are isolated, NAT, macvtap and bridge"), "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"), "KCHNET0014E": _("Network interface must be a string"), "KCHNET0015E": _("Network VLAN ID must be an integer between 1 and 4094"), @@ -267,6 +267,9 @@ messages = { "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), + "KCHNET0023E": _("Unable to get XML definition for interface %(name)s. Details: %(err)s"), + "KCHNET0024E": _("Unable to redefine interface %(name)s. Details: %(err)s"), + "KCHNET0025E": _("Unable to create bridge %(name)s. Details: %(err)s"), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 71ea595..89c8c3a 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -21,19 +21,21 @@ import ipaddr import libvirt import sys import time +from libvirt import VIR_INTERFACE_XML_INACTIVE from xml.sax.saxutils import escape from wok.config import PluginPaths from wok.exception import InvalidOperation, InvalidParameter from wok.exception import MissingParameter, NotFoundError, OperationFailed -from wok.rollbackcontext import RollbackContext from wok.utils import run_command, wok_log from wok.xmlutils.utils import xpath_get_text from wok.plugins.kimchi import netinfo from wok.plugins.kimchi import network as knetwork from wok.plugins.kimchi.osinfo import defaults as tmpl_defaults +from wok.plugins.kimchi.xmlutils.network import create_linux_bridge_xml from wok.plugins.kimchi.xmlutils.network import create_vlan_tagged_bridge_xml +from wok.plugins.kimchi.xmlutils.network import get_no_network_config_xml from wok.plugins.kimchi.xmlutils.network import to_network_xml @@ -82,7 +84,9 @@ class NetworksModel(object): connection = params["connection"] # set forward mode, isolated do not need forward - if connection != 'isolated': + if connection == 'macvtap': + params['forward'] = {'mode': 'bridge'} + elif connection != 'isolated': params['forward'] = {'mode': connection} # set subnet, bridge network do not need subnet @@ -90,7 +94,7 @@ class NetworksModel(object): self._set_network_subnet(params) # only bridge network need bridge(linux bridge) or interface(macvtap) - if connection == 'bridge': + if connection in ['bridge', 'macvtap']: self._set_network_bridge(params) params['name'] = escape(params['name']) @@ -159,6 +163,7 @@ class NetworksModel(object): def _set_network_bridge(self, params): try: + # fails if host interface is already in use by a libvirt network iface = params['interface'] if iface in self.get_all_networks_interfaces(): msg_args = {'iface': iface, 'network': params['name']} @@ -166,11 +171,23 @@ class NetworksModel(object): except KeyError: raise MissingParameter("KCHNET0004E", {'name': params['name']}) + # Linux bridges cannot be the trunk device of a VLAN + if 'vlan_id' in params and \ + (netinfo.is_bridge(iface) or params['connection'] == "bridge"): + raise InvalidParameter('KCHNET0019E', {'name': iface}) + + # User specified bridge interface, simply use it self._ensure_iface_up(iface) if netinfo.is_bridge(iface): - if 'vlan_id' in params: - raise InvalidParameter('KCHNET0019E', {'name': iface}) params['bridge'] = iface + + # User wants Linux bridge network, but didn't specify bridge interface + elif params['connection'] == "bridge": + # create Linux bridge interface first and use it as actual iface + iface = self._create_linux_bridge(iface) + params['bridge'] = iface + + # connection == macvtap and iface is not bridge elif netinfo.is_bare_nic(iface) or netinfo.is_bonding(iface): if params.get('vlan_id') is None: params['forward']['dev'] = iface @@ -196,36 +213,73 @@ class NetworksModel(object): net_dict['bridge'] and interfaces.append(net_dict['bridge']) return interfaces + def _create_bridge(self, name, xml): + conn = self.conn.get() + + # check if name exists + if name in netinfo.all_interfaces(): + raise InvalidOperation("KCHNET0010E", {'iface': name}) + + # create bridge through libvirt + try: + bridge = conn.interfaceDefineXML(xml) + bridge.create() + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0025E", {'name': name, + 'err': e.get_error_message()}) + + def _create_linux_bridge(self, interface): + # get xml definition of interface + iface_xml = self._get_interface_desc_xml(interface) + + # Truncate the interface name if it exceeds 13 characters to make sure + # the length of bridge name is less than 15 (its maximum value). + br_name = KIMCHI_BRIDGE_PREFIX + interface[-13:] + br_xml = create_linux_bridge_xml(br_name, interface, iface_xml) + + # drop network config from interface + self._redefine_iface_no_network(interface) + + # create and start bridge + self._create_bridge(br_name, br_xml) + + return br_name + def _create_vlan_tagged_bridge(self, interface, vlan_id): # Truncate the interface name if it exceeds 8 characters to make sure # the length of bridge name is less than 15 (its maximum value). br_name = KIMCHI_BRIDGE_PREFIX + interface[-8:] + '-' + vlan_id br_xml = create_vlan_tagged_bridge_xml(br_name, interface, vlan_id) + + self._create_bridge(br_name, br_xml) + + return br_name + + def _get_interface_desc_xml(self, name): conn = self.conn.get() - bridges = [] - for net in conn.listAllNetworks(): - # Bridged networks do not have a bridge name - # So in those cases, libvirt raises an error when trying to get - # the bridge name - try: - bridges.append(net.bridgeName()) - except libvirt.libvirtError, e: - wok_log.error(e.message) + try: + iface = conn.interfaceLookupByName(name) + xml = iface.XMLDesc(flags=VIR_INTERFACE_XML_INACTIVE) + except libvirt.libvirtError, e: + raise OperationFailed("KCHNET0023E", + {'name': name, 'err': e.get_error_message()}) - if br_name in bridges: - raise InvalidOperation("KCHNET0010E", {'iface': br_name}) + return xml - with RollbackContext() as rollback: - try: - vlan_tagged_br = conn.interfaceDefineXML(br_xml, 0) - rollback.prependDefer(vlan_tagged_br.destroy) - vlan_tagged_br.create(0) - except libvirt.libvirtError as e: - raise OperationFailed(e.message) - else: - return br_name + def _redefine_iface_no_network(self, name): + conn = self.conn.get() + # drop network config from definition of interface + iface_xml = self._get_interface_desc_xml(name) + xml = get_no_network_config_xml(iface_xml.encode("utf-8")) + + try: + # redefine interface + iface = conn.interfaceDefineXML(xml.encode("utf-8")) + except libvirt.libvirtError as e: + raise OperationFailed("KCHNET0024E", {'name': name, + 'err': e.get_error_message()}) class NetworkModel(object): def __init__(self, **kargs): @@ -333,7 +387,7 @@ class NetworkModel(object): if network.isActive(): raise InvalidOperation("KCHNET0005E", {'name': name}) - self._remove_vlan_tagged_bridge(network) + self._remove_bridge(network) network.undefine() @staticmethod @@ -369,7 +423,7 @@ class NetworkModel(object): 'interface': forward_if, 'pf': forward_pf}} - def _remove_vlan_tagged_bridge(self, network): + def _remove_bridge(self, network): try: bridge = network.bridgeName() except libvirt.libvirtError: diff --git a/src/wok/plugins/kimchi/tests/test_mock_network.py b/src/wok/plugins/kimchi/tests/test_mock_network.py index 8368ced..4b0a284 100644 --- a/src/wok/plugins/kimchi/tests/test_mock_network.py +++ b/src/wok/plugins/kimchi/tests/test_mock_network.py @@ -69,6 +69,6 @@ class MockNetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] - _do_network_test(self, model, {'name': u'bridge-network', - 'connection': 'bridge', + _do_network_test(self, model, {'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface, 'vlan_id': 987}) diff --git a/src/wok/plugins/kimchi/tests/test_model_network.py b/src/wok/plugins/kimchi/tests/test_model_network.py index 6be2d39..776e69e 100644 --- a/src/wok/plugins/kimchi/tests/test_model_network.py +++ b/src/wok/plugins/kimchi/tests/test_model_network.py @@ -142,6 +142,11 @@ class NetworkTests(unittest.TestCase): ) if len(interfaces) > 0: iface = interfaces[0]['name'] + networks.append({'name': u'macvtap-network', + 'connection': 'macvtap', 'interface': iface}) + + if len(interfaces) > 1: + iface = interfaces[1]['name'] networks.append({'name': u'bridge-network', 'connection': 'bridge', 'interface': iface}) diff --git a/src/wok/plugins/kimchi/tests/test_networkxml.py b/src/wok/plugins/kimchi/tests/test_networkxml.py index 69965e6..d4e2c3f 100644 --- a/src/wok/plugins/kimchi/tests/test_networkxml.py +++ b/src/wok/plugins/kimchi/tests/test_networkxml.py @@ -171,3 +171,27 @@ class InterfaceXmlTests(unittest.TestCase): """ actual_xml = nxml.create_vlan_tagged_bridge_xml('br10', 'em1', '10') self.assertEquals(actual_xml, normalize_xml(expected_xml)) + + def test_linux_bridge_no_ip(self): + em1_xml = """ + <interface type='ethernet' name='em1'> + <start mode='onboot'/> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + expected_xml = """ + <interface type='bridge' name='br10'> + <start mode='onboot'/> + <bridge> + <interface type='ethernet' name='em1' /> + </bridge> + <protocol family='ipv4'> + <dhcp/> + </protocol> + </interface> + """ + actual_xml = nxml.create_linux_bridge_xml('br10', 'em1', + normalize_xml(em1_xml)) + self.assertEquals(actual_xml, normalize_xml(expected_xml)) diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index c73aad9..14c7e13 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -120,3 +120,28 @@ def create_vlan_tagged_bridge_xml(bridge, interface, vlan_id): type='bridge', name=bridge) return ET.tostring(m) + +def create_linux_bridge_xml(bridge, interface, iface_xml): + m = E.interface( + E.start(mode='onboot'), + E.bridge( + E.interface( + type='ethernet', + name=interface)), + type='bridge', + name=bridge) + + # use same network configuration of lower interface + iface = ET.fromstring(iface_xml) + for element in iface.iter("protocol"): + m.append(element) + + return ET.tostring(m) + +def get_no_network_config_xml(iface_xml): + # remove all protocol elements from interface xml + xml = ET.fromstring(iface_xml) + for element in xml.iter("protocol"): + element.getparent().remove(element) + + return ET.tostring(xml) -- 1.9.1

2 1

[PATCH] [Ginger-Base 0/1] Issue 728 - Processor Info in s390 architecture
by sureshab＠linux.vnet.ibm.com 25 Nov '15

25 Nov '15

From: Suresh Babu Angadi <sureshab(a)in.ibm.com> As per RFC mail thread - [Kimchi-devel] RFC - #728 - Processor Info in s390 architecture this patch set adds functionality in back-end to add architecture, and host name(for all architecture), split CPUs to online and offline(x86, s390x), additional virtualization details(for s390x) Note: Subsequent patch set for UI changes will follow to accommodate these changes Test Cases Executed: ==================== 1) On x86 machine: curl -k -u suresh -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"Fedora", "cpus":{ "offline":0, "online":4 }, "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "os_version":"21", "host":"localhost.localdomain", "os_codename":"Twenty One", "architecture":"x86_64", "memory":7933902848 } 2) On s390x machine: curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET 'https://127.0.0.1:8001/plugins/gingerbase/host' { "os_distro":"KVM for IBM z Systems", "cpus":{ "shared":2, "offline":2, "dedicated":0, "online":2 }, "cpu_model":"IBM/2827/743 H43", "os_version":"1.1.1", "host":"zfwcec103", "os_codename":"Z", "architecture":"s390x", "memory":{ "offline":2147483648, "online":2147483648 }, "virtualization":{ "lpar_name":"CSTLIN1", "hypervisor":"PR/SM", "lpar_number":55, "hypervisor_vendor":"IBM" } } 3) For Power(Expected Output): { "os_distro":<os distro>, "cpus":<cpu count>, "cpu_model":<cpu model>, "os_version":<os version>, "host":<host name>, "os_codename":<os codename>, "architecture":"ppc", "memory":<memory> } Suresh Babu Angadi (1): Fix for issue 728: processor info displays blank for system z this patch set also adds additional capability: retrieving architecture and host name (for all architecture) split CPUs to show online and offline cpus(for x86 and s390x) split memory to show online and offline memory(for s390x) additional virtualization details(for s390x): virtualization will have hypervisor details and lpar details src/wok/plugins/gingerbase/docs/API.md | 22 ++- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/lscpu.py | 59 ++++++ src/wok/plugins/gingerbase/model/host.py | 256 +++++++++++++++++++++++--- src/wok/plugins/gingerbase/tests/test_host.py | 12 +- 5 files changed, 320 insertions(+), 30 deletions(-) -- 2.1.0

4 9

[PATCH v2] Add support for serial console
by Ramon Medeiros 24 Nov '15

24 Nov '15

Changes: v2: Add ppc rules to serial.py Correct date on "Copyright" Automatically create serial console device. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/vmtemplate.py | 13 ++------ src/wok/plugins/kimchi/xmlutils/serial.py | 55 +++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 src/wok/plugins/kimchi/xmlutils/serial.py diff --git a/src/wok/plugins/kimchi/vmtemplate.py b/src/wok/plugins/kimchi/vmtemplate.py index d653665..34bf38b 100644 --- a/src/wok/plugins/kimchi/vmtemplate.py +++ b/src/wok/plugins/kimchi/vmtemplate.py @@ -38,7 +38,7 @@ from wok.plugins.kimchi.xmlutils.disk import get_disk_xml from wok.plugins.kimchi.xmlutils.graphics import get_graphics_xml from wok.plugins.kimchi.xmlutils.interface import get_iface_xml from wok.plugins.kimchi.xmlutils.qemucmdline import get_qemucmdline_xml - +from wok.plugins.kimchi.xmlutils.serial import get_serial_xml class VMTemplate(object): def __init__(self, args, scan=False): @@ -312,6 +312,7 @@ class VMTemplate(object): params['qemu-stream-cmdline'] = '' params['cpu_info'] = self._get_cpu_xml() params['disks'] = self._get_disks_xml(vm_uuid) + params['serial'] = get_serial_xml(params) graphics = dict(self.info['graphics']) graphics.update(kwargs.get('graphics', {})) @@ -371,20 +372,12 @@ class VMTemplate(object): %(networks)s %(graphics)s %(input_output)s + %(serial)s <memballoon model='virtio' /> </devices> </domain> """ % params - # Adding PPC console configuration - if params['arch'] in ['ppc', 'ppc64']: - ppc_console = """<memballoon model='virtio' /> - <console type='pty'> - <target type='serial' port='1'/> - <address type='spapr-vio' reg='0x30001000'/> - </console>""" - xml = xml.replace("<memballoon model='virtio' />", ppc_console) - return xml def validate(self): diff --git a/src/wok/plugins/kimchi/xmlutils/serial.py b/src/wok/plugins/kimchi/xmlutils/serial.py new file mode 100644 index 0000000..869a971 --- /dev/null +++ b/src/wok/plugins/kimchi/xmlutils/serial.py @@ -0,0 +1,55 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# 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 lxml.etree as ET +from lxml.builder import E + +def get_serial_xml(params): + """ + For X + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + + For ppc + <console type='pty'> + <target type='serial' port='1'/> + <address type='spapr-vio' reg='0x30001000'/> + </console> + """ + # pcc serial console + if params["arch"] in ["ppc", "ppc64"]: + console = E.console(type="pty") + console.append(E.target(type="serial", port='1')) + console.append(E.address(type="spapr-vio", reg="0x30001000")) + return ET.tostring(console, encoding='utf-8', pretty_print=True) + + # for x + else: + serial = E.serial(type="pty") + serial.append(E.target(port='0')) + console = E.console(type="pty") + console.append(E.target(type="serial", port='0')) + return ET.tostring(serial, encoding='utf-8', pretty_print=True) + \ + ET.tostring(console, encoding='utf-8', pretty_print=True) + + return '' -- 2.1.0

2 1

[PATCH] Add python-mock to README.md
by Rodrigo Trujillo 24 Nov '15

24 Nov '15

Supported distributions provide python-mock. This patch updates README.md with this information. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/docs/README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wok/plugins/kimchi/docs/README.md b/src/wok/plugins/kimchi/docs/README.md index 16fd1e5..23db018 100644 --- a/src/wok/plugins/kimchi/docs/README.md +++ b/src/wok/plugins/kimchi/docs/README.md @@ -63,8 +63,7 @@ Install Dependencies $ sudo service libvirtd restart # These dependencies are only required if you want to run the tests: - $ sudo yum install pyflakes python-pep8 python-requests - $ sudo pip install mock + $ sudo yum install pyflakes python-pep8 python-requests python-mock *Note for RHEL users*: Some of the above packages are located in the Red Hat @@ -85,7 +84,7 @@ channel at RHN Classic or Red Hat Satellite. python-magic python-paramiko \ # These dependencies are only required if you want to run the tests: - $ sudo apt-get install pep8 pyflakes python-requests + $ sudo apt-get install pep8 pyflakes python-requests python-mock **For openSUSE:** @@ -97,7 +96,7 @@ channel at RHN Classic or Red Hat Satellite. novnc python-magic # These dependencies are only required if you want to run the tests: - $ sudo zypper install python-pyflakes python-pep8 python-requests + $ sudo zypper install python-pyflakes python-pep8 python-requests python-mock *Note for openSUSE users*: Some of the above packages are located in different openSUSE repositories. See -- 2.1.0

3 2

[PATCH] Fix memory add aligment to 256 in PowerPC
by Rodrigo Trujillo 24 Nov '15

24 Nov '15

This patch fixes an error in the 'if' that checks the system architecture. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/vms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py index 5623879..7e12b91 100644 --- a/src/wok/plugins/kimchi/model/vms.py +++ b/src/wok/plugins/kimchi/model/vms.py @@ -238,9 +238,9 @@ class VMModel(object): vm_locks[name] = lock with lock: - # make sure memory is alingned in 256MiB + # make sure memory is alingned in 256MiB in PowerPC distro, _, _ = platform.linux_distribution() - if 'memory' in params and distro != "IBM_PowerKVM": + if 'memory' in params and distro == "IBM_PowerKVM": if params['memory'] % PPC_MEM_ALIGN != 0: raise InvalidParameter('KCHVM0071E', {'mem': str(params['memory']), -- 2.1.0

2 1

[PATCH v2] New Navigation bar
by atreyee＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This patch is to implement new feature mentioned in issue #746. First level navigation bar with Host and Virtualization tabs. Second level tab navigation based on first level navigation. V2 Fixes: Review comments from Aline taken care 1. alignement of second level navigation with first level navigation 2. second level tab color to fit the window Atreyee Mukhopadhyay (1): Issue #746 : New navigation bar. src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 2 +- src/wok/plugins/kimchi/ui/config/tab-ext.xml | 1 + ui/css/src/modules/_navbar-flat.scss | 5 +- ui/css/src/modules/_toolbar.scss | 9 ++- ui/css/src/modules/_wok-variables.scss | 9 ++- ui/css/src/wok.scss | 4 ++ ui/js/src/wok.main.js | 87 +++++++++++++++++++++--- ui/pages/wok-ui.html.tmpl | 8 ++- 8 files changed, 105 insertions(+), 20 deletions(-) -- 2.1.0

2 3

[PATCH V4] Create logical pool from existing VG
by Aline Manera 24 Nov '15

24 Nov '15

V3 - V4: - Use run_command instead of subprocess.Popen (by Daniel) Aline Manera (1): Create logical pool from existing VG src/wok/plugins/kimchi/API.json | 5 + src/wok/plugins/kimchi/control/host.py | 22 ++++ src/wok/plugins/kimchi/disks.py | 127 ++++++++++++++++++--- src/wok/plugins/kimchi/docs/API.md | 25 +++- src/wok/plugins/kimchi/i18n.py | 5 + src/wok/plugins/kimchi/mockmodel.py | 27 +++++ src/wok/plugins/kimchi/model/host.py | 27 +++++ src/wok/plugins/kimchi/model/libvirtstoragepool.py | 9 +- src/wok/plugins/kimchi/model/storagepools.py | 30 +++-- .../plugins/kimchi/tests/test_mock_storagepool.py | 8 +- 10 files changed, 255 insertions(+), 30 deletions(-) -- 2.5.0

2 3

[PATCH v3] New Navigation bar
by atreyee＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This patch is to implement new feature mentioned in issue #746. First level navigation bar with Host and Virtualization tabs. Second level tab navigation based on first level navigation. V3 Fixes: Review comments from Aline taken care Implementing same color for all tabs in kimchi Atreyee Mukhopadhyay (1): Issue #746 : New navigation bar. src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 2 +- src/wok/plugins/kimchi/ui/config/tab-ext.xml | 1 + ui/css/src/modules/_navbar-flat.scss | 5 +- ui/css/src/modules/_toolbar.scss | 9 ++- ui/css/src/modules/_wok-variables.scss | 9 ++- ui/css/src/wok.scss | 4 ++ ui/js/src/wok.main.js | 87 +++++++++++++++++++++--- ui/pages/wok-ui.html.tmpl | 8 ++- 8 files changed, 105 insertions(+), 20 deletions(-) -- 2.1.0

2 2

[PATCH] Moved disks.py file from kimchi plugin to gingerbase plugin
by pkulkark＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch moves the file disks.py from kimchi plugin to gingerbase plugin so that it may be used by both kimchi and ginger without code duplication. Import statement in plugins/kimchi/model/host.py has been modified for the same. Pooja Kulkarni (1): Moved disks.py file from kimchi plugin to gingerbase plugin src/wok/plugins/gingerbase/disks.py | 196 +++++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/host.py | 2 +- 2 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/gingerbase/disks.py -- 2.1.0

7 11

[PATCH v2] Moved disks.py file from kimchi plugin to Gingerbase plugin
by pkulkark＠linux.vnet.ibm.com 24 Nov '15

24 Nov '15

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> v2 changes: Updated license header to project Ginger Base v1: This patch moves the file disks.py from kimchi plugin to gingerbase plugin so that it may be used by both kimchi and ginger without code duplication. Import statement in plugins/kimchi/model/host.py has been modified for the same. Pooja Kulkarni (1): Updated license header to include Project Gingerbase src/wok/plugins/gingerbase/disks.py | 198 +++++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/model/host.py | 2 +- 2 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/gingerbase/disks.py -- 2.1.0

3 3