December 2013 - Kimchi-devel - oVirt List Archives

[RFC] define REST API for guest Network Interfaces.
by Sheldon 16 Jan '14

16 Jan '14

now we have support network get/create/delete/activate/deactivate Now we need to support the attach/detach/ <https://github.com/kimchi-project/kimchi/wiki/customize-VM#organization-of-…> a Network to a guest. And get the info of Network attached to a guest. libvirt supports several types of network interfaces: 'bridge','network','user','ethernet','direct','hostdev','mcast', 'server', 'client' but there is not a unique "name" attribute for "interface" element.(more libvirt network interfaces info <http://libvirt.org/formatdomain.html#elementsNICS>) That is not good to define our REST API. But for "network" type resource, there is a "network" attribute of "source" resource. And the value of "network" attribute is the name of network that we defined by /networks POST method. the "network" type + "network" attribute is unique. We can define the Network Interfaces like this to support "network" type Interfaces: GET /vms/*name*/Interfaces?type=network&network="default" But this is not RESTFUL. Maybe We can also name a Network Interface by the Interface mac. The mac is unique. GET /vms/*name*/Interfaces/mac The best way for user is get the NICS name in guest. such as eth0, eth1.... GET /vms/*name*/Interfaces/eth0 GET /vms/*name*/Interfaces/eth1 But there is a problem, we need get the nic name and mac from guest. and Make a map in kimchi DB. also the nic name may change, we need make the map consistence with guest nic name. -- Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 3

[RFC][PATCH] VM supports interfaces
by shaohef＠linux.vnet.ibm.com 13 Jan '14

13 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> now kimchi support supports network get/create/delete/activate/deactivate REST API. Now we need to support the attach/detach/ a Network to a VM. https://github.com/kimchi-project/kimchi/wiki/customize-VM#organization-of-… And get the info of Network attached to a VM. more libvirt network interfaces info: http://libvirt.org/formatdomain.html#elementsNICS Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- docs/API.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/docs/API.md b/docs/API.md index 9edc551..2d3ce11 100644 --- a/docs/API.md +++ b/docs/API.md @@ -127,6 +127,55 @@ Represents a snapshot of the Virtual Machine's primary monitor. * volume: A volume name that contains the initial disk contents +### Sub-Collection: Virtual Machine Network Interfaces + +**URI:** /vms/*:name*/interfaces + +Represents all network interfaces attached to a Virtual Machine. + +**Methods:** + +* **GET**: Retrieve a summarized list of all network interfaces attached to a Virtual Machine. + +* **POST**: attach a network interface to VM + * type: The type of VM network interface that libvirt supports. + It can be one of these types: 'network', 'bridge', 'user','ethernet', + 'direct', 'hostdev', 'mcast', 'server' and 'client'. + Now kimchi just supports 'network' type. + * network *(optional)*: the name of resource network, it is required when the + interface type is network. + * model *(optional)*: model of emulated network interface card. It can be one of these models: + ne2k_pci, i82551, i82557b, i82559er, rtl8139, e1000, pcnet and virtio. + when model is missing, but already some interfaces is attached to VM, then will choose + one of model of the exist interfaces. + if on interface is attached to VM, then 'virtio' is default. + +### Sub-Resource: Virtual Machine Network Interface + +**URI:** /vms/*:name*/interfaces/*:name* + +A interface represents available network interface on VM. + +**Methods:** + +* **GET**: Retrieve the full description of the VM network interface + * name: The identifier of the network interface. + * type: The type of VM network interface that libvirt supports. + It will be one of these types: 'network', 'bridge', 'user','ethernet', + 'direct', 'hostdev', 'mcast', 'server' and 'client'. + * network *(optional)*: the name of resource network, only be available when the + interface type is network. + * bridge *(optional)*: the name of resource bridge, only be available when the + interface type is bridge. + * mac: Media Access Control Address of the VM interface. + +* **DELETE**: detach the network interface from VM + +**Actions (POST):** + +*No actions defined* + + ### Resource: Template **URI:** /templates/*:name* -- 1.8.4.2

4 4

[WIP PATCH 0/2] Hosts Management & Host Repository Management
by Hongliang Wang 10 Jan '14

10 Jan '14

Added federated hosts; Added host repository management. There is a bug in kimchi.widget.Grid widget: when there are more than one Grid instances in the page, column resizing function will work incorrectly. I'll send another patch to fix it. Hongliang Wang (2): Federated Hosts Management Host Repositories Management UI src/kimchi/model.py | 1 + ui/css/theme-default/host-add.css | 29 +++++++ ui/css/theme-default/host-edit.css | 29 +++++++ ui/css/theme-default/host.css | 80 +++++++++++++++--- ui/css/theme-default/hosts.css | 24 ++++++ ui/css/theme-default/repository-edit.css | 29 +++++++ ui/css/theme-default/window.css | 6 +- ui/images/theme-default/host-icon-sprite.png | Bin 1034 -> 1163 bytes ui/js/src/kimchi.api.js | 110 +++++++++++++++++++++++++ ui/js/src/kimchi.grid.js | 2 +- ui/js/src/kimchi.host.js | 93 +++++++++++++++++++++ ui/js/src/kimchi.host_add_main.js | 62 ++++++++++++++ ui/js/src/kimchi.host_edit_main.js | 62 ++++++++++++++ ui/js/src/kimchi.hosts.js | 116 +++++++++++++++++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 62 ++++++++++++++ ui/pages/guest-add.html.tmpl | 2 +- ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/host-add.html.tmpl | 66 +++++++++++++++ ui/pages/host-edit.html.tmpl | 66 +++++++++++++++ ui/pages/hosts.html.tmpl | 41 ++++++++++ ui/pages/i18n.html.tmpl | 16 ++++ ui/pages/login-window.html.tmpl | 2 +- ui/pages/report-add.html.tmpl | 2 +- ui/pages/repository-edit.html.tmpl | 66 +++++++++++++++ ui/pages/storagepool-add.html.tmpl | 2 +- ui/pages/tabs/host.html.tmpl | 40 ++++++++- ui/pages/template-add.html.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 2 +- 28 files changed, 989 insertions(+), 25 deletions(-) create mode 100644 ui/css/theme-default/host-add.css create mode 100644 ui/css/theme-default/host-edit.css create mode 100644 ui/css/theme-default/hosts.css create mode 100644 ui/css/theme-default/repository-edit.css create mode 100644 ui/js/src/kimchi.host_add_main.js create mode 100644 ui/js/src/kimchi.host_edit_main.js create mode 100644 ui/js/src/kimchi.hosts.js create mode 100644 ui/js/src/kimchi.repository_edit_main.js create mode 100644 ui/pages/host-add.html.tmpl create mode 100644 ui/pages/host-edit.html.tmpl create mode 100644 ui/pages/hosts.html.tmpl create mode 100644 ui/pages/repository-edit.html.tmpl -- 1.8.1.4

2 3

[PATCH V2] Add nfs server and target UI in create storage pool
by zhoumeina 10 Jan '14

10 Jan '14

v1-v2 Fix some bug in this patch, make it working and retest This patch is working adding a select box in create nfs pool, when user don't want to input the server ip or name, he can simply select "used the server I have used before" and choose a server in a select box, this is more convinent. Add a new jquery filter-select widget In order to show server target I did a select box in UI, but sometimes maybe the export path number is large. So I made a filter-select widget to make user easier to choose the export path he want. This is the first jquery widget. And let us make all common widget to jquery widget from now on. Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 11 +-- ui/css/theme-default/form.css | 6 ++ ui/css/theme-default/storage.css | 4 +- ui/js/Makefile.am | 4 +- ui/js/src/kimchi.api.js | 26 ++++++- ui/js/src/kimchi.storagepool_add_main.js | 73 +++++++++++++++-- ui/js/src/kimchi.utils.js | 11 +++ ui/js/widgets/filter-select.js | 137 ++++++++++++++++++++++++++++++ ui/js/widgets/select-menu.js | 86 +++++++++++++++++++ ui/pages/i18n.html.tmpl | 5 +- ui/pages/storagepool-add.html.tmpl | 41 +++++++-- 11 files changed, 376 insertions(+), 28 deletions(-) create mode 100644 ui/js/widgets/filter-select.js create mode 100644 ui/js/widgets/select-menu.js diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index c7ed3f6..f99679a 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -247,17 +247,16 @@ .btn-select { display: inline-block; position: relative; - height: 38px; + height: 30px; padding-right: 20px; margin: 5px; vertical-align: top; -webkit-border-radius: 5px; -moz-border-radius: 5px; - border-radius: 5px; - background: #eee; + background: #fff; box-shadow: -1px -1px 1px #666, 1px 1px 1px #fff, 2px 2px 2px rgba(0, 0, 0, .15) inset; font-size: 13px; - line-height: 38px; + line-height: 30px; text-align: left; cursor: pointer; } @@ -269,8 +268,8 @@ .btn-select .arrow { position: absolute; width: 15px; - height: 38px; - line-height: 38px; + height: 30px; + line-height: 30px; top: 0; right: 5px; background: url(../images/theme-default/arrow-down-black.png) no-repeat center center; diff --git a/ui/css/theme-default/form.css b/ui/css/theme-default/form.css index c24b277..9db4bba 100644 --- a/ui/css/theme-default/form.css +++ b/ui/css/theme-default/form.css @@ -45,3 +45,9 @@ line-height: 30px; padding: 0 5px; } + +.text-help { + font-size: 12px; + color: #333; + margin: 0 0 5px 5px; +} diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index d81dc75..ae89f1b 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -529,7 +529,7 @@ width: 300px; display: inline-block; vertical-align: top; - padding: 5px 5px 5px 20px; + padding: 5px 5px 5px 22px; } .storage-type-wrapper-controls input[type="text"] { @@ -548,7 +548,7 @@ .storage-type-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 250px; + width: 150px; } .storage-type-wrapper-controls input[type="text"][disabled] { diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index 337e369..8dfd4d6 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -20,7 +20,7 @@ SUBDIRS = novnc -EXTRA_DIST = src +EXTRA_DIST = src widgets jsdir = $(datadir)/kimchi/ui/js @@ -32,7 +32,7 @@ dist_js_DATA = \ modernizr.custom.2.6.2.min.js \ $(NULL) -kimchi.min.js: src/*.js +kimchi.min.js: widgets/*.js src/*.js cat $(sort $^) > $@ CLEANFILES = kimchi.min.js diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index fbcf4a2..f6115a8 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -681,5 +681,29 @@ var kimchi = { success : suc, error : err }); + }, + + getStorageServers: function(type, suc, err) { + var url = kimchi.url + 'storageservers?target_type=' + type; + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); + }, + + getStorageTargets: function(server,type, suc, err) { + var url = kimchi.url + 'storageservers/' + server + '/storagetargets?target_type=' + type; + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); } -}; +}; \ No newline at end of file diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index b31610a..7955352 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -51,7 +51,72 @@ kimchi.initStorageAddPage = function() { }); $('.host-partition').html(listHtml); } - kimchi.select('storagePool-list', options); + $('#storagePool-list').selectMenu(); + $('#storagePool-list').selectMenu("setData", options); + kimchi.getStorageServers('netfs', function(data) { + var serverContent = []; + serverContent.push({ + label : i18n['select_default'], + value : '' + }); + if (data.length > 0) { + $.each(data, function(index, value) { + serverContent.push({ + label : value, + value : value + }); + }); + } + $('#nfs-server-used').selectMenu(); + $('#nfs-server-used').selectMenu("setData", serverContent); + $('#nfs-server-target').filterselect(); + $('input[name=nfsServerType]').change(function() { + if ($(this).val() === 'input') { + $('#nfsServerInputDiv').removeClass('tmpl-html'); + $('#nfsServerChooseDiv').addClass('tmpl-html'); + } else { + $('#nfsServerInputDiv').addClass('tmpl-html'); + $('#nfsServerChooseDiv').removeClass('tmpl-html'); + } + }); + $('#nfsServerSelect').change(function() { + $('#nfsserverId').val($(this).val()); + $('#nfsserverId').trigger("keydown"); + }); + $('#nfsserverId').on("keydown",function() { + if ($(this).val() !== '' && kimchi.isServer($(this).val())) { + $('#nfspathId').removeAttr('disabled'); + } else { + $('#nfspathId').attr('disabled','disabled'); + } + $('#nfs-server-target').filterselect('clear'); + }); + $('#nfspathId').focus(function() { + var targetContent = []; + kimchi.getStorageTargets($('#nfsserverId').val(), 'netfs', function(data) { + if (data.length > 0) { + $.each(data, function(index, value) { + targetContent.push({ + label : value.target, + value : value.target + }); + }); + } else { + targetContent.push({ + label : i18n['msg.no.result'], + value : '' + }); + } + $('#nfs-server-target').filterselect("setData", targetContent); + },function() { + targetContent.push({ + label : i18n['msg.no.result'], + value : '' + }); + $('#nfs-server-target').filterselect("setData", targetContent); + }); + }); + }); $('#poolType').change(function() { if ($(this).val() === 'dir') { $('.path-section').removeClass('tmpl-html'); @@ -88,7 +153,6 @@ kimchi.validateForm = function() { } else { return kimchi.validateLogicalForm(); } - }; kimchi.validateDirForm = function () { @@ -116,11 +180,8 @@ kimchi.validateNfsForm = function () { kimchi.message.error(i18n['msg.pool.edit.nfspath.blank']); return false; } - var domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}" - var ip = "(\\d{1,3}\.){3}\\d{1,3}" - regex = new RegExp('^' + domain + '|' + ip + '$') - if(!regex.test(nfsserver)) { + if(kimchi.isServer(nfsserver)) { kimchi.message.error(i18n['msg.validate.pool.edit.nfsserver']); return false; } diff --git a/ui/js/src/kimchi.utils.js b/ui/js/src/kimchi.utils.js index 8af6a11..6439db6 100644 --- a/ui/js/src/kimchi.utils.js +++ b/ui/js/src/kimchi.utils.js @@ -163,3 +163,14 @@ kimchi.changetoProperUnit = function(numOrg, digits, base) { kimchi.formatMeasurement = format; })(); + +kimchi.isServer = function(server) { + var domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}" + var ip = "(\\d{1,3}\.){3}\\d{1,3}" + regex = new RegExp('^' + domain + '|' + ip + '$'); + if(!regex.test(server)) { + return false; + } else { + return true; + } +}; \ No newline at end of file diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js new file mode 100644 index 0000000..02fe5d9 --- /dev/null +++ b/ui/js/widgets/filter-select.js @@ -0,0 +1,137 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * 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. + */ +(function($) { + $.widget('kimchi.filterselect', { + options : { + key : 0, + value : 0 + }, + + _create : function() { + this.listControl = this.element; + this.element.html(''); + var targetId = this.listControl.data('target'); + var labelId = this.listControl.data('label'); + this.target = $('#' + targetId); + this.label = $('#' + labelId); + this.selectDiv = this.listControl.parent().parent(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.listControl.parent().addClass('popover'); + }, + + _setOption : function(key, value) { + }, + + setData : function(options) { + this.element.html(''); + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + + that.listControl.on('click', itemTag, function(e) { + that.listControl.children().removeClass(selectedClass); + that.listControl.addClass(selectedClass); + that.target.text($(this).text()); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if (oldValue !== newValue) { + that.target.change(); + } + }); + + that.selectDiv.click(function(e) { + that.listControl.html(''); + var items = that._dataList(options); + $.each(items, function(index, item) { + that.listControl.append(item); + }) + var isOpen = that.selectDiv.hasClass('open'); + that.selectDiv.removeClass('open'); + if (!isOpen && items.length > 0) { + that.selectDiv.addClass('open'); + } + e.preventDefault(); + e.stopPropagation(); + }); + + that.target.keyup(function(event) { + that.listControl.html(''); + var items = that._dataList(options); + var temp = 0; + $.each(items, function(index, item) { + if (item.html().indexOf(that.target.val()) >= 0) { + that.listControl.append(item); + temp++; + } + }); + if (that.listControl.html() === '') { + that.listControl.html(i18n['msg.storagepool.unvalid.path']); + } + if (temp > 0) { + that._open(); + } + }); + }, + + _dataList : function(options) { + var item; + var itemTag = 'li'; + var selectedClass = 'active'; + var items = []; + var that = this; + $.each(options, function(index, option) { + item = $('<' + itemTag + '></' + itemTag + '>'); + item.text(option.label); + item.data('value', option.value); + if (option.value === that.target.val()) { + item.addClass(selectedClass); + } + items.push(item); + }); + return items; + }, + + clear : function() { + this.target.val(""); + }, + + _open : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (!isOpen) { + this.selectDiv.addClass('open'); + } + }, + + _close : function() { + var isOpen = this.selectDiv.hasClass('open'); + if (isOpen) { + this.selectDiv.removeClass('open'); + } + }, + + destroy : function() { + // call the base destroy function + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js new file mode 100644 index 0000000..4124096 --- /dev/null +++ b/ui/js/widgets/select-menu.js @@ -0,0 +1,86 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * 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. + */ +(function($) { + $.widget('kimchi.selectMenu', { + options: { + key: 0, + value: 0 + }, + + _create : function() { + this.listControl = this.element; + this.element.html(''); + var targetId = this.listControl.data('target'); + var labelId = this.listControl.data('label'); + this.target = $('#' + targetId); + this.label = $('#' + labelId); + this.selectDiv = this.listControl.parent().parent(); + this.selectDiv.addClass('btn-select dropdown popable'); + this.listControl.parent().addClass('popover'); + var that = this; + }, + + _setOption : function(key,value) {}, + + setData : function (options) { + var that = this; + var value = this.target.val(); + var selectedClass = 'active'; + var itemTag = 'li'; + $.each(options, function(index, option) { + item = $('<' + itemTag + '></' + itemTag + '>'); + item.text(option.label); + item.data('value', option.value); + if(option.value === value) { + item.addClass(selectedClass); + that.label.text(option.label); + } + that.listControl.append(item); + }); + that.listControl.on('click', itemTag, function() { + that.listControl.children().removeClass(selectedClass); + that.listControl.addClass(selectedClass); + that.label.text($(this).text()); + var oldValue = that.target.val(); + var newValue = $(this).data('value'); + that.target.val(newValue); + if(oldValue !== newValue) { + that.target.change(); + } + }); + + that.selectDiv.click(function(e) { + var isOpen = that.selectDiv.hasClass('open'); + that.selectDiv.removeClass('open'); + if (!isOpen) { + that.selectDiv.addClass('open'); + } + e.preventDefault(); + e.stopPropagation(); + }); + }, + + destroy : function() { + // call the base destroy function + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index c1fc3d1..c95da9b 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -121,7 +121,10 @@ var i18n = { 'action_create': "$_("Create")", 'msg_warning': "$_("Warning")", 'msg.logicalpool.confirm.delete': "$_("It will format your disk and you will loose any data in" - " there, are you sure to continue? ")" + " there, are you sure to continue? ")", + 'select_default': "$_("Please choose")", + 'msg.storagepool.unvalid.path': "$_("This is not a valid path")", + 'msg.no.result' : "$_("No valid result")" }; </script> </body> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 5a2dd45..3a73390 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -27,7 +27,7 @@ <!DOCTYPE html> <html> <body> - <div class="window" style="width: 600px; height: 600px;"> + <div class="window" style="width: 800px; height: 650px;"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -47,10 +47,10 @@ <section class="form-section"> <h2>2. $_("Storage Pool Type")</h2> <div class="storage-type-wrapper-controls"> - <div class="btn dropdown popable"> + <div> <input id="poolType" name="type" type="hidden" value="dir"/> <span class="text" id="pool-type-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> + <div style="width: 100%"> <ul class="select-list" id="storagePool-list" data-target="poolType" data-label="pool-type-label"> </ul> </div> @@ -74,22 +74,43 @@ <section class="form-section"> <h2>3. $_("NFS server IP")</h2> <div class="field"> + <input type="radio" id="nfsServerInput" value="input" name="nfsServerType" checked="true"> + <label>$_("I want to input the server myself.")</label> + <input type="radio" id="nfsServerChoose" value="choose" name="nfsServerType"> + <label>$_("I want to choose a server I used before.")</label> + </div> + <div id="nfsServerInputDiv" class="field"> <p class="text-help"> $_("NFS server IP or hostname. It should not be empty.")</p> <input id="nfsserverId" type="text" class="text" style="width: 300px"> </div> + <div id="nfsServerChooseDiv" class="field tmpl-html" style="overflow:visible"> + <p class="text-help"> + $_("Please choose the nfs server you want to create storage pool.")</p> + <div style="width: 285px"> + <input id="nfsServerSelect" type="hidden"/> + <span class="text" id="nfs-server-label"></span><span class="arrow"></span> + <div style="width: 100%"> + <ul class="select-list" id="nfs-server-used" data-target="nfsServerSelect" data-label="nfs-server-label"> + </ul> + </div> + </div> + </div> </section> <section class="form-section"> <h2>4. $_("NFS Path")</h2> - <div class="field"> + <div class="field" style="overflow:visible"> <p class="text-help">$_("The nfs exported path on nfs server")</p> - <input id="nfspathId" type="text" class="text" - style="width: 300px"> - <input type="hidden" id="localpathId" class="text" - value="none"> - </div> - <div class="clear"></div> + <div style="width: 285px"> + <input id="nfspathId" class="text" disabled="disabled" style="width:293px;"/> + <span class="text" id="nfs-target-label"></span><span class="arrow"></span> + <div style="width: 100%"> + <ul class="select-list" id="nfs-server-target" data-target="nfspathId" data-label="nfs-target-label"> + </ul> + </div> + </div> + </div> </section> </div> <div class="logical-section tmpl-html"> -- 1.7.1

3 6

[PATCH V2 0/2] Add UI support of iscsi
by zhoumeina 06 Jan '14

06 Jan '14

v1-v2 modify some of translation messages Include create storage pool UI and translation files. zhoumeina (2): Add UI support of iscsi Add the ISCSI translation po files po/en_US.po | 31 +++++++++++++---- po/kimchi.pot | 30 ++++++++++++---- po/pt_BR.po | 31 +++++++++++++---- po/zh_CN.po | 31 +++++++++++++---- ui/js/src/kimchi.storagepool_add_main.js | 54 ++++++++++++++++++++++++----- ui/pages/i18n.html.tmpl | 7 ++-- ui/pages/storagepool-add.html.tmpl | 22 +++++++++++- 7 files changed, 159 insertions(+), 47 deletions(-) mode change 100644 => 100755 po/kimchi.pot

4 9

[PATCH] pep8 cleanup for distroloader.py
by Aline Manera 03 Jan '14

03 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> This patch cleans up pep8 style issue in distroloader.py Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- Makefile.am | 1 + src/kimchi/distroloader.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0fd92c8..5460240 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,7 @@ PEP8_WHITELIST = \ src/kimchi/cachebust.py \ src/kimchi/config.py.in \ src/kimchi/disks.py \ + src/kimchi/distroloader.py \ src/kimchi/root.py \ src/kimchi/server.py \ plugins/__init__.py \ diff --git a/src/kimchi/distroloader.py b/src/kimchi/distroloader.py index 6310644..98fd764 100644 --- a/src/kimchi/distroloader.py +++ b/src/kimchi/distroloader.py @@ -18,7 +18,7 @@ # # 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 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # import glob @@ -46,7 +46,7 @@ class DistroLoader(object): data = json.load(f) return data except ValueError: - msg = "DistroLoader: failed to parse json from distro file: %s" % fname + msg = "DistroLoader: failed to parse distro file: %s" % fname kimchi_log.error(msg) raise OperationFailed(msg) -- 1.7.10.4

2 2

[PATCH] pep8 cleanup for exception.py
by Aline Manera 03 Jan '14

03 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> This patch cleans up pep8 style issue in exception.py Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- Makefile.am | 1 + src/kimchi/exception.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0fd92c8..3b8e494 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,7 @@ PEP8_WHITELIST = \ src/kimchi/cachebust.py \ src/kimchi/config.py.in \ src/kimchi/disks.py \ + src/kimchi/exception.py \ src/kimchi/root.py \ src/kimchi/server.py \ plugins/__init__.py \ diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index d7a2835..df9619f 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -18,19 +18,24 @@ # # 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 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + class NotFoundError(Exception): pass + class OperationFailed(Exception): pass + class MissingParameter(Exception): pass + class InvalidParameter(Exception): pass + class InvalidOperation(Exception): pass -- 1.7.10.4

2 2

[PATCH 0/6] Refactore isoinfo.py
by Aline Manera 03 Jan '14

03 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (6): isoinfo: Add ignore_list paramter to main program isoinfo: Use absolute path only for local ISO files Move IsoFormatError() from isoinfo.py to exception.py Move ISO path validation to IsoImage() isoinfo: Move _probe_iso() to IsoImage() pep8 cleanup for isoinfo.py Makefile.am | 1 + src/kimchi/exception.py | 4 ++ src/kimchi/isoinfo.py | 138 +++++++++++++++++++++++----------------------- src/kimchi/model.py | 11 ++-- src/kimchi/scan.py | 5 +- src/kimchi/vmtemplate.py | 8 ++- 6 files changed, 87 insertions(+), 80 deletions(-) -- 1.7.10.4

3 22

[PATCH] plugin: fix dynamic import mechanism
by Zhou Zheng Sheng 03 Jan '14

03 Jan '14

The current kimchi plugin subsystem implement a dynamic discovery and import mechanism. It uses the Python builtin function __import__() to actually import a plugin module by name. However it turns out it only works when we start kimchi from the project source directory, not work when it is started from the installed path. This is because the __import__() accepts a "global" arugment and it needs "__name__", "__path__" and "__package__" in this "global" dict to determine the package context [1][2]. When in kimchi/utils.py it runs "import plugins.XXX", it actually fetch the "__package__" from utils.py, which is "kimchi", then it imports "kimchi.plugins.XXX" under the hood [3]. The current import_module() function calls __import__() without giving a global dict. When kimchid is started from /usr/bin, without the package context, __import__() can not find "plugins.sample". This patch provides the full package context to __import__() to mimic the standard "import" statement behavior. [1] http://docs.python.org/2/library/functions.html#__import__ [2] http://hg.python.org/cpython/file/990d7647ea51/Python/import.c [3] http://docs.python.org/2/reference/simple_stmts.html#import Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index f7eda93..b6d84fd 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -83,4 +83,4 @@ def import_class(class_path): def import_module(module_name): - return __import__(module_name, fromlist=['']) + return __import__(module_name, globals(), locals(), ['']) -- 1.7.11.7

4 6

[PATCH] Add jquery widget dropDown button
by zhoumeina 03 Jan '14

03 Jan '14

This patch is working for make dropDown button a jquery widget. We can create a dropdown button simply with: $('#buttonId').dropdownButton(); And in html: <div id="buttonId"> <span class="text">$_("Button label")</span><span class="arrow"></span> <div> <button><span class="text">$_("dropdownbutton1")</span></button> <button><span class="text">$_("dropdownbutton2")</span></button> </div> </div> If we need some other style, you can add it to html, and bind action in js. Not a perfect widget, but a beginning. Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> --- ui/js/widgets/button-dropDown.js | 42 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 ui/js/widgets/button-dropDown.js diff --git a/ui/js/widgets/button-dropDown.js b/ui/js/widgets/button-dropDown.js new file mode 100644 index 0000000..49259e3 --- /dev/null +++ b/ui/js/widgets/button-dropDown.js @@ -0,0 +1,42 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * zhoumeina <zhoumein(a)linux.vnet.ibm.com> + * + * 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. + */ +(function($) { + $.widget('kimchi.dropdownButton', { + options: { + key: 0, + value: 0 + }, + + _create : function() { + this.actionDiv = this.element; + this.actionDiv.addClass('btn dropdown popable'); + this.actionDiv.find('div').addClass('popover'); + this.actionDiv.find('button').addClass('button-big'); + }, + + _setOption : function(key,value) {}, + + destroy : function() { + // call the base destroy function + $.Widget.prototype.destroy.call(this); + } + }); +}(jQuery)); \ No newline at end of file -- 1.7.1

3 2

[PATCH] network improvment: add vms field
by shaohef＠linux.vnet.ibm.com 03 Jan '14

03 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Add vms field for network GET method update API.md add a function to get all vms attach to a network update model add vms field for Network Resource property update controller Now get the info of default network: $ curl -u <user>:<password> -H 'Content-type: application/json' -H 'Accept: application/json' -X GET http://localhost:8000/networks/default { "subnet":"192.168.122.0/24", "connection":"nat", "name":"default", "autostart":true, "state":"active", "interface":"virbr0", "dhcp":{ "start":"192.168.122.2", "end":"192.168.122.254" }, "vms":[ "rhel6", "opensuse12" ] } we can see, there are two vms attched to this network Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- docs/API.md | 1 + src/kimchi/controller.py | 1 + src/kimchi/model.py | 15 +++++++++++++++ 3 files changed, 17 insertions(+) diff --git a/docs/API.md b/docs/API.md index 9edc551..a3e6c8a 100644 --- a/docs/API.md +++ b/docs/API.md @@ -348,6 +348,7 @@ A interface represents available interface on host. * active: The Network is ready for use * inactive: The Network is not available * autostart: Network autostart onboot + * vms: all vms attached to this network * subnet: Network segment in slash-separated format with ip address and prefix * dhcp: DHCP services on the virtual network is enabled. * start: start boundary of a pool of addresses to be provided to DHCP clients. diff --git a/src/kimchi/controller.py b/src/kimchi/controller.py index 2940278..63b0820 100644 --- a/src/kimchi/controller.py +++ b/src/kimchi/controller.py @@ -459,6 +459,7 @@ class Network(Resource): @property def data(self): return {'name': self.ident, + 'vms': self.info['vms'], 'autostart': self.info['autostart'], 'connection': self.info['connection'], 'interface': self.info['interface'], diff --git a/src/kimchi/model.py b/src/kimchi/model.py index a6790b8..015eb46 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -546,6 +546,11 @@ class Model(object): xpath = "/domain/devices/disk[@device='disk']/source/@file" return xmlutils.xpath_get_text(xml, xpath) + def _vm_get_networks(self, dom): + xml = dom.XMLDesc(0) + xpath = "/domain/devices/interface[@type='network']/source/@network" + return xmlutils.xpath_get_text(xml, xpath) + def vm_delete(self, name): if self._vm_exists(name): conn = self.conn.get() @@ -844,6 +849,15 @@ class Model(object): conn = self.conn.get() return sorted(conn.listNetworks() + conn.listDefinedNetworks()) + def _get_vms_attach_to_a_network(self, network): + vms = [] + conn = self.conn.get() + for dom in conn.listAllDomains(): + networks = self._vm_get_networks(dom) + if network in networks: + vms.append(dom.name()) + return vms + def network_lookup(self, name): network = self._get_network(name) xml = network.XMLDesc(0) @@ -872,6 +886,7 @@ class Model(object): 'interface': interface, 'subnet': subnet, 'dhcp': dhcp, + 'vms': self._get_vms_attach_to_a_network(name), 'autostart': network.autostart() == 1, 'state': network.isActive() and "active" or "inactive"} -- 1.8.4.2

3 2

[RESEND PATCH V5 0/1] Open 8000 and 8001 port by default for distro packages
by taget＠linux.vnet.ibm.com 03 Jan '14

03 Jan '14

From: Eli Qiao <taget(a)linux.vnet.ibm.com> V5 - V4 changes: 1. Add cover-letter. (Aline) 2. Move clean up rules into if condition. (Aline) 3. Use with_systemd condition to check if use firewalld rules. (Aline) 4. Fix typo (Aline) V4 - V3 changes: 1 Fix typo in firewalld.xml (Rodrigo) V3 - V2 changes: 1.Rename kimchid.xml to firewalld.xml (Mark) 2.Remove firewalld from serivce require (Mark) 3.Fix typo V2 - V1 changes: 1.Add firewalld sevice configure file kimchid.xml to help open iptables port (Mark) 2.Add Ubuntu iptables rule (Royce) Eli Qiao (1): spec: Open 8000 and 8001 port by default contrib/DEBIAN/control.in | 3 ++- contrib/DEBIAN/postinst | 2 ++ contrib/DEBIAN/postrm | 2 ++ contrib/kimchi.spec.fedora.in | 24 +++++++++++++++++++++--- contrib/kimchi.spec.suse.in | 10 ++++++++-- src/Makefile.am | 1 + src/firewalld.xml | 7 +++++++ 7 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 src/firewalld.xml

3 3

[project-kimchi][PATCHv4 0/5] Storage server query support
by lvroyce＠linux.vnet.ibm.com 03 Jan '14

03 Jan '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v3>v4, fix inconsistency between doc and json schema v1>v3, fix racing problem, fix style. Add parameters to GET request so that we will query storage server as: /storageservers?type=netfs Royce Lv (5): Support params for GET method Add testcase for GET param Storage server: Update API.md storage server: update controller.py storage server: Update model and mockmodel docs/API.md | 13 +++++++++++++ src/kimchi/API.json | 11 +++++++++++ src/kimchi/controller.py | 26 ++++++++++++++++++++++++-- src/kimchi/mockmodel.py | 13 +++++++++++++ src/kimchi/model.py | 14 +++++++++++++- src/kimchi/root.py | 1 + tests/test_rest.py | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 112 insertions(+), 3 deletions(-) -- 1.8.1.2

4 23

[Patch v2 1/4] Move configuration parsing to config.py
by Mark Wu 02 Jan '14

02 Jan '14

The configruation is also needed for other code except starting kimchi server. So it should be moved to a separate module, config.py. Then the configuration can be accessed directly by importing config module. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/config.py.in | 23 ++++++++++++++++++++--- src/kimchid.in | 20 +------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index f3c408a..49d42db 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -25,11 +25,9 @@ import libvirt import os import platform - - +from ConfigParser import SafeConfigParser from glob import iglob - from kimchi.xmlutils import xpath_get_text @@ -166,5 +164,24 @@ def get_plugin_tab_xml(name): return os.path.join(_get_plugin_ui_dir(name), 'config/tab-ext.xml') +CONFIG_FILE = "%s/kimchi.conf" % get_config_dir() +DEFAULT_LOG_LEVEL = "debug" + +config = SafeConfigParser() +config.add_section("server") +config.set("server", "host", "0.0.0.0") +config.set("server", "port", "8000") +config.set("server", "ssl_port", "8001") +config.set("server", "ssl_cert", "") +config.set("server", "ssl_key", "") +config.set("server", "environment", "development") +config.add_section("logging") +config.set("logging", "log_dir", get_default_log_dir()) +config.set("logging", "log_level", DEFAULT_LOG_LEVEL) + +if os.path.exists(CONFIG_FILE): + config.read(CONFIG_FILE) + + if __name__ == '__main__': print get_prefix() diff --git a/src/kimchid.in b/src/kimchid.in index 7865713..548fa52 100644 --- a/src/kimchid.in +++ b/src/kimchid.in @@ -33,31 +33,13 @@ import kimchi.config if kimchi.config.without_installation(): sys.path.append(kimchi.config.get_prefix()) -from ConfigParser import SafeConfigParser +from kimchi.config import config from optparse import OptionParser ACCESS_LOG = "kimchi-access.log" ERROR_LOG = "kimchi-error.log" -CONFIG_FILE = "%s/kimchi.conf" % kimchi.config.get_config_dir() -DEFAULT_LOG_DIR = kimchi.config.get_default_log_dir() -DEFAULT_LOG_LEVEL = "debug" def main(options): - config = SafeConfigParser() - config.add_section("server") - config.set("server", "host", "0.0.0.0") - config.set("server", "port", "8000") - config.set("server", "ssl_port", "8001") - config.set("server", "ssl_cert", "") - config.set("server", "ssl_key", "") - config.set("server", "environment", "development") - config.add_section("logging") - config.set("logging", "log_dir", DEFAULT_LOG_DIR) - config.set("logging", "log_level", DEFAULT_LOG_LEVEL) - - if os.path.exists(CONFIG_FILE): - config.read(CONFIG_FILE) - host = config.get("server", "host") port = config.get("server", "port") ssl_port = config.get("server", "ssl_port") -- 1.8.3.1

4 15

[PATCH] Issue #293: Resizing Issue When There Are Multiple Grids
by Hongliang Wang 02 Jan '14

02 Jan '14

Resizing function corrupts when there are more than one kimchi.widget.Grid instances in a page. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 6e5f1fe..022c4f5 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -308,6 +308,7 @@ kimchi.widget.Grid = function(params) { left - leftmostOffset ); fixTableLayout(); + columnBeingResized = null; }; var resizeColumnWidth = function(index, width) { -- 1.8.1.4

3 2

[PATCHv2 0/3] Storage targets support
by lvroyce＠linux.vnet.ibm.com 02 Jan '14

02 Jan '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, when showmount got no result, instead of fail the request, return empty list to user. NOTE: this patchset depends on storage server support patchset. Tested in Fedora 19, due to libvirt bug, ubuntu 13.10 cannot be tested, fixing. Usage: GET /storageservers/<ip or hostname>/storagetargets?target_type=netfs Royce Lv (3): storage target: Update API.md storage target: Update controller and json schema storage target: Add model support docs/API.md | 9 +++++++++ src/kimchi/API.json | 11 +++++++++++ src/kimchi/controller.py | 30 ++++++++++++++++++++++++++++-- src/kimchi/model.py | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 2 deletions(-) -- 1.8.1.2

3 7

[PATCH v4 0/5] Support Creating iSCSI storage pool
by Zhou Zheng Sheng 02 Jan '14

02 Jan '14

This patch series is about creating iSCSI storage pool. After this patch, you can create an ISCSI storage pool as the following. curl -u root -H 'Content-type: application/json' \ -H 'Accept: application/json' \ -d '{"source": { "target": "iqn.2013-01.example.com.targetname", "host": "192.168.X.X", "port": 326X, "auth": {"username": "testUser", "password": "123456"}}, "type": "iscsi", "name": "testIscsiPool"}' \ http://127.0.0.1:8000/storagepools Note the "port" and "auth" is optional. Thanks the reviewers. I took most of reviewer advices and submit this v4 patch series. Tested the patch over LIO iSCSI target and libvirt-1.1.4-1.fc19. http://linux-iscsi.org/wiki/ISCSI v3 -> v4 storagepool: refactor _get_pool_xml() Change StoragePoolDef.get_xml() into a cached property StoragePoolDef.xml. storagepool: rename and consolidate arguments of creating (front end) No change. storagepool: rename and consolidate arguments of creating (back end) Update src/kimchi/API.json storagepool: Support Creating iSCSI storagepool in model.py Fix typo. Give the iscsiadm wrapper class a friendly name TargetClient. Update API.json. Update RPM spec files and Debian control file. iscsi.validate_iscsi_target() is now TargetClient.validate(). test_model: test creating iSCSI storage pool Since the parent patch changed interface, the tests also change to use StoragePoolDef.xml and TargetClient.validate(), no other change. Zhou Zheng Sheng (5): storagepool: refactor _get_pool_xml() storagepool: rename and consolidate arguments of creating (back end) storagepool: rename and consolidate arguments of creating (front end) storagepool: Support Creating iSCSI storagepool in model.py test_model: test creating iSCSI storage pool Makefile.am | 2 + contrib/DEBIAN/control.in | 3 +- contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 28 ++-- src/kimchi/API.json | 69 ++++++++++ src/kimchi/Makefile.am | 1 + src/kimchi/iscsi.py | 89 ++++++++++++ src/kimchi/model.py | 227 +++++++++++++++++++++++++------ tests/Makefile.am | 1 + tests/test_model.py | 89 ++++++------ tests/test_storagepool.py | 156 +++++++++++++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 13 +- 13 files changed, 590 insertions(+), 90 deletions(-) create mode 100644 src/kimchi/iscsi.py create mode 100644 tests/test_storagepool.py -- 1.7.11.7

3 16

[PATCH V5 0/7] template supports networks
by shaohef＠linux.vnet.ibm.com 02 Jan '14

02 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V4 -> V5: rebase to the latest commit. for "move RollbackContext..." merged. V3 -> V4: after template supports networks, we should change the test case accordingly aline refactor controller, rebase to the latest commit. V2 -> V3: fix typo. support creating a vm without network. V1 -> V2: update mockmodel and test case add 'networks' option for template get/create/update ShaoHe Feng (7): template supports networks: let template xml support more networks template supports networks: fix test case template supports networks: update API template supports networks: update controller and json schema template supports networks: update model template supports networks: update mockmodel template supports networks: update test case docs/API.md | 4 ++ src/kimchi/API.json | 12 ++++++ src/kimchi/control/templates.py | 3 +- src/kimchi/mockmodel.py | 7 +++- src/kimchi/model.py | 25 ++++++++----- src/kimchi/osinfo.py | 5 ++- src/kimchi/vmtemplate.py | 20 ++++++++-- tests/test_model.py | 82 ++++++++++++++++++++++++++++++++--------- tests/test_osinfo.py | 2 +- tests/test_rest.py | 56 ++++++++++++++++++++++++++++ tests/test_vmtemplate.py | 6 +-- 11 files changed, 182 insertions(+), 40 deletions(-) -- 1.8.4.2

2 12

[PATCH V2 0/2] move RollbackContext from tests/utils to src/kimchi/rollbackcontext
by shaohef＠linux.vnet.ibm.com 31 Dec '13

31 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2: rebase ShaoHe Feng (2): move RollbackContext from tests/utils to src/kimchi/rollbackcontext touch 4 files when move RollbackContext, fix pep8 on them Makefile.am | 10 ++-- src/kimchi/Makefile.am | 59 +++++++++++------------ src/kimchi/rollbackcontext.py | 71 +++++++++++++++++++++++++++ tests/test_model.py | 108 +++++++++++++++++++++++++----------------- tests/test_rest.py | 73 +++++++++++++++------------- tests/utils.py | 59 ++++------------------- 6 files changed, 224 insertions(+), 156 deletions(-) create mode 100644 src/kimchi/rollbackcontext.py -- 1.8.4.2

2 5

[PATCH V4 0/7] template supports networks
by shaohef＠linux.vnet.ibm.com 31 Dec '13

31 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4: after template supports networks, we should change the test case accordingly aline refactor controller, rebase on the latest commit. V2 -> V3: fix typo. support creating a vm without network. V1 -> V2: update mockmodel and test case add 'networks' option for template get/create/update ShaoHe Feng (7): template supports networks: let template xml support more networks template supports networks: fix test case template supports networks: update API template supports networks: update controller and json schema template supports networks: update model template supports networks: update mockmodel template supports networks: update test case docs/API.md | 4 ++ src/kimchi/API.json | 12 ++++++ src/kimchi/control/templates.py | 3 +- src/kimchi/mockmodel.py | 7 +++- src/kimchi/model.py | 25 +++++++----- src/kimchi/osinfo.py | 5 ++- src/kimchi/vmtemplate.py | 20 ++++++++-- tests/test_model.py | 86 ++++++++++++++++++++++++++++++++--------- tests/test_osinfo.py | 2 +- tests/test_rest.py | 56 +++++++++++++++++++++++++++ tests/test_vmtemplate.py | 6 +-- 11 files changed, 185 insertions(+), 41 deletions(-) -- 1.8.4.2

1 7

[PATCH 00/15 V2] Reorganize controller module
by Aline Manera 31 Dec '13

31 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> V1 -> V2: - Remove 'instance' parameter from generate_action_handler() - Update Makefile and spec files - Remove controller content when it is moved to new files - Update authors in new files - Fix identation error while using pep8 1.4 - Other minor fixes Aline Manera (15): Move generate_action_handler() function to Resource() class Move common functions for Resource and Collection to control/utils.py Move login() and logout() functions from controller.py to root.py Move basic controller resources to control/base.py Move all resources related to vms to control/vms.py Move all resources related to templates to control/templates.py Move all resources related to debug reports to control/debugreports.py Move all resources related to storage pools to control/storagepools.py Move all resources related to storage volume to control/storagevolumes.py Move all resources related to interfaces to control/interfaces.py Move all resources related to networks to control/networks.py Move all resources related to config to control/config.py Move all resources related to host to control/host.py Move all resources related to plugins to control/plugins.py Move all resources related to tasks to control/tasks.py Makefile.am | 1 + configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + plugins/sample/__init__.py | 2 +- src/kimchi/Makefile.am | 3 +- src/kimchi/control/Makefile.am | 28 ++ src/kimchi/control/__init__.py | 21 + src/kimchi/control/base.py | 292 +++++++++++++ src/kimchi/control/config.py | 69 ++++ src/kimchi/control/debugreports.py | 52 +++ src/kimchi/control/host.py | 63 +++ src/kimchi/control/interfaces.py | 45 ++ src/kimchi/control/networks.py | 48 +++ src/kimchi/control/plugins.py | 45 ++ src/kimchi/control/storagepools.py | 127 ++++++ src/kimchi/control/storagevolumes.py | 81 ++++ src/kimchi/control/tasks.py | 41 ++ src/kimchi/control/templates.py | 52 +++ src/kimchi/control/utils.py | 105 +++++ src/kimchi/control/vms.py | 65 +++ src/kimchi/controller.py | 755 ---------------------------------- src/kimchi/root.py | 62 ++- tests/test_mockmodel.py | 6 +- 24 files changed, 1191 insertions(+), 775 deletions(-) create mode 100644 src/kimchi/control/Makefile.am create mode 100644 src/kimchi/control/__init__.py create mode 100644 src/kimchi/control/base.py create mode 100644 src/kimchi/control/config.py create mode 100644 src/kimchi/control/debugreports.py create mode 100644 src/kimchi/control/host.py create mode 100644 src/kimchi/control/interfaces.py create mode 100644 src/kimchi/control/networks.py create mode 100644 src/kimchi/control/plugins.py create mode 100644 src/kimchi/control/storagepools.py create mode 100644 src/kimchi/control/storagevolumes.py create mode 100644 src/kimchi/control/tasks.py create mode 100644 src/kimchi/control/templates.py create mode 100644 src/kimchi/control/utils.py create mode 100644 src/kimchi/control/vms.py delete mode 100644 src/kimchi/controller.py -- 1.7.10.4

3 46

[PATCH V3 0/6] template supports networks
by shaohef＠linux.vnet.ibm.com 31 Dec '13

31 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 fix typo. support creating a vm without network. V1 -> V2: update mockmodel and test case add 'networks' option for template get/create/update ShaoHe Feng (6): template supports networks: let template xml support more networks template supports networks: update API template supports networks: update controller and json schema template supports networks: update model template supports networks: update mockmodel template supports networks: update test case docs/API.md | 4 +++ src/kimchi/API.json | 12 +++++++ src/kimchi/controller.py | 3 +- src/kimchi/mockmodel.py | 7 +++- src/kimchi/model.py | 6 ++++ src/kimchi/osinfo.py | 5 +-- src/kimchi/vmtemplate.py | 20 ++++++++--- tests/test_model.py | 86 +++++++++++++++++++++++++++++++++++++----------- tests/test_rest.py | 56 +++++++++++++++++++++++++++++++ 9 files changed, 172 insertions(+), 27 deletions(-) -- 1.8.4.2

4 19

[PATCH 0/2] pep8 cleanup for featuretests.py and simplify domain xml
by Aline Manera 31 Dec '13

31 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (2): pep8 cleanup for featuretests.py Simplify domain xml in featuretests.py Makefile.am | 1 + src/kimchi/featuretests.py | 24 +++++------------------- 2 files changed, 6 insertions(+), 19 deletions(-) -- 1.7.10.4

3 7

[PATCH 1/2] move RollbackContext from tests/utils to src/kimchi/rollbackcontext
by shaohef＠linux.vnet.ibm.com 31 Dec '13

31 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Then kimchi source code can make use of it Also add src/kimchi/rollbackcontext.py in dist list Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/Makefile.am | 59 +++++++++++++++++------------------ src/kimchi/rollbackcontext.py | 71 +++++++++++++++++++++++++++++++++++++++++++ tests/test_model.py | 25 +++++++-------- tests/test_rest.py | 3 +- tests/utils.py | 45 --------------------------- 5 files changed, 116 insertions(+), 87 deletions(-) create mode 100644 src/kimchi/rollbackcontext.py diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am index 47a3bd2..2f05ab7 100644 --- a/src/kimchi/Makefile.am +++ b/src/kimchi/Makefile.am @@ -21,35 +21,36 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA kimchi_PYTHON = \ - asynctask.py \ - auth.py \ - controller.py \ - disks.py \ - distroloader.py \ - exception.py \ - __init__.py \ - isoinfo.py \ - netinfo.py \ - network.py \ - networkxml.py \ - mockmodel.py \ - model.py \ - objectstore.py \ - osinfo.py \ - root.py \ - scan.py \ - screenshot.py \ - server.py \ - sslcert.py \ - template.py \ - vmtemplate.py \ - vnc.py \ - websocket.py \ - websockify.py \ - xmlutils.py \ - utils.py \ - cachebust.py \ - featuretests.py + __init__.py \ + asynctask.py \ + auth.py \ + cachebust.py \ + controller.py \ + disks.py \ + distroloader.py \ + exception.py \ + featuretests.py \ + isoinfo.py \ + mockmodel.py \ + model.py \ + netinfo.py \ + network.py \ + networkxml.py \ + objectstore.py \ + osinfo.py \ + rollbackcontext.py \ + root.py \ + scan.py \ + screenshot.py \ + server.py \ + sslcert.py \ + template.py \ + utils.py \ + vmtemplate.py \ + vnc.py \ + websocket.py \ + websockify.py \ + xmlutils.py nodist_kimchi_PYTHON = config.py diff --git a/src/kimchi/rollbackcontext.py b/src/kimchi/rollbackcontext.py new file mode 100644 index 0000000..2afd114 --- /dev/null +++ b/src/kimchi/rollbackcontext.py @@ -0,0 +1,71 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2013 +# +# Authors: +# Adam Litke <agl(a)linux.vnet.ibm.com> +# ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> +# +# 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 sys + + +class RollbackContext(object): + ''' + A context manager for recording and playing rollback. + The first exception will be remembered and re-raised after rollback + + Sample usage: + with RollbackContext() as rollback: + step1() + rollback.prependDefer(lambda: undo step1) + def undoStep2(arg): pass + step2() + rollback.prependDefer(undoStep2, arg) + ''' + def __init__(self, *args): + self._finally = [] + + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_value, traceback): + firstException = exc_value + + for undo, args, kwargs in self._finally: + try: + undo(*args, **kwargs) + except Exception as e: + # keep the earliest exception info + if not firstException: + firstException = e + # keep the original traceback info + traceback = sys.exc_info()[2] + + # re-raise the earliest exception + if firstException is not None: + if type(firstException) is str: + sys.stderr.write(firstException) + else: + raise firstException, None, traceback + + def defer(self, func, *args, **kwargs): + self._finally.append((func, args, kwargs)) + + def prependDefer(self, func, *args, **kwargs): + self._finally.insert(0, (func, args, kwargs)) diff --git a/tests/test_model.py b/tests/test_model.py index e19364f..7ecd8c6 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -38,6 +38,7 @@ import utils from kimchi import netinfo from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed +from kimchi.rollbackcontext import RollbackContext class ModelTests(unittest.TestCase): @@ -72,7 +73,7 @@ class ModelTests(unittest.TestCase): def test_vm_lifecycle(self): inst = kimchi.model.Model(objstore_loc=self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: params = {'name': 'test', 'disks': []} inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') @@ -97,7 +98,7 @@ class ModelTests(unittest.TestCase): def test_vm_storage_provisioning(self): inst = kimchi.model.Model(objstore_loc=self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: params = {'name': 'test', 'disks': [{'size': 1}]} inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') @@ -115,7 +116,7 @@ class ModelTests(unittest.TestCase): def test_storagepool(self): inst = kimchi.model.Model('qemu:///system', self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: path = '/tmp/kimchi-images' name = 'test-pool' if not os.path.exists(path): @@ -168,7 +169,7 @@ class ModelTests(unittest.TestCase): def test_storagevolume(self): inst = kimchi.model.Model('qemu:///system', self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: path = '/tmp/kimchi-images' pool = 'test-pool' vol = 'test-volume.img' @@ -223,7 +224,7 @@ class ModelTests(unittest.TestCase): def test_template_storage_customise(self): inst = kimchi.model.Model(objstore_loc=self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: path = '/tmp/kimchi-images' pool = 'test-pool' if not os.path.exists(path): @@ -295,7 +296,7 @@ class ModelTests(unittest.TestCase): orig_params = {'name': 'test', 'memory': '1024', 'cpus': '1'} inst.templates_create(orig_params) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: params_1 = {'name': 'kimchi-vm1', 'template': '/templates/test'} params_2 = {'name': 'kimchi-vm2', 'template': '/templates/test'} inst.vms_create(params_1) @@ -326,7 +327,7 @@ class ModelTests(unittest.TestCase): def test_network(self): inst = kimchi.model.Model('qemu:///system', self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: name = 'test-network' networks = inst.networks_get_list() @@ -480,7 +481,7 @@ class ModelTests(unittest.TestCase): def test_delete_running_vm(self): inst = kimchi.model.Model(objstore_loc=self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: params = {'name': u'test', 'disks': []} inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') @@ -501,7 +502,7 @@ class ModelTests(unittest.TestCase): def test_vm_list_sorted(self): inst = kimchi.model.Model(objstore_loc=self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: params = {'name': 'test', 'disks': []} inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') @@ -517,7 +518,7 @@ class ModelTests(unittest.TestCase): def test_use_test_host(self): inst = kimchi.model.Model('test:///default', objstore_loc=self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: params = {'name': 'test', 'disks': [], 'storagepool': '/storagepools/default-pool', 'domain': 'test', @@ -546,7 +547,7 @@ class ModelTests(unittest.TestCase): inst.debugreport_delete(namePrefix + '*') except NotFoundError: pass - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: report_list = inst.debugreports_get_list() self.assertFalse(reportName in report_list) try: @@ -617,7 +618,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_deep_scan(self): inst = kimchi.model.Model('qemu:///system', objstore_loc=self.tmp_store) - with utils.RollbackContext() as rollback: + with RollbackContext() as rollback: path = '/tmp/kimchi-images/tmpdir' if not os.path.exists(path): os.makedirs(path) diff --git a/tests/test_rest.py b/tests/test_rest.py index 73946c0..1b7312f 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -33,8 +33,9 @@ from functools import partial import kimchi.mockmodel import kimchi.server from kimchi.asynctask import AsyncTask +from kimchi.rollbackcontext import RollbackContext from utils import fake_user, get_free_port, https_request, patch_auth, request -from utils import RollbackContext, run_server +from utils import run_server test_server = None diff --git a/tests/utils.py b/tests/utils.py index a7596e8..960e0be 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -140,51 +140,6 @@ def https_request(host, port, path, data=None, method='GET', headers=None): return _request(conn, path, data, method, headers) -class RollbackContext(object): - ''' - A context manager for recording and playing rollback. - The first exception will be remembered and re-raised after rollback - - Sample usage: - with RollbackContext() as rollback: - step1() - rollback.prependDefer(lambda: undo step1) - def undoStep2(arg): pass - step2() - rollback.prependDefer(undoStep2, arg) - ''' - def __init__(self, *args): - self._finally = [] - - def __enter__(self): - return self - - def __exit__(self, exc_type, exc_value, traceback): - firstException = exc_value - - for undo, args, kwargs in self._finally: - try: - undo(*args, **kwargs) - except Exception as e: - # keep the earliest exception info - if not firstException: - firstException = e - # keep the original traceback info - traceback = sys.exc_info()[2] - - # re-raise the earliest exception - if firstException is not None: - if type(firstException) is str: - sys.stderr.write(firstException) - else: - raise firstException, None, traceback - - def defer(self, func, *args, **kwargs): - self._finally.append((func, args, kwargs)) - - def prependDefer(self, func, *args, **kwargs): - self._finally.insert(0, (func, args, kwargs)) - def patch_auth(): """ Override the authenticate function with a simple test against an -- 1.8.4.2

2 4

[PATCH V2] fix whitespace in test_mockmodel
by shaohef＠linux.vnet.ibm.com 31 Dec '13

31 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 remove the unuseful comment Commit e467b32 brings a whitespace, fix it. Also fix pep8. ShaoHe Feng (1): fix whitespace in test_mockmodel Makefile.am | 1 + tests/test_mockmodel.py | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) -- 1.8.4.2

2 3