October 2014 - Kimchi-devel - oVirt List Archives

[RFC] New API to create a random guest console password
by Aline Manera 02 Apr '15

02 Apr '15

Today user may set/change the guest console password and also its expiration time through Kimchi API. When passing an empty password, a random password is automatically generated. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": ""}}' That way is difficult to handle when user wants to reset the guest password. We have a similar issue when we automatically change the passwdValidTo when it is expired - increasing it in 30 seconds. My proposal is simple: only change "passwd" and "passwdValidTo" when user wants to do it. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": "123456", "passwdValidTo": "<some datetime format>"}}' curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwdValidTo": "<some datetime format>"}}' And make sure the passwdValidTo is only acceptable when there is a passwd set. And to reset those values, we only need to send an empty string: curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"password": "", "passwdValidTo": ""}}' And create a new API: POST /vms/blah/ticket to automatically generate a random password valid only for 30 seconds. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah/ticket -X POST -d'{}' What do you think about it? Regards, Aline Manera

2 3

[PATCH] Add PPC console configuration to guest XML
by Rodrigo Trujillo 10 Nov '14

10 Nov '14

When creating a VM from template, add PPC console configuration to xml. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index cfc46f6..d18fc59 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -409,6 +409,16 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> </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): -- 1.9.3

2 15

[PATCHv2 0/7] LDAP authentication and authorization
by lvroyce0210＠gmail.com 10 Nov '14

10 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (7): Add configuration of LDAP Split PAM and LDAP authentication Add LDAP authentication Fix test cases for authentication Split users and groups for permission query Move validation to user and host change vm permission tag contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 12 ++-- src/kimchi.conf.in | 17 +++++ src/kimchi/auth.py | 157 +++++++++++++++++++++++++++++++----------- src/kimchi/config.py.in | 5 ++ src/kimchi/control/host.py | 7 ++ src/kimchi/i18n.py | 1 + src/kimchi/model/host.py | 97 +++++++++++++++++++++++++- src/kimchi/model/vms.py | 38 +++++----- tests/utils.py | 43 ++++++++---- 12 files changed, 303 insertions(+), 77 deletions(-) -- 1.8.3.2

3 22

Browser based Web Linux Console -- Serial Console
by Yu Xin Huo 07 Nov '14

07 Nov '14

Below are quite promising. http://www.unixmen.com/ajaxterm-a-web-based-terminal-that-help-you-use-ssh-… http://www.web-console.org/ http://www.tecmint.com/shell-in-a-box-a-web-based-ssh-terminal-to-access-re… http://xmodulo.com/access-ssh-terminal-web-browser-linux.html http://www.unixmen.com/keybox-web-based-ssh-console-manage-multiple-ssh-ses…

2 4

[PATCH V3] Guest disk hot plug UI
by Wen Wang 04 Nov '14

04 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Minor changes according to JQuery rules. V1 -> V2: Enable CDROM hot plug including detaching. Enable users add and detach disk when vm is running. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 030e112..fba7f05 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -57,17 +57,12 @@ kimchi.guest_edit_main = function() { text: false }); - if(kimchi.thisVMState != "running") { - $('.detach', container).button({ - icons: { - primary: 'ui-icon-trash' - }, - text: false - }); - - } else { - $('.detach', container).remove(); - } + $('.detach', container).button({ + icons: { + primary: 'ui-icon-trash' + }, + text: false + }); $('.save', container).button({ icons: { @@ -443,14 +438,8 @@ kimchi.guest_edit_main = function() { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); kimchi.thisVMState = guest['state']; - refreshCDROMs(); - if(kimchi.thisVMState === "running") { - $("#form-guest-edit-general input").prop("disabled", "disabled"); - $("#guest-edit-attach-cdrom-button").remove(); - $("#form-guest-edit-interface .header button").remove(); - } else { - $('#guest-edit-attach-cdrom-button').button({ + $('#guest-edit-attach-cdrom-button').button({ icons: { primary: "ui-icon-plusthick" }, @@ -459,6 +448,10 @@ kimchi.guest_edit_main = function() { event.preventDefault(); kimchi.window.open("guest-storage-add.html"); }); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-general input").prop("disabled", true); + $("#form-guest-edit-interface .header button").remove(); + } else { $("#action-button-container").removeClass("hidden"); } -- 1.7.1

3 5

[v3] UI: Clone Guest
by huoyuxin＠linux.vnet.ibm.com 03 Nov '14

03 Nov '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/button.css | 4 + ui/css/theme-default/list.css | 18 +++++ ui/js/src/kimchi.api.js | 34 ++++++++- ui/js/src/kimchi.guest_main.js | 149 +++++++++++++++++++++++++++++++++------ ui/pages/guest.html.tmpl | 6 ++- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 186 insertions(+), 26 deletions(-) diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 499bf4a..0df53a6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -50,6 +50,10 @@ cursor: pointer; } +.btn[disabled] { + opacity: 0.3; +} + .btn:not([disabled]):hover { box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..fc3017b 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/loading.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..465755c 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -806,12 +806,27 @@ var kimchi = { }); }, - getStoragePoolVolume: function(poolName, volumeName, suc, err) { + getStoragePool: function(poolName, suc, err, async) { + var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName); + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + async : async==undefined?true:async, + timeout: 2000, + dataType : 'json', + success : suc, + error : err + }); + }, + + getStoragePoolVolume: function(poolName, volumeName, suc, err, async) { var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName); kimchi.requestJSON({ url : url, type : 'GET', contentType : 'application/json', + async : async==undefined?true:async, timeout: 2000, dataType : 'json', success : suc, @@ -1233,5 +1248,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..48e71f7 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -276,21 +323,79 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } //Setup action event handlers - guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); - guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); - if (vmRunningBool) { //If the guest is not running, do not enable reset - guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); - } - if (vmRunningBool) { //If the guest is not running, do not enable shutdown - guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); - } - guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); - guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + if(!vmObject.isCloning){ + guestActions.find("[name=vm-start]").on({click : kimchi.vmstart}); + guestActions.find("[name=vm-poweroff]").on({click : kimchi.vmpoweroff}); + if (vmRunningBool) { //If the guest is not running, do not enable reset + guestActions.find("[name=vm-reset]").on({click : kimchi.vmreset}); + } + if (vmRunningBool) { //If the guest is not running, do not enable shutdown + guestActions.find("[name=vm-shutdown]").on({click : kimchi.vmshutdown}); + } + guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); + guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + var guest = $(this).closest('li[name=guest]').attr("id"); + kimchi.listVMStorages({ + vm: guest, + storageType: 'disk' + }, function(disks){ + var guestStorage = {}; + for(var i=0; i<disks.length; i++){ + var pool, volume; + kimchi.getStoragePool(disks[i].pool, function(data){ + pool = data; + }, undefined, false); + kimchi.getStoragePoolVolume(disks[i].pool, disks[i].vol, function(data){ + volume = data; + }, undefined, false); + if(!guestStorage[pool.name]){ + guestStorage[pool.name] = { + pool: pool, + volumes: [volume], + totalVolumeSize: volume.capacity + }; + }else{ + guestStorage[pool.name].volumes.push(volume); + guestStorage[pool.name].totalVolumeSize += volume.capacity; + } + } + var needConfirm = false; + for(x in guestStorage){ + if(guestStorage[x].pool.type.indexOf('scsi')!=-1||guestStorage[x].pool.available<guestStorage[x].totalVolumeSize){ + needConfirm = true; + break; + } + } + if(needConfirm){ + kimchi.confirm({ + title : i18n['KCHAPI6006M'], + content : i18n['KCHVM6010M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }, function() { + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + }, null); + }else{ + kimchi.cloneGuest(guest, function(data){ + kimchi.listVmsAuto(); + }); + } + }); + }); + + //Maintain menu open state + var actionMenu=guestActions.find("div[name=actionmenu]"); + if (openMenu) { + $('.popover', actionMenu).toggle(); + } - //Maintain menu open state - var actionMenu=guestActions.find("div[name=actionmenu]"); - if (openMenu) { - $('.popover', actionMenu).toggle(); + }else{ + guestActions.find('.btn').attr('disabled', true); + result.find('.guest-clone').removeClass('hide-content'); + $('.popover', guestActions.find("div[name=actionmenu]")).remove(); } return result; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..56abd36 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -128,6 +128,7 @@ "KCHVM6007M": "$_("Note the guest OS may ignore this request. Would you like to continue?")", "KCHVM6008M": "$_("Virtual Machine delete Confirmation")", "KCHVM6009M": "$_("This virtual machine is not persistent. Power Off will delete it. Continue?")", + "KCHVM6010M": "$_("When the target guest has SCSI or iSCSI volumes, they will be cloned on default storage pool. The same will happen when the target pool does not have enough space to clone the volumes. Do you want to continue?")", "KCHVMCD6001M": "$_("This CDROM will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHVMCD6002M": "$_("Attach")", -- 1.7.1

4 4

[WIP PATCH 0/5] Clone VMs
by Crístian Viana 03 Nov '14

03 Nov '14

To clone a VM, try the following command: POST /vms/<vm-name>/clone. This is a work in progress! It's not finished yet and there are bugs! I'm only sending it now to get early feedback. I'm aware of the following issues: - BUG: cannot delete a recently cloned VM. This is because the clone function doesn't refresh the VM storage pools. I already started fixing this. - The storage volumes handling is not implemented. The current implementation should only work for DIR and NFS (well, it doesn't work completely because of the bug described above...). - The mockmodel implementation is missing. - The tests are missing. Crístian Viana (5): Make function "randomMAC" public Register Kimchi's namespace when updating XML Allow to update XML attribute in "xml_item_update" Render different types of data in generate_action_handler Add feature to clone VMs docs/API.md | 5 ++ src/kimchi/control/base.py | 37 ++++++++++---- src/kimchi/control/host.py | 18 ++----- src/kimchi/control/vms.py | 1 + src/kimchi/i18n.py | 1 + src/kimchi/model/vmifaces.py | 18 +++---- src/kimchi/model/vms.py | 116 ++++++++++++++++++++++++++++++++++++++++++- src/kimchi/xmlutils.py | 15 ++++-- 8 files changed, 172 insertions(+), 39 deletions(-) -- 1.9.3

3 16

[PATCH 0/7] Use the common get_disk_xml() to generate VMTemplate disks
by Aline Manera 03 Nov '14

03 Nov '14

Aline Manera (7): Make disk type an optional parameter on get_disk_xml() Set guest disk cache to none to support live migration Change VMTemplate._get_scsi_disks_xml() to use the common get_disk_xml() Change VMTemplate._get_iscsi_disks_xml() to use the common get_disk_xml() Change VMTemplate._get_disks_xml() to use the common get_disk_xml() Change VMTemplate._get_disks_xml() to handle all type of disks Remove VMTemplate._get_scsi_disks_xml() and VMTemplate._get_iscsi_disks_xml() src/kimchi/model/vmstorages.py | 1 + src/kimchi/vmtemplate.py | 108 ++++++++++++----------------------------- src/kimchi/xmlutils/disk.py | 10 +++- tests/test_model.py | 3 +- 4 files changed, 42 insertions(+), 80 deletions(-) -- 1.9.3

2 11

[PATCHv2] ISSUE#466: Filter valid format only on volume type of 'file'
by lvroyce0210＠gmail.com 03 Nov '14

03 Nov '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When volume type is block, filter will prevent volume to be attached due to its format is 'unknown'. Change the filter to only apply to 'file' type, so that block will not be blocked. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 055aa50..fea110f 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -153,17 +153,18 @@ class VMStoragesModel(object): if vol_info['ref_cnt'] != 0: raise InvalidParameter("KCHVMSTOR0016E") - supported_format = { + params['path'] = vol_info['path'] + valid_format = { "disk": ["raw", "bochs", "qcow", "qcow2", "qed", "vmdk"], "cdrom": "iso"} - if vol_info['format'] in supported_format[params['type']]: - if params['type'] == 'disk': + if vol_info['type'] == 'file': + if (params['type'] == 'disk' and + vol_info['format'] in valid_format[params['type']]): params['format'] = vol_info['format'] - else: - raise InvalidParameter("KCHVMSTOR0018E", - {"format": vol_info['format'], - "type": params['type']}) - params['path'] = vol_info['path'] + else: + raise InvalidParameter("KCHVMSTOR0018E", + {"format": vol_info['format'], + "type": params['type']}) params['src_type'] = _check_path(params['path']) if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): -- 1.8.3.2

2 3

[PATCH] Edit Template redefined
by Wen Wang 03 Nov '14

03 Nov '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch redesigned "Edit Template" diaguage in "Templates". New "Edit Template" will display all the related information into tabs of "General", "Storage" and "Interface". Due to unfinished back-end work, functions are not fully supported, which will be finished in the future work. Temporary disabled functions: 1) Multiple disk operation with multiple storage pools edit in template for which reason the add button in "Storage" tab is disabled. 2) iSCSI and SCSI storage pool add is removed since we are going to allow this kind of operation in the process of creating a VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 84 +++++++- ui/js/src/kimchi.template_edit_main.js | 336 ++++++++++++++++++++++---------- ui/pages/template-edit.html.tmpl | 169 +++++++++------- 3 files changed, 402 insertions(+), 187 deletions(-) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 4975f1b..302c488 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -17,24 +17,33 @@ */ #template-edit-window { font-size: 13px; - height: 600px; - width: 1000px; + height: 500px; + width: 800px; } -.template-edit-fieldset { - float: left; - padding: 1em; +#edit-template-tabs { + background: none repeat scroll 0 0 transparent; + border: medium none; + height: 100%; + padding: 0; } -.template-edit-wrapper-label, .template-edit-wrapper-controls { +#edit-template-tabs .form-template-inline-wrapper { + display: inline-block; vertical-align: top; - width: 470px; } .template-edit-wrapper-label { - height: 18px; - line-height: 18px; - margin-top: 8px; + vertical-align: top; + min-width: 100px; + height: 35px; + line-height: 35px; + margin: 7px 0 8px; +} + +.template-edit-wrapper-controls { + vertical-align: top; + width: 400px; } .template-edit-wrapper-controls input[type="text"] { @@ -56,7 +65,7 @@ .template-edit-wrapper-controls > .dropdown { margin: 5px 0 0 1px; - width: 440px; + width: 372px; } .template-edit-wrapper-controls input[type="text"][disabled] { @@ -103,3 +112,56 @@ input[type="checkbox"]:CHECKED+.item { background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat 10px center; } + +#edit-template-tabs .template-tab-header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; + overflow: hidden; +} + +#edit-template-tabs .template-tab-header .action-area { + float: right; + height: 20px; + width: 20px; +} + +#edit-template-tabs .template-storage-cell{ + display: inline-block; + width: 230px; +} + +#edit-template-tabs .template-interface-cell { + display: inline-block; + width: 250px; +} + +#form-template-storage .template-tab-body select { + width: 140px; +} + +#form-template-storage .template-tab-body input { + width: 56px; +} + +#edit-template-tabs .template-tab-body .item { + margin: 5px 0; +} + +#form-template-interface .template-tab-body select { + width: 180px; +} + +#edit-template-tabs .template-tab-body .action-area { + float: right; +} + +#edit-template-tabs .template-tab-body .action-area button { + width: 20px; + height: 20px; +} + +#edit-template-tabs .template-tab-body .hide { + display: none; +} \ No newline at end of file diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index 2f4cc9a..ac6cff8 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -16,14 +16,18 @@ * limitations under the License. */ kimchi.template_edit_main = function() { - var templateEditForm = $('#form-template-edit'); + var templateEditMain = $('#edit-template-tabs'); var origDisks; var origPool; + var origNetworks; var templateDiskSize; - $('#template-name', templateEditForm).val(kimchi.selectedTemplate); - kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { + $('#template-name', templateEditMain).val(kimchi.selectedTemplate); + templateEditMain.tabs(); + + var initGeneral = function(template) { origDisks = template.disks; origPool = template.storagepool; + origNetworks = template.networks; for(var i=0;i<template.disks.length;i++){ if(template.disks[i].base){ template["vm-image"] = template.disks[i].base; @@ -37,18 +41,12 @@ kimchi.template_edit_main = function() { if (prop == 'graphics') { value = value["type"]; } - $('input[name="' + prop + '"]', templateEditForm).val(value); - } - var disks = template.disks; - $('input[name="disks"]').val(disks[0].size); - templateDiskSize = $('input[name="disks"]').val(); - if (disks[0].volume) { - var spool_value = $('#form-template-edit [name="storagepool"]').val(); - $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); + $('input[name="' + prop + '"]', templateEditMain).val(value); } var vncOpt = [{label: 'VNC', value: 'vnc'}]; + $('#template-edit-graphics').append('<option selected>VNC</option>'); + $('#template-edit-graphics').append('<option>Spice</option>'); kimchi.select('template-edit-graphics-list', vncOpt); var enableSpice = function() { if (kimchi.capabilities == undefined) { @@ -61,85 +59,215 @@ kimchi.template_edit_main = function() { } }; enableSpice(); - + }; + var initStorage = function(result) { var scsipools = {}; - kimchi.listStoragePools(function(result) { - var options = []; - if (result && result.length) { - $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { - if ((storagePool.type == 'iscsi') || (storagePool.type == 'scsi')){ - scsipools[storagePool.name] = []; - kimchi.listStorageVolumes(storagePool.name, function(result) { - if (result && result.length) { - $.each(result, function(index, storageVolume) { - options.push({ - label: storagePool.name + '/' + storageVolume.name, - value: '/storagepools/' + storagePool.name + '/' + storageVolume.name - }); - scsipools[storagePool.name].push(storageVolume) - }); - } - kimchi.select('template-edit-storagePool-list', options); - }); - } - else { - options.push({ - label: storagePool.name, - value: '/storagepools/' + storagePool.name - }); - } + var addStorageItem = function(storageData) { + var nodeStorage = $.parseHTML(kimchi.substitute($("#template-storage-pool-tmpl").html(), storageData)); + $('.template-tab-body', '#form-template-storage').append(nodeStorage); + $('.edit', '#form-template-storage').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + $('.template-storage-name', storageItem).hide(); + var currentName = $('.template-storage-name', storageItem).text(); + $('.template-storage-disk', storageItem).hide(); + var currentDisk = $('.template-storage-disk', storageItem).text(); + $('input', storageItem).val(currentDisk).show(); + $('select', storageItem).show(); + if (currentName === 'iscsi' || currentName === 'scsi') { + $('input', storageItem).attr('disabled', true); + } else { + $('input', storageItem).attr('disabled', false); + } + $('.save', storageItem).parent().show(); + $('.delete', storageItem).parent().hide(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).text(selectedStorage).hide(); + $('select', storageItem).show(); + }); + $('.delete', '#form-template-storage').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-storage').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var cancelEntity = $(this).parent().parent(); + if($('.template-storage-disk', cancelEntity).text() === '') { + cancelEntity.remove(); + } else { + $('label', cancelEntity).show(); + $('input', cancelEntity).hide(); + $('select', cancelEntity).hide(); + $('.cancel', cancelEntity).parent().hide(); + $('.edit', cancelEntity).parent().show(); + } + }); + $('.save', '#form-template-storage').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var storageItem = $(this).parent().parent(); + $('.save', storageItem).parent().hide(); + $('.delete', storageItem).parent().show(); + var selectedStorage = $('select', storageItem).val(); + $('.template-storage-name', storageItem).text(selectedStorage).show(); + $('.template-storage-disk', storageItem).text($('input', storageItem).val()).show(); + $('select', storageItem).hide(); + $('input', storageItem).hide(); + }); + var storageOptions = ''; + $.each(result, function(index, storageEntities) { + if((storageEntities.state === 'active') && (storageEntities.type != 'kimchi-iso') + && (storageEntities.type != 'iscsi') && (storageEntities.type != 'scsi')){ + var isSlected = storageEntities.name === 'default' ? ' selected' : ''; + storageOptions += '<option' + isSlected + '>' + result[index].name + '</option>'; + } + }); + $('select', '#form-template-storage').find('option').remove(); + $('select', '#form-template-storage').append(storageOptions); + $('select', '#form-template-storage').change(function() { + var selectedItem = $(this).parent().parent(); + var tempStorageName = $(this).val(); + if (tempStorageName === 'iscsi' || tempStorageName === 'scsi') { + $('input', selectedItem).attr('disabled', true); + } else { + $('input', selectedItem).attr('disabled', false); + } + $.each(result, function(index, storageEntities) { + if (tempStorageName === storageEntities.name) { + selectedItem.find('.template-storage-type').text(storageEntities.type); } - }); - } - if ($.isEmptyObject(scsipools)) { - kimchi.select('template-edit-storagePool-list', options); + }) + }); + }; + + if ((origDisks && origDisks.length) && (origPool && origPool)) { + splitPool = origPool.split('/'); + var defaultPool; + var defaultType; + $.each(result, function(index, poolEntities) { + if (poolEntities.name === splitPool[splitPool.length-1]) { + defaultType = poolEntities.type; + defaultPool = splitPool[splitPool.length-1] + } + }); + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + addStorageItem(storageNodeData); + }); + } + + $('#template-edit-storage-add-button').button({ + icons: { + primary: "ui-icon-plusthick" + }, + text: false, + disabled: true + }).click(function(event) { + event.preventDefault(); + var storageNodeData = { + viewMode : 'hide', + editMode : '', + storageName : 'default', + storageType : 'dir', + storageDisk : '' } + addStorageItem(storageNodeData); }); - kimchi.listNetworks(function(result) { - if(result && result.length > 0) { - var html = ''; - var tmpl = $('#tmpl-network').html(); - $.each(result, function(index, network) { - if (result[index].state === 'active') - html += kimchi.substitute(tmpl, network); - }); - $('#template-edit-network-list').html(html).show(); - if(template.networks && template.networks.length > 0) { - $('input[name="networks"]', templateEditForm).each(function(index, element) { - var value = $(element).val(); - if(template.networks.indexOf(value) >= 0) { - $(element).prop('checked', true); - } - }); + }; + var initInterface = function(result) { + var addInterfaceItem = function(networkData) { + var nodeInterface = $.parseHTML(kimchi.substitute($('#template-interface-tmpl').html(), networkData)); + $('.template-tab-body', '#form-template-interface').append(nodeInterface); + $('.edit', '#form-template-interface').button({ + icons : {primary : 'ui-icon-pencil'}, + text : false, + disabled : true + }); + $('.delete', '#form-template-interface').button({ + icons : {primary : 'ui-icon-trash'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.cancel', '#form-template-interface').button({ + icons : {primary : 'ui-icon-arrowreturnthick-1-w'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + $(this).parent().parent().remove(); + }); + $('.save', '#form-template-interface').button({ + icons : {primary : 'ui-icon-disk'}, + text : false + }).click(function(evt) { + evt.preventDefault(); + var interItem = $(this).parent().parent(); + $('.save', interItem).parent().hide(); + $('.delete', interItem).parent().show(); + var selectedInterface = $('select', interItem).val(); + $('label', interItem).text(selectedInterface).show(); + $('select', interItem).hide(); + }); + var networkOptions = ''; + for(var i=0;i<result.length;i++){ + if(result[i].state === "active") { + var isSlected = i==0 ? ' selected' : ''; + networkOptions += '<option' + isSlected + '>' + result[i].name + '</option>'; } - } else { - $('#template-edit-network-list').hide(); } - }); - }); - - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); + $('select', '#form-template-interface').find('option').remove(); + $('select', '#form-template-interface').append(networkOptions); + }; + if(result && result.length > 0) { + $.each(result, function(index, data) { + if($.inArray(data.name, origNetworks) > -1) { + addInterfaceItem({ + mac : '', + network : data.name, + type : 'network', + viewMode : '', + editMode : 'hide' + }); + } }); - } else { - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - $('input[name="disks"]', templateEditForm).val(templateDiskSize); } - }); - $('input[name="disks"]', templateEditForm).keyup(function() { - templateDiskSize = $('input[name="disks"]', templateEditForm).val(); - }); + $('#template-edit-interface-add-button').button({ + icons: { + primary: 'ui-icon-plusthick' + }, + text: false + }).click(function(evt) { + evt.preventDefault(); + addInterfaceItem({ + mac : '', + network : '', + type : 'network', + viewMode : 'hide', + editMode : '' + }); + }); + }; + kimchi.retrieveTemplate(kimchi.selectedTemplate, initGeneral); + kimchi.listNetworks(initInterface); + kimchi.listStoragePools(initStorage); $('#tmpl-edit-button-save').on('click', function() { var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; @@ -147,33 +275,41 @@ kimchi.template_edit_main = function() { $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - origDisks[0].size = Number($('#form-template-edit [name="' + field + '"]').val()); + $.each($('#form-template-storage .item'), function(index, diskEntities) { + origDisks[index].size = Number($(this).find('.template-storage-disk').text()); + }) data[field] = origDisks; } else if (field == 'graphics') { - var type = $('#form-template-edit [name="' + field + '"]').val(); + var type = $('#form-template-general [name="' + field + '"]').val(); data[field] = {'type': type}; } else { - data[field] = $('#form-template-edit [name="' + field + '"]').val(); + data[field] = $('#form-template-general [name="' + field + '"]').val(); } }); data['memory'] = Number(data['memory']); data['cpus'] = Number(data['cpus']); - storagepool = data['storagepool']; - storageArray = storagepool.split("/"); - if (storageArray.length > 3){ - /* Support only 1 disk at this moment */ - data["disks"][0].volume = storageArray.pop(); - data['storagepool'] = storageArray.join("/"); - } else if (data["disks"][0].volume) { - delete data["disks"][0].volume; - } - var networks = templateEditForm.serializeObject().networks; - if (networks instanceof Array) { - data.networks = networks; - } else if (networks != null) { - data.networks = [networks]; + + //Fix me: Only support one storage pool now + var storages = $('.template-tab-body .item', '#form-template-storage'); + var storageForUpdate = new Array(); + $.each(storages, function(index, storageEntities) { + var tempName = $('.template-storage-name', storageEntities).text() + tempName = '/storagepools/' + tempName; + storageForUpdate.push(tempName); + }) + data['storagepool'] = storageForUpdate[0]; + + var networks = $('.template-tab-body .item', '#form-template-interface'); + var networkForUpdate = new Array(); + $.each(networks, function(index, networkEntities) { + networkForUpdate.push($('.template-interface-name', networkEntities).text()); + }); + if (networkForUpdate instanceof Array) { + data.networks = networkForUpdate; + } else if (networkForUpdate != null) { + data.networks = [networkForUpdate]; } else { data.networks = []; } diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 5a71d91..d5d2be1 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -28,74 +28,67 @@ <div class="close">X</div> </header> <div class="content"> - <form id="form-template-edit"> + <div id="edit-template-tabs"> <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> + <ul> + <li> + <a href="#form-template-general">$_("General")</a> + </li> + <li> + <a href="#form-template-storage">$_("storage")</a> + </li> + <li> + <a href="#form-template-interface">$_("Interface")</a> + </li> + </ul> + <form id="form-template-general"> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-label"> <label for="template-edit-id-textbox">$_("Name")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-vendor-textbox">$_("Vendor")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-version-textbox">$_("Version")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-cpu-textbox">$_("CPU Number")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> <div class="template-edit-wrapper-label"> <label for="template-edit-memory-textbox">$_("Memory (MB)")</label> </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> + <div class="template-edit-wrapper-label templ-edit-cdrom"> + <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-label templ-edit-vm-image hide-content"> + <label for="template-edit-vmimage-textbox">$_("Image File")</label> </div> - </div> - <div> <div class="template-edit-wrapper-label"> - <label for="template-edit-disk-textbox">$_("Disk (GB)")</label> + <label>$_("Graphics")</label> </div> + </div> + <div class="form-template-inline-wrapper"> <div class="template-edit-wrapper-controls"> - <input id="template-edit-disk-textbox" name="disks" type="text" /> + <input id="template-edit-id-textbox" name="name" type="text" /> </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div id="templ-edit-cdrom"> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cdrom-textbox">$_("CDROM")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> - <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled"/> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> </div> - </div> - <div id="templ-edit-vm-image" class="hide-content"> - <div class="template-edit-wrapper-label">$_("Image File")</div> - <div class="template-edit-wrapper-controls"><input name="vm-image" type="text" disabled/></div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Graphics")</label> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-cdrom"> + <input id="template-edit-cdrom-textbox" name="cdrom" type="text" disabled="disabled" /> + </div> + <div class="template-edit-wrapper-controls templ-edit-vm-image hide-content"> + <input id="template-edit-vmimage-textbox" name="vm-image" type="text" disabled="disabled" /> </div> <div class="template-edit-wrapper-controls"> <div class="btn dropdown popable"> @@ -108,40 +101,26 @@ </div> </div> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> + </form> + <form id="form-template-storage"> + <div class="template-tab-header"> + <span class="template-storage-cell">$_("Storage Pool")</span> + <span class="template-storage-cell">$_("Type")</span> + <span class="template-storage-cell">$_("Disk(GB)")</span> + <button type="button" id="template-edit-storage-add-button" class="action-area"></button> </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Network")</label> - </div> - <div class="template-edit-wrapper-controls"> - <ul class="select-list-box" id="template-edit-network-list"> - </ul> - <script id="tmpl-network" type="text/html"> - <li> - <label> - <input name="networks" type="checkbox" value="{name}" /> - <span class="item">{name}</span> - </label> - </li> - </script> - </div> + <div class="template-tab-body"> </div> - </fieldset> - </form> + </form> + <form id="form-template-interface"> + <div class="template-tab-header"> + <span class="template-interface-cell">$_("Network")</span> + <span class="template-interface-cell">$_("Type")</span> + <button type="button" id="template-edit-interface-add-button" class="action-area"></button> + </div> + <div class="template-tab-body"></div> + </form> + </div> </div> <footer> <div class="btn-group"> @@ -152,3 +131,41 @@ <script> kimchi.template_edit_main(); </script> +<script id="template-storage-pool-tmpl" type="text/html"> + <div class='item'> + <span class="template-storage-cell"> + <label class="template-storage-name {viewMode}">{storageName}</label> + <select class="{editMode}"></select> + </span> + <span class="template-storage-cell"> + <label class="template-storage-type">{storageType}</label> + </span> + <span class="template-storage-cell"> + <label class="template-storage-disk {viewMode}">{storageDisk}</label> + <input class="{editMode}" /> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> +<script id="template-interface-tmpl" type="text/html"> + <div class="item"> + <span class="template-interface-cell"> + <label class="template-interface-name {viewMode}">{network}</label> + <select class="{editMode}"></select> + </span> + <span class="template-interface-cell"> + <span>{type}</span> + </span> + <span class="action-area {editMode}"> + <button class="save"></button><button class="cancel"></button> + </span> + <span class="action-area {viewMode}"> + <button class="edit"></button><button class="delete"></button> + </span> + </div> +</script> \ No newline at end of file -- 1.7.1

2 4

[PATCH V3] Enhancement: PCI Device information enhancement
by Wen Wang 31 Oct '14

31 Oct '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: 1) Deal with translations issues 2) Changed the tip display format V1 -> V2: 1) Changed the API name to "getPCIDeviceCompanion". 2) Changed for a more specific way of detecting the related devices. 3) Added the "Affected devices" to the tip with aligned format. 4) tip will when the pointer hang over any section of the affected line. This patch provide the way that shows more specific PCI device information by hanging the mouse on top of device name. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 24 ++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 7 +++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 8a6e416..ebf826b 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1129,6 +1129,20 @@ var kimchi = { }); }, + getPCIDeviceCompanions : function(pcidev, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/devices?_passthrough_affected_by=' + pcidev, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + getISCSITargets : function(server, port, suc, err) { server = encodeURIComponent(server); port = port ? '&_server_port='+encodeURIComponent(port) : ''; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 030e112..ed8c689 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -407,6 +407,30 @@ kimchi.guest_edit_main = function() { }); } }); + kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { + var pciTitle = i18n["KCHVMED6007M"] + "\n"; + var haveCompanions = false; + for(var p=0; p<infoData.length; p++) { + if(infoData[p].device_type === "net") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6001M"] + " " + infoData[p].interface; + pciTitle += ", " + i18n["KCHVMED6002M"] + " " + infoData[p].address; + pciTitle += ", " + i18n["KCHVMED6003M"] + " " + infoData[p].link_type + "\n"; + } else if(infoData[p].device_type === "storage") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6004M"] + " " + infoData[p].block; + pciTitle += ", " + i18n["KCHVMED6005M"] + " " + infoData[p].drive_type; + pciTitle += ", " + i18n["KCHVMED6006M"] + " " + infoData[p].model + "\n"; + } + } + for(var q=0; q<infoData.length; q++) { + haveCompanions && $(".name", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".product", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); + } + }); } }); }); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 75f1e43..ac2ca83 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -139,6 +139,13 @@ "KCHVMCD6008M": "$_("Successfully detached!")", "KCHVMCD6009M": "$_("This disk will be detached permanently and you can re-attach it. Continue to detach it?")", + "KCHVMED6001M": "$_("interface:")", + "KCHVMED6002M": "$_("address:")", + "KCHVMED6003M": "$_("link_type:")", + "KCHVMED6004M": "$_("block:")", + "KCHVMED6005M": "$_("drive_type:")", + "KCHVMED6006M": "$_("model:")", + "KCHVMED6007M": "$_("Affected devices:")", "KCHNET6001E": "$_("The VLAN id must be between 1 and 4094.")", -- 1.7.1

3 3

[PATCH 0/2 v4] Edit disk format in vm template - backend
by Daniel Henrique Barboza 31 Oct '14

31 Oct '14

Changes in v4: - removed POST documentation (not supported) and added GET and PUT documentation in API.md Changes in v3: - changed the name of the new parameter to 'format' instead of 'type' - added all the supported disk formats in i18n.py messages - using 'GET' to retrieve the updated value in unit tests Changes in v2: - added unit tests - added support to all default disk types These patches implement the backend support to change the disk format when editing a template. Example of usage: 1- create a test template: $ curl -u user -H "Content-Type: application/json -H "Accept: application/json" http://localhost:8010/templates -X POST -d'{"name": "test_template", "cdrom": "/valid/iso/path.iso"}' 2- change the disk format to 'cloop': $ curl -u user -H "Content-Type: application/json -H "Accept: application/json" http://localhost:8010/templates/test_template -X PUT -d'{"disks":[{"index":0,"size":10, "format": "cloop"}]}' 3- retrieve the template to see the changes: $ curl -u user -H "Content-Type: application/json -H "Accept: application/json" http://localhost:8010/templates/test_template -X GET Enter host password for user 'user': { "cpus":1, "cpu_info":{}, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":"/valid/iso/path.iso", "networks":[ "default" ], "icon":"images/icon-opensuse.png", "os_distro":"opensuse", "name":"test_template", "disks":[ { "index":0, "size":10, "format":"cloop" } ], "invalid":{}, "os_version":"13.1", "storagepool":"/storagepools/default", "memory":1024, "folder":[] } Daniel Henrique Barboza (2): Choose disk image format in vm template - backend Unit tests for the new disk image format docs/API.md | 6 ++-- src/kimchi/API.json | 8 +++++- src/kimchi/i18n.py | 3 +- src/kimchi/vmtemplate.py | 5 +++- tests/test_mockmodel.py | 75 ++++++++++++++++++++++++++++++++++++++++-------- tests/test_model.py | 14 +++++++++ 6 files changed, 94 insertions(+), 17 deletions(-) -- 1.8.3.1

2 4

Kimchi migration within peers
by simonjin 31 Oct '14

31 Oct '14

Hi all, I'm presenting here my proposal for the feature "Guest migration" which is expected to be implemented for Kimchi 1.4. Description Migrate guest vm within peer/host discovered by Kimchi peers using openSLP. In the first stage 1, only do migration will be supported, in stage2, migrateCancel and migrateMonitor will be supported. *Migration Mode: * 1. Support libvirt tunnelled transport managed by direct migration. 2. Only support Live migration mode. 3. Only support migration over TCP *Migration Capability Check* - Source libvirtd/client should be able to connect destination libvirtd. - CPU architectures compare(X86 vs PPC). - No PCI device passthrough. - In a shared storage pool and the pool can be access/write by destination. REST API Only one new REST command will be added in stage 1. Syntax POST /vms//<vm-name>//migrate Parameters: in config.py.in: ('migration_destination_timeout', '21600', 'Maximum time the destination waits for the migration to finish. 21600 should be enough since all the peers will be in the same LAN'), ('migration_max_bandwidth', 'unlimited', 'default in libvirt is unlimited'), ('migration_downtime', '500', 'Maxmium allowed downtime for live migration in milliseconds ' '(anything below 100ms is ignored) if you do not care about ' 'liveness of migration, set to a very high value, such as ' '600000.'), Return: An asynchronous Task with "target_uri" containing "/vms/</new-vm-name/>". As expected with any Task, the cloning process can be tracked by checking the corresponding task's status. *Do_migration step:* - migration source check . - connect migration destination, guest vm config/params transfer and setup. - migration source prepare. - do actually migration. - recover if failed. - do finish if migration successful. Comments are welcome! -- Yun Tong Jin, Simon Linux Technology Center, Open Virtualization project IBM Systems & Technology Group jinyt(a)cn.ibm.com, Phone: 824549654

4 10

[PATCH] ISSUE#466: Filter valid format only on src_type of 'file'
by lvroyce0210＠gmail.com 31 Oct '14

31 Oct '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When src_type is block and volume is iscsi, filter will prevent volume to be attached due to its format is 'unknown'. Change the filter to only apply to 'file' src_type, so that iscsi volume will not be blocked. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 055aa50..a48d9fa 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -153,17 +153,19 @@ class VMStoragesModel(object): if vol_info['ref_cnt'] != 0: raise InvalidParameter("KCHVMSTOR0016E") - supported_format = { + params['path'] = vol_info['path'] + params['src_type'] = _check_path(params['path']) + valid_format = { "disk": ["raw", "bochs", "qcow", "qcow2", "qed", "vmdk"], "cdrom": "iso"} - if vol_info['format'] in supported_format[params['type']]: - if params['type'] == 'disk': + if params['src_type'] == 'file': + if params['type'] == 'disk' and + vol_info['format'] in valid_format[params['type']]: params['format'] = vol_info['format'] - else: - raise InvalidParameter("KCHVMSTOR0018E", - {"format": vol_info['format'], - "type": params['type']}) - params['path'] = vol_info['path'] + else: + raise InvalidParameter("KCHVMSTOR0018E", + {"format": vol_info['format'], + "type": params['type']}) params['src_type'] = _check_path(params['path']) if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): -- 1.8.3.2

3 2

[PATCH 0/2 v3] Edit disk format in vm template - backend
by Daniel Henrique Barboza 31 Oct '14

31 Oct '14

Changes in v3: - changed the name of the new parameter to 'format' instead of 'type' - added all the supported disk formats in i18n.py messages - using 'GET' to retrieve the updated value in unit tests Changes in v2: - added unit tests - added support to all default disk types These patches implement the backend support to change the disk format when editing a template. Example of usage: 1- create a test template: $ curl -u user -H "Content-Type: application/json -H "Accept: application/json" http://localhost:8010/templates -X POST -d'{"name": "test_template", "cdrom": "/valid/iso/path.iso"}' 2- change the disk format to 'cloop': $ curl -u user -H "Content-Type: application/json -H "Accept: application/json" http://localhost:8010/templates/test_template -X PUT -d'{"disks":[{"index":0,"size":10, "format": "cloop"}]}' 3- retrieve the template to see the changes: $ curl -u user -H "Content-Type: application/json -H "Accept: application/json" http://localhost:8010/templates/test_template -X GET Enter host password for user 'user': { "cpus":1, "cpu_info":{}, "graphics":{ "type":"vnc", "listen":"127.0.0.1" }, "cdrom":"/valid/iso/path.iso", "networks":[ "default" ], "icon":"images/icon-opensuse.png", "os_distro":"opensuse", "name":"test_template", "disks":[ { "index":0, "size":10, "format":"cloop" } ], "invalid":{}, "os_version":"13.1", "storagepool":"/storagepools/default", "memory":1024, "folder":[] } Daniel Henrique Barboza (2): Choose disk image format in vm template - backend Unit tests for the new disk image format docs/API.md | 1 + src/kimchi/API.json | 8 +++++- src/kimchi/i18n.py | 3 +- src/kimchi/vmtemplate.py | 5 +++- tests/test_mockmodel.py | 75 ++++++++++++++++++++++++++++++++++++++++-------- tests/test_model.py | 14 +++++++++ 6 files changed, 91 insertions(+), 15 deletions(-) -- 1.8.3.1

1 2

[PATCH 0/2 v2] Backend support - edit disk type in template
by Daniel Henrique Barboza 30 Oct '14

30 Oct '14

Changes in v2: - added unit tests - added support to all default disk types These patches implement the backend support to change the disk type when editing a template. To test it: - create a default template: $ curl -u user:passwd -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/templates -X POST -d'{"name": "test_default_template", "cdrom":<valid_cdrom_path>}' - changing the disk type of the default template to 'dmg': $ curl -u user:passwd -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/templates/test_default_template -X PUT -d'{"disks":[{"index":0,"size":10, "type": "dmg"}]}' Daniel Henrique Barboza (2): Choose disk image type in vm template - backend Unit tests for the new disk image types docs/API.md | 1 + src/kimchi/API.json | 8 ++++++- src/kimchi/i18n.py | 1 + src/kimchi/vmtemplate.py | 5 +++- tests/test_mockmodel.py | 62 +++++++++++++++++++++++++++++++++++++++--------- tests/test_model.py | 14 +++++++++++ 6 files changed, 78 insertions(+), 13 deletions(-) -- 1.8.3.1

3 6

[PATCH] Create xmlutils/qemucmdline.py to generate <qemu:commandline> XML
by Aline Manera 30 Oct '14

30 Oct '14

This patch depends on "[PATCH 0/8 V2] Create a common function to generate guest disk XML" Aline Manera (1): Create xmlutils/qemucmdline.py to generate <qemu:commandline> XML src/kimchi/vmtemplate.py | 28 ++++++++++-------------- src/kimchi/xmlutils/qemucmdline.py | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 src/kimchi/xmlutils/qemucmdline.py -- 1.9.3

3 6

Patches for PPC and other fixes/features
by Rodrigo Trujillo 30 Oct '14

30 Oct '14

I am going to send some patches that my we have worked for a while. I will send separately, so some can be apply while others may need adjustments. Regards, Rodrigo

1 0

[PATCH 0/8 V3] Create a common function to generate guest disk XML
by Aline Manera 30 Oct '14

30 Oct '14

V2 -> V3: - Create check_remote_disk_path() on model/utils.py to verify the necessity to convert hostname to IP V1 -> V2: - Make xmlutils/disk.py independent of model instances Aline Manera (8): Move _get_storage_xml() to xmlutils/disk.py Move vmdisks.py functions to xmlutils/disk.py Remove 'bus' paramater from /vms/<name>/storages documentation Update get_disk_xml() to get the device same according to bus and index values Remove ignore_src parameter from get_disk_xml() Get disk type according to file path on get_disk_xml() Check QEMU stream DNS capability when attaching new disk to guest Update vmtemplate.py to use get_disk_xml() while generating CDROM XML docs/API.md | 1 - src/kimchi/model/storagevolumes.py | 8 +- src/kimchi/model/utils.py | 19 ++++- src/kimchi/model/vmstorages.py | 144 +++++++++------------------------ src/kimchi/vmdisks.py | 75 ------------------ src/kimchi/vmtemplate.py | 74 ++++++----------- src/kimchi/xmlutils/disk.py | 158 +++++++++++++++++++++++++++++++++++++ tests/test_model.py | 11 ++- 8 files changed, 248 insertions(+), 242 deletions(-) delete mode 100644 src/kimchi/vmdisks.py create mode 100644 src/kimchi/xmlutils/disk.py -- 1.9.3

2 10

[PATCH V2] Number of CPUs in Host's Basic Information.
by Paulo Vital 30 Oct '14

30 Oct '14

Support to provide the information of the number of on-line CPUs present in the Host system. This patch also updated the API.md, mockmodel, unittests and English help page to express the new information. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- docs/API.md | 3 ++- src/kimchi/mockmodel.py | 3 ++- src/kimchi/model/host.py | 5 +++-- tests/test_model.py | 3 ++- tests/test_rest.py | 3 ++- ui/pages/help/en_US/host.dita | 4 ++-- ui/pages/tabs/host.html.tmpl | 6 +++++- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/docs/API.md b/docs/API.md index 6984649..fdfb04f 100644 --- a/docs/API.md +++ b/docs/API.md @@ -790,7 +790,8 @@ Contains information of host. * **GET**: Retrieve host static information * memory: Total size of host physical memory The unit is Bytes - * cpu: The model name of host CPU + * cpu_model: The model name of host CPU + * cpus: The number of online CPUs available on host * os_distro: The OS distribution that runs on host * os_version: The version of OS distribution * os_codename: The code name of OS distribution diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index de9df0e..7163f8d 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -936,7 +936,8 @@ class MockModel(object): def host_lookup(self, *name): res = {} res['memory'] = 6114058240 - res['cpu'] = 'Intel(R) Core(TM) i5 CPU M 560 @ 2.67GHz' + res['cpu_model'] = 'Intel(R) Core(TM) i5 CPU M 560 @ 2.67GHz' + res['cpus'] = 4 res['os_distro'] = 'Red Hat Enterprise Linux Server' res['os_version'] = '6.4' res['os_codename'] = 'Santiago' diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 1bc3ca2..8cddcdc 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -81,14 +81,15 @@ class HostModel(object): def _get_host_info(self): res = {} if platform.machine().startswith('ppc'): - res['cpu'] = self._get_ppc_cpu_info() + res['cpu_model'] = self._get_ppc_cpu_info() else: with open('/proc/cpuinfo') as f: for line in f.xreadlines(): if "model name" in line: - res['cpu'] = line.split(':')[1].strip() + res['cpu_model'] = line.split(':')[1].strip() break + res['cpus'] = psutil.NUM_CPUS res['memory'] = psutil.TOTAL_PHYMEM # Include IBM PowerKVM name to supported distro names diff --git a/tests/test_model.py b/tests/test_model.py index 896540d..c06eaae 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1298,7 +1298,8 @@ class ModelTests(unittest.TestCase): objstore_loc=self.tmp_store) info = inst.host_lookup() distro, version, codename = platform.linux_distribution() - self.assertIn('cpu', info) + self.assertIn('cpu_model', info) + self.assertIn('cpus', info) self.assertEquals(distro, info['os_distro']) self.assertEquals(version, info['os_version']) self.assertEquals(unicode(codename, "utf-8"), info['os_codename']) diff --git a/tests/test_rest.py b/tests/test_rest.py index 60dce2f..9bc930f 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1753,8 +1753,9 @@ class RestTests(unittest.TestCase): self.assertEquals('6.4', info['os_version']) self.assertEquals('Santiago', info['os_codename']) self.assertEquals('Intel(R) Core(TM) i5 CPU M 560 @ 2.67GHz', - info['cpu']) + info['cpu_model']) self.assertEquals(6114058240, info['memory']) + self.assertEquals(4, info['cpus']) def test_hoststats(self): stats_keys = ['cpu_utilization', 'memory', 'disk_read_rate', diff --git a/ui/pages/help/en_US/host.dita b/ui/pages/help/en_US/host.dita index 335c51c..0dcb670 100644 --- a/ui/pages/help/en_US/host.dita +++ b/ui/pages/help/en_US/host.dita @@ -24,8 +24,8 @@ to the host system, if it is not already connected.</li> <dlentry> <dt>Basic information</dt> <dd>This section displays the host operating system distribution, -version, and code name, as well as the processor type and amount of -memory in GB.</dd> +version, and code name, as well as the processor type, the number of +online CPUs and amount of memory in GB.</dd> </dlentry><dlentry> <dt>System statistics</dt> <dd>This section displays graphs to show statistics for CPU, memory, diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index 8641962..81266ce 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -72,7 +72,11 @@ </div> <div class="section-row"> <div class="section-label">$_("Processor")</div> - <div class="section-value">{cpu}</div> + <div class="section-value">{cpu_model}</div> + </div> + <div class="section-row"> + <div class="section-label">$_("CPU(s)")</div> + <div class="section-value">{cpus}</div> </div> <div class="section-row"> <div class="section-label">$_("Memory")</div> -- 1.9.3

2 2

[PATCH 0/3] Use lxml.etree instead of libxml2
by Aline Manera 30 Oct '14

30 Oct '14

That way we can remove libxml2-python package as Kimchi dependency and make XML manipulation consistent in the whole code. Aline Manera (3): Use lxml.etree on xmlutils/utils.py instead of xml.etree and libxml2 Use lxml.etree on gen-index.py script instead of libxml2 Remove libxml2-python as Kimchi dependency contrib/DEBIAN/control.in | 3 +-- contrib/kimchi.spec.fedora.in | 3 +-- contrib/kimchi.spec.suse.in | 3 +-- docs/README.md | 30 ++++++++++++++---------------- src/kimchi/xmlutils/utils.py | 18 ++++++------------ ui/pages/help/gen-index.py | 11 +++++------ 6 files changed, 28 insertions(+), 40 deletions(-) -- 1.9.3

2 5

[PATCH 0/8 V2] Create a common function to generate guest disk XML
by Aline Manera 30 Oct '14

30 Oct '14

V1 -> V2: - Make xmlutils/disk.py independent of model instances ---- This patch set moves common functions related to guest disk XML to xmlutils/disk.py. That way model/vmstorages.py and vmtemplate.py can make use of it and we make sure the logic is the same in both cases. It is the first step and only changes the way vmtemplate.py generated the guest CDROM XML. But in the next patches all the guest disk generation on vmtemplate.py will do the same (I prefered to do in parts to avoid huge patch sets) Aline Manera (8): Move _get_storage_xml() to xmlutils/disk.py Move vmdisks.py functions to xmlutils/disk.py Remove 'bus' paramater from /vms/<name>/storages documentation Update get_disk_xml() to get the device same according to bus and index values Remove ignore_src parameter from get_disk_xml() Get disk type according to file path on get_disk_xml() Check QEMU stream DNS capability when attaching new disk to guest Update vmtemplate.py to use get_disk_xml() while generating CDROM XML docs/API.md | 1 - src/kimchi/model/storagevolumes.py | 8 +- src/kimchi/model/vmstorages.py | 152 ++++++++++++----------------------- src/kimchi/vmdisks.py | 75 ------------------ src/kimchi/vmtemplate.py | 74 ++++++----------- src/kimchi/xmlutils/disk.py | 158 +++++++++++++++++++++++++++++++++++++ tests/test_model.py | 11 ++- 7 files changed, 244 insertions(+), 235 deletions(-) delete mode 100644 src/kimchi/vmdisks.py create mode 100644 src/kimchi/xmlutils/disk.py -- 1.9.3

3 11

[PATCH] Remove pyc files on make clean
by Christy Perez 30 Oct '14

30 Oct '14

An old file left behind a pyc file, and caused problems. Manually removing all the pyc files took care of it, so I figured we could add this to 'make clean' for convenience. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ae2cdf0..ec88787 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,4 +118,4 @@ VERSION: clean-local: rm -rf mo rpm -CLEANFILES = kimchi.spec +CLEANFILES = kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print` -- 1.9.3

3 2

[PATCH v6 0/2] Backend support for templates with sockets, cores, and threads
by Christy Perez 30 Oct '14

30 Oct '14

Adding the ability to specify a CPU topology for a guest. The first patch is the backend, and the second is the translations. There will be a follow-on patchset that works with the UI to gather user requirements and then come up with the appropriate topology based on the guest OS and host capabilities. v5->v6: - Change cpu_info to empty dict instead of empty string if not specified - Split translations into different commit v4->v5: - Fix format issues - Remove if check for cpu_info in control, and set cpu_info to the empty string in model if None - Add format requirements error for topology requirements. - Add new error to toplogy in API.json - Update po files v3->v4: - Remove the unused cpu_ elements from common_spec - Pass new_t into validate function to reduce complexity - Rearrange code to decrese indents in _get_cpu_xml v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Christy Perez (2): Backend support for templates with sockets, cores, and threads Translations for new cpu_info messages docs/API.md | 13 ++++++- po/de_DE.po | 76 +++++++++++++++++++++++++++++++++++---- po/en_US.po | 76 +++++++++++++++++++++++++++++++++++---- po/es_ES.po | 76 +++++++++++++++++++++++++++++++++++---- po/fr_FR.po | 76 +++++++++++++++++++++++++++++++++++---- po/it_IT.po | 76 +++++++++++++++++++++++++++++++++++---- po/ja_JP.po | 76 +++++++++++++++++++++++++++++++++++---- po/kimchi.pot | 76 +++++++++++++++++++++++++++++++++++---- po/ko_KR.po | 76 +++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 75 ++++++++++++++++++++++++++++++++++---- po/ru_RU.po | 76 +++++++++++++++++++++++++++++++++++---- po/zh_CN.po | 79 +++++++++++++++++++++++++++++++++++------ po/zh_TW.po | 76 +++++++++++++++++++++++++++++++++++---- src/kimchi/API.json | 36 +++++++++++++++++-- src/kimchi/control/templates.py | 31 ++++++++-------- src/kimchi/i18n.py | 2 ++ src/kimchi/model/templates.py | 32 +++++++++++++++++ src/kimchi/osinfo.py | 5 ++- src/kimchi/vmtemplate.py | 16 +++++++++ 19 files changed, 941 insertions(+), 108 deletions(-) -- 1.9.3

3 7

[PATCH v2] AsyncTask: Improve continuous status feedback
by Zhou Zheng Sheng 30 Oct '14

30 Oct '14

One of the advantage of AsyncTask is that the background task can call "_status_cb()" multiple times to report the interim progress. However this is not properly implemented in "_status_cb()". The correct handling should be as follow. cb(message, True) Means task finished succesfully. cb(message, False) Means task failed. cb(message) cb(message, None) Means task is ongoing and the invocation is to provide progress feedback. The current implementation fails to distinguish "cb(message, False)" and "cb(message)". This patch fixes the problem and adds a new test case. This patch also extracts "wait_task()" methods in from the tests, adding a regular status report to allow developer know it's waiting for some task but not stuck on something. There is also two methods in tests that start a AsyncTask but do not wait it till finish, this will interfere with other tests, so the patch adds the missing "wait_task()" invocation for them. v2: Extract the common "wait_task()" methods to avoid duplicated code. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/asynctask.py | 6 ++---- tests/test_mockmodel.py | 2 ++ tests/test_model.py | 36 +++++++++++++++++++++++------------- tests/test_rest.py | 25 +++++++++++-------------- tests/utils.py | 15 +++++++++++++++ 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/kimchi/asynctask.py b/src/kimchi/asynctask.py index 99e7a64..b5673b2 100644 --- a/src/kimchi/asynctask.py +++ b/src/kimchi/asynctask.py @@ -49,10 +49,8 @@ class AsyncTask(object): self._save_helper() return - if success: - self.status = 'finished' - else: - self.status = 'failed' + if success is not None: + self.status = 'finished' if success else 'failed' self.message = message self._save_helper() diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index 7319531..eeb6715 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -26,6 +26,7 @@ import unittest import kimchi.mockmodel from utils import get_free_port, patch_auth, request, run_server +from utils import wait_task from kimchi.control.base import Collection, Resource @@ -198,3 +199,4 @@ class MockModelTests(unittest.TestCase): task = model.host_swupdate() task_params = [u'id', u'message', u'status', u'target_uri'] self.assertEquals(sorted(task_params), sorted(task.keys())) + wait_task(model.task_lookup, task['id']) diff --git a/tests/test_model.py b/tests/test_model.py index d9bbe9e..896540d 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -43,6 +43,7 @@ from kimchi.iscsi import TargetClient from kimchi.model import model from kimchi.rollbackcontext import RollbackContext from kimchi.utils import add_task +from utils import wait_task invalid_repository_urls = ['www.fedora.org', # missing protocol @@ -127,7 +128,7 @@ class ModelTests(unittest.TestCase): 'format': 'qcow2'} task_id = inst.storagevolumes_create('default', params)['id'] rollback.prependDefer(inst.storagevolume_delete, 'default', vol) - self._wait_task(inst, task_id) + wait_task(inst.task_lookup, task_id) self.assertEquals('finished', inst.task_lookup(task_id)['status']) vol_path = inst.storagevolume_lookup('default', vol)['path'] @@ -285,8 +286,9 @@ class ModelTests(unittest.TestCase): 'capacity': 1024, 'allocation': 512, 'format': 'qcow2'} - inst.storagevolumes_create(pool, params) + task_id = inst.storagevolumes_create(pool, params)['id'] rollback.prependDefer(inst.storagevolume_delete, pool, vol) + wait_task(inst.task_lookup, task_id) vm_name = 'kimchi-cdrom' params = {'name': 'test', 'disks': [], 'cdrom': self.kimchi_iso} @@ -558,7 +560,7 @@ class ModelTests(unittest.TestCase): params['name'] = vol task_id = inst.storagevolumes_create(pool, params)['id'] rollback.prependDefer(inst.storagevolume_delete, pool, vol) - self._wait_task(inst, task_id) + wait_task(inst.task_lookup, task_id) self.assertEquals('finished', inst.task_lookup(task_id)['status']) fd, path = tempfile.mkstemp(dir=path) @@ -599,7 +601,7 @@ class ModelTests(unittest.TestCase): taskid = task_response['id'] vol_name = task_response['target_uri'].split('/')[-1] self.assertEquals('COPYING', vol_name) - self._wait_task(inst, taskid, timeout=60) + wait_task(inst.task_lookup, taskid, timeout=60) self.assertEquals('finished', inst.task_lookup(taskid)['status']) vol_path = os.path.join(args['path'], vol_name) self.assertTrue(os.path.isfile(vol_path)) @@ -1120,10 +1122,17 @@ class ModelTests(unittest.TestCase): except: cb("Exception raised", False) + def continuous_ops(cb, params): + cb("step 1 OK") + time.sleep(2) + cb("step 2 OK") + time.sleep(2) + cb("step 3 OK", params.get('result', True)) + inst = model.Model('test:///default', objstore_loc=self.tmp_store) taskid = add_task('', quick_op, inst.objstore, 'Hello') - self._wait_task(inst, taskid) + wait_task(inst.task_lookup, taskid) self.assertEquals(1, taskid) self.assertEquals('finished', inst.task_lookup(taskid)['status']) self.assertEquals('Hello', inst.task_lookup(taskid)['message']) @@ -1134,16 +1143,22 @@ class ModelTests(unittest.TestCase): self.assertEquals(2, taskid) self.assertEquals('running', inst.task_lookup(taskid)['status']) self.assertEquals('OK', inst.task_lookup(taskid)['message']) - self._wait_task(inst, taskid) + wait_task(inst.task_lookup, taskid) self.assertEquals('failed', inst.task_lookup(taskid)['status']) self.assertEquals('It was not meant to be', inst.task_lookup(taskid)['message']) taskid = add_task('', abnormal_op, inst.objstore, {}) - self._wait_task(inst, taskid) + wait_task(inst.task_lookup, taskid) self.assertEquals('Exception raised', inst.task_lookup(taskid)['message']) self.assertEquals('failed', inst.task_lookup(taskid)['status']) + taskid = add_task('', continuous_ops, inst.objstore, + {'result': True}) + self.assertEquals('running', inst.task_lookup(taskid)['status']) + wait_task(inst.task_lookup, taskid, timeout=10) + self.assertEquals('finished', inst.task_lookup(taskid)['status']) + # This wrapper function is needed due to the new backend messaging in # vm model. vm_poweroff and vm_delete raise exception if vm is not found. # These functions are called after vm has been deleted if test finishes @@ -1247,7 +1262,7 @@ class ModelTests(unittest.TestCase): task = inst.debugreports_create({'name': reportName}) rollback.prependDefer(inst.debugreport_delete, tmp_name) taskid = task['id'] - self._wait_task(inst, taskid, timeout) + wait_task(inst.task_lookup, taskid, timeout) self.assertEquals('finished', inst.task_lookup(taskid)['status'], "It is not necessary an error. " @@ -1265,11 +1280,6 @@ class ModelTests(unittest.TestCase): if 'debugreport tool not found' not in e.message: raise e - def _wait_task(self, model, taskid, timeout=5): - for i in range(0, timeout): - if model.task_lookup(taskid)['status'] == 'running': - time.sleep(1) - def test_get_distros(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index 8de0a9c..60dce2f 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -38,7 +38,7 @@ import kimchi.server from kimchi.config import paths from kimchi.rollbackcontext import RollbackContext from utils import get_free_port, patch_auth, request -from utils import run_server +from utils import run_server, wait_task test_server = None @@ -1041,7 +1041,7 @@ class RestTests(unittest.TestCase): task = json.loads(resp.read()) vol_name = task['target_uri'].split('/')[-1] self.assertEquals('anyurl.wor.kz', vol_name) - self._wait_task(task['id']) + wait_task(self._task_lookup, task['id']) task = json.loads(self.request('/tasks/%s' % task['id']).read()) self.assertEquals('finished', task['status']) resp = self.request('/storagepools/pool-1/storagevolumes/%s' % @@ -1069,7 +1069,7 @@ class RestTests(unittest.TestCase): req, 'POST') self.assertEquals(202, resp.status) task_id = json.loads(resp.read())['id'] - self._wait_task(task_id) + wait_task(self._task_lookup, task_id) status = json.loads(self.request('/tasks/%s' % task_id).read()) self.assertEquals('finished', status['status']) @@ -1531,11 +1531,8 @@ class RestTests(unittest.TestCase): 'DELETE') self.assertEquals(204, resp.status) - def _wait_task(self, taskid, timeout=5): - for i in range(0, timeout): - task = json.loads(self.request('/tasks/%s' % taskid).read()) - if task['status'] == 'running': - time.sleep(1) + def _task_lookup(self, taskid): + return json.loads(self.request('/tasks/%s' % taskid).read()) def test_tasks(self): id1 = model.add_task('/tasks/1', self._async_op) @@ -1550,12 +1547,12 @@ class RestTests(unittest.TestCase): tasks = json.loads(self.request('/tasks').read()) tasks_ids = [int(t['id']) for t in tasks] self.assertEquals(set([id1, id2, id3]) - set(tasks_ids), set([])) - self._wait_task(id2) + wait_task(self._task_lookup, id2) foo2 = json.loads(self.request('/tasks/%s' % id2).read()) keys = ['id', 'status', 'message', 'target_uri'] self.assertEquals(sorted(keys), sorted(foo2.keys())) self.assertEquals('failed', foo2['status']) - self._wait_task(id3) + wait_task(self._task_lookup, id3) foo3 = json.loads(self.request('/tasks/%s' % id3).read()) self.assertEquals('in progress', foo3['message']) self.assertEquals('running', foo3['status']) @@ -1717,7 +1714,7 @@ class RestTests(unittest.TestCase): task = json.loads(resp.read()) # make sure the debugreport doesn't exist until the # the task is finished - self._wait_task(task['id']) + wait_task(self._task_lookup, task['id']) rollback.prependDefer(self._report_delete, 'report2') resp = request(host, ssl_port, '/debugreports/report1') debugreport = json.loads(resp.read()) @@ -1736,7 +1733,7 @@ class RestTests(unittest.TestCase): task = json.loads(resp.read()) # make sure the debugreport doesn't exist until the # the task is finished - self._wait_task(task['id'], 20) + wait_task(self._task_lookup, task['id'], 20) rollback.prependDefer(self._report_delete, 'report1') resp = request(host, ssl_port, '/debugreports/report1') debugreport = json.loads(resp.read()) @@ -1928,7 +1925,7 @@ class RestTests(unittest.TestCase): self.assertEquals(r.status_code, 202) task = r.json() - self._wait_task(task['id']) + wait_task(self._task_lookup, task['id']) resp = self.request('/storagepools/default/storagevolumes/%s' % task['target_uri'].split('/')[-1]) self.assertEquals(200, resp.status) @@ -1948,7 +1945,7 @@ class RestTests(unittest.TestCase): self.assertEquals(r.status_code, 202) task = r.json() - self._wait_task(task['id'], 15) + wait_task(self._task_lookup, task['id'], 15) resp = self.request('/storagepools/default/storagevolumes/%s' % task['target_uri'].split('/')[-1]) diff --git a/tests/utils.py b/tests/utils.py index 140bb1d..9133904 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -25,6 +25,7 @@ import json import os import socket import sys +import time import threading import unittest @@ -36,6 +37,7 @@ import kimchi.mockmodel import kimchi.server from kimchi.config import paths from kimchi.exception import OperationFailed +from kimchi.utils import kimchi_log _ports = {} @@ -195,3 +197,16 @@ def patch_auth(sudo=True): def normalize_xml(xml_str): return etree.tostring(etree.fromstring(xml_str, etree.XMLParser(remove_blank_text=True))) + + +def wait_task(task_lookup, taskid, timeout=10): + for i in range(0, timeout): + task_info = task_lookup(taskid) + if task_info['status'] == "running": + kimchi_log.info("Waiting task %s, message: %s", + taskid, task_info['message']) + time.sleep(1) + else: + return + kimchi_log.error("Timeout while process long-run task, " + "try to increase timeout value.") -- 1.9.3

2 2

[v2] UI: Clone Guest
by huoyuxin＠linux.vnet.ibm.com 30 Oct '14

30 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 18 ++++++++++ ui/js/src/kimchi.api.js | 17 ++++++++- ui/js/src/kimchi.guest_main.js | 73 +++++++++++++++++++++++++++++++++++---- ui/pages/guest.html.tmpl | 6 +++- 4 files changed, 103 insertions(+), 11 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..fc3017b 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/loading.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..2f90219 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -1233,5 +1233,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..ecc3b7a 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -257,6 +303,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); + guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); @@ -286,6 +333,11 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + kimchi.cloneGuest($(this).closest('li[name=guest]').attr("id"), function(data){ + kimchi.listVmsAuto(); + }); + }); //Maintain menu open state var actionMenu=guestActions.find("div[name=actionmenu]"); @@ -293,6 +345,11 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { $('.popover', actionMenu).toggle(); } + if(vmObject.isCloning){ + guestActions.children().hide(); + result.find('.guest-clone').removeClass('hide-content'); + } + return result; }; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..74206fd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,7 +59,8 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> - <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> + <button class="button-big" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> -- 1.7.1

4 9

Re: [Kimchi-devel] [PATCH 3/5] AsyncTask: Improve continuous status feedback
by Aline Manera 30 Oct '14

30 Oct '14

On 10/28/2014 04:48 AM, Zhou Zheng Sheng wrote: > One of the advantage of AsyncTask is that the background task can call > "_status_cb()" multiple times to report the interim progress. However > this is not properly implemented in "_status_cb()". The correct handling > should be as follow. > > cb(message, True) > Means task finished succesfully. > > cb(message, False) > Means task failed. > > cb(message) > cb(message, None) > Means task is ongoing and the invocation is to provide progress feedback. > > The current implementation fails to distinguish "cb(message, False)" and > "cb(message)". This patch fixes the problem and adds a new test case. > > This patch also improves the "_wait_task()" methods in tests, adding a > regular status report to allow developer know it's waiting for some task > but not stuck on something. There is also two methods in tests that start a > AsyncTask but do not wait it till finish, this will interfere with other > tests, so the patch adds the missing "_wait_task()" invocation for them. > > Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> > --- > src/kimchi/asynctask.py | 4 ++-- > tests/test_mockmodel.py | 14 ++++++++++++++ > tests/test_model.py | 31 ++++++++++++++++++++++++++----- > tests/test_rest.py | 7 +++++++ > 4 files changed, 49 insertions(+), 7 deletions(-) > > diff --git a/src/kimchi/asynctask.py b/src/kimchi/asynctask.py > index 99e7a64..f8e55c0 100644 > --- a/src/kimchi/asynctask.py > +++ b/src/kimchi/asynctask.py > @@ -49,9 +49,9 @@ class AsyncTask(object): > self._save_helper() > return > > - if success: > + if success == True: > self.status = 'finished' > - else: > + elif success ==False: > self.status = 'failed' > self.message = message > self._save_helper() > diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py > index 8de7ce9..3158c48 100644 > --- a/tests/test_mockmodel.py > +++ b/tests/test_mockmodel.py > @@ -27,6 +27,7 @@ import unittest > import kimchi.mockmodel > from utils import get_free_port, patch_auth, request, run_server > from kimchi.control.base import Collection, Resource > +from kimchi.utils import kimchi_log > > > test_server = None > @@ -174,3 +175,16 @@ class MockModelTests(unittest.TestCase): > task = model.host_swupdate() > task_params = [u'id', u'message', u'status', u'target_uri'] > self.assertEquals(sorted(task_params), sorted(task.keys())) > + self._wait_task(model, task['id']) > + > + def _wait_task(self, model, taskid, timeout=5): > + for i in range(0, timeout): > + task_info = model.task_lookup(taskid) > + if task_info['status'] == "running": > + kimchi_log.info("Waiting task %s, message: %s", > + task_info['id'], task_info['message']) > + time.sleep(1) > + else: > + return > + kimchi_log.error("Timeout while process long-run task, " > + "try to increase timeout value.") We could move it to tests/utils.py to avoid duplicating code when a Task needs to be watched. > diff --git a/tests/test_model.py b/tests/test_model.py > index e407fe5..c0e8cb5 100644 > --- a/tests/test_model.py > +++ b/tests/test_model.py > @@ -42,7 +42,7 @@ from kimchi.exception import InvalidParameter, NotFoundError, OperationFailed > from kimchi.iscsi import TargetClient > from kimchi.model import model > from kimchi.rollbackcontext import RollbackContext > -from kimchi.utils import add_task > +from kimchi.utils import add_task, kimchi_log > > > invalid_repository_urls = ['www.fedora.org', # missing protocol > @@ -285,8 +285,9 @@ class ModelTests(unittest.TestCase): > 'capacity': 1024, > 'allocation': 512, > 'format': 'qcow2'} > - inst.storagevolumes_create(pool, params) > + task_id = inst.storagevolumes_create(pool, params)['id'] > rollback.prependDefer(inst.storagevolume_delete, pool, vol) > + self._wait_task(inst, task_id) > > vm_name = 'kimchi-cdrom' > params = {'name': 'test', 'disks': [], 'cdrom': self.kimchi_iso} > @@ -1107,6 +1108,13 @@ class ModelTests(unittest.TestCase): > except: > cb("Exception raised", False) > > + def continuous_ops(cb, params): > + cb("step 1 OK") > + time.sleep(2) > + cb("step 2 OK") > + time.sleep(2) > + cb("step 3 OK", params.get('result', True)) > + > inst = model.Model('test:///default', > objstore_loc=self.tmp_store) > taskid = add_task('', quick_op, inst.objstore, 'Hello') > @@ -1131,6 +1139,12 @@ class ModelTests(unittest.TestCase): > inst.task_lookup(taskid)['message']) > self.assertEquals('failed', inst.task_lookup(taskid)['status']) > > + taskid = add_task('', continuous_ops, inst.objstore, > + {'result': True}) > + self.assertEquals('running', inst.task_lookup(taskid)['status']) > + self._wait_task(inst, taskid, timeout=10) > + self.assertEquals('finished', inst.task_lookup(taskid)['status']) > + > # This wrapper function is needed due to the new backend messaging in > # vm model. vm_poweroff and vm_delete raise exception if vm is not found. > # These functions are called after vm has been deleted if test finishes > @@ -1253,9 +1267,16 @@ class ModelTests(unittest.TestCase): > raise e > > def _wait_task(self, model, taskid, timeout=5): > - for i in range(0, timeout): > - if model.task_lookup(taskid)['status'] == 'running': > - time.sleep(1) > + for i in range(0, timeout): > + task_info = model.task_lookup(taskid) > + if task_info['status'] == "running": > + kimchi_log.info("Waiting task %s, message: %s", > + taskid, task_info['message']) > + time.sleep(1) > + else: > + return > + kimchi_log.error("Timeout while process long-run task, " > + "try to increase timeout value.") > > def test_get_distros(self): > inst = model.Model('test:///default', > diff --git a/tests/test_rest.py b/tests/test_rest.py > index 8de0a9c..649790b 100644 > --- a/tests/test_rest.py > +++ b/tests/test_rest.py > @@ -37,6 +37,7 @@ import kimchi.mockmodel > import kimchi.server > from kimchi.config import paths > from kimchi.rollbackcontext import RollbackContext > +from kimchi.utils import kimchi_log > from utils import get_free_port, patch_auth, request > from utils import run_server > > @@ -1535,7 +1536,13 @@ class RestTests(unittest.TestCase): > for i in range(0, timeout): > task = json.loads(self.request('/tasks/%s' % taskid).read()) > if task['status'] == 'running': > + kimchi_log.info("Waiting task %d, message: %s", > + taskid, task['message']) > time.sleep(1) > + else: > + return > + kimchi_log.error("Timeout while process long-run task, " > + "try to increase timeout value.") > > def test_tasks(self): > id1 = model.add_task('/tasks/1', self._async_op)

2 2

[PATCH v2] AsyncTask: Improve continuous status feedback
by Zhou Zheng Sheng 30 Oct '14

30 Oct '14

One of the advantage of AsyncTask is that the background task can call "_status_cb()" multiple times to report the interim progress. However this is not properly implemented in "_status_cb()". The correct handling should be as follow. cb(message, True) Means task finished succesfully. cb(message, False) Means task failed. cb(message) cb(message, None) Means task is ongoing and the invocation is to provide progress feedback. The current implementation fails to distinguish "cb(message, False)" and "cb(message)". This patch fixes the problem and adds a new test case. This patch also extracts "wait_task()" methods in from the tests, adding a regular status report to allow developer know it's waiting for some task but not stuck on something. There is also two methods in tests that start a AsyncTask but do not wait it till finish, this will interfere with other tests, so the patch adds the missing "wait_task()" invocation for them. v2: Extract the common "wait_task()" methods to avoid duplicated code. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/asynctask.py | 6 ++---- tests/test_mockmodel.py | 2 ++ tests/test_model.py | 36 +++++++++++++++++++++++------------- tests/test_rest.py | 25 +++++++++++-------------- tests/utils.py | 15 +++++++++++++++ 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/kimchi/asynctask.py b/src/kimchi/asynctask.py index 99e7a64..b5673b2 100644 --- a/src/kimchi/asynctask.py +++ b/src/kimchi/asynctask.py @@ -49,10 +49,8 @@ class AsyncTask(object): self._save_helper() return - if success: - self.status = 'finished' - else: - self.status = 'failed' + if success is not None: + self.status = 'finished' if success else 'failed' self.message = message self._save_helper() diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index 7319531..eeb6715 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -26,6 +26,7 @@ import unittest import kimchi.mockmodel from utils import get_free_port, patch_auth, request, run_server +from utils import wait_task from kimchi.control.base import Collection, Resource @@ -198,3 +199,4 @@ class MockModelTests(unittest.TestCase): task = model.host_swupdate() task_params = [u'id', u'message', u'status', u'target_uri'] self.assertEquals(sorted(task_params), sorted(task.keys())) + wait_task(model.task_lookup, task['id']) diff --git a/tests/test_model.py b/tests/test_model.py index d9bbe9e..896540d 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -43,6 +43,7 @@ from kimchi.iscsi import TargetClient from kimchi.model import model from kimchi.rollbackcontext import RollbackContext from kimchi.utils import add_task +from utils import wait_task invalid_repository_urls = ['www.fedora.org', # missing protocol @@ -127,7 +128,7 @@ class ModelTests(unittest.TestCase): 'format': 'qcow2'} task_id = inst.storagevolumes_create('default', params)['id'] rollback.prependDefer(inst.storagevolume_delete, 'default', vol) - self._wait_task(inst, task_id) + wait_task(inst.task_lookup, task_id) self.assertEquals('finished', inst.task_lookup(task_id)['status']) vol_path = inst.storagevolume_lookup('default', vol)['path'] @@ -285,8 +286,9 @@ class ModelTests(unittest.TestCase): 'capacity': 1024, 'allocation': 512, 'format': 'qcow2'} - inst.storagevolumes_create(pool, params) + task_id = inst.storagevolumes_create(pool, params)['id'] rollback.prependDefer(inst.storagevolume_delete, pool, vol) + wait_task(inst.task_lookup, task_id) vm_name = 'kimchi-cdrom' params = {'name': 'test', 'disks': [], 'cdrom': self.kimchi_iso} @@ -558,7 +560,7 @@ class ModelTests(unittest.TestCase): params['name'] = vol task_id = inst.storagevolumes_create(pool, params)['id'] rollback.prependDefer(inst.storagevolume_delete, pool, vol) - self._wait_task(inst, task_id) + wait_task(inst.task_lookup, task_id) self.assertEquals('finished', inst.task_lookup(task_id)['status']) fd, path = tempfile.mkstemp(dir=path) @@ -599,7 +601,7 @@ class ModelTests(unittest.TestCase): taskid = task_response['id'] vol_name = task_response['target_uri'].split('/')[-1] self.assertEquals('COPYING', vol_name) - self._wait_task(inst, taskid, timeout=60) + wait_task(inst.task_lookup, taskid, timeout=60) self.assertEquals('finished', inst.task_lookup(taskid)['status']) vol_path = os.path.join(args['path'], vol_name) self.assertTrue(os.path.isfile(vol_path)) @@ -1120,10 +1122,17 @@ class ModelTests(unittest.TestCase): except: cb("Exception raised", False) + def continuous_ops(cb, params): + cb("step 1 OK") + time.sleep(2) + cb("step 2 OK") + time.sleep(2) + cb("step 3 OK", params.get('result', True)) + inst = model.Model('test:///default', objstore_loc=self.tmp_store) taskid = add_task('', quick_op, inst.objstore, 'Hello') - self._wait_task(inst, taskid) + wait_task(inst.task_lookup, taskid) self.assertEquals(1, taskid) self.assertEquals('finished', inst.task_lookup(taskid)['status']) self.assertEquals('Hello', inst.task_lookup(taskid)['message']) @@ -1134,16 +1143,22 @@ class ModelTests(unittest.TestCase): self.assertEquals(2, taskid) self.assertEquals('running', inst.task_lookup(taskid)['status']) self.assertEquals('OK', inst.task_lookup(taskid)['message']) - self._wait_task(inst, taskid) + wait_task(inst.task_lookup, taskid) self.assertEquals('failed', inst.task_lookup(taskid)['status']) self.assertEquals('It was not meant to be', inst.task_lookup(taskid)['message']) taskid = add_task('', abnormal_op, inst.objstore, {}) - self._wait_task(inst, taskid) + wait_task(inst.task_lookup, taskid) self.assertEquals('Exception raised', inst.task_lookup(taskid)['message']) self.assertEquals('failed', inst.task_lookup(taskid)['status']) + taskid = add_task('', continuous_ops, inst.objstore, + {'result': True}) + self.assertEquals('running', inst.task_lookup(taskid)['status']) + wait_task(inst.task_lookup, taskid, timeout=10) + self.assertEquals('finished', inst.task_lookup(taskid)['status']) + # This wrapper function is needed due to the new backend messaging in # vm model. vm_poweroff and vm_delete raise exception if vm is not found. # These functions are called after vm has been deleted if test finishes @@ -1247,7 +1262,7 @@ class ModelTests(unittest.TestCase): task = inst.debugreports_create({'name': reportName}) rollback.prependDefer(inst.debugreport_delete, tmp_name) taskid = task['id'] - self._wait_task(inst, taskid, timeout) + wait_task(inst.task_lookup, taskid, timeout) self.assertEquals('finished', inst.task_lookup(taskid)['status'], "It is not necessary an error. " @@ -1265,11 +1280,6 @@ class ModelTests(unittest.TestCase): if 'debugreport tool not found' not in e.message: raise e - def _wait_task(self, model, taskid, timeout=5): - for i in range(0, timeout): - if model.task_lookup(taskid)['status'] == 'running': - time.sleep(1) - def test_get_distros(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) diff --git a/tests/test_rest.py b/tests/test_rest.py index 8de0a9c..60dce2f 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -38,7 +38,7 @@ import kimchi.server from kimchi.config import paths from kimchi.rollbackcontext import RollbackContext from utils import get_free_port, patch_auth, request -from utils import run_server +from utils import run_server, wait_task test_server = None @@ -1041,7 +1041,7 @@ class RestTests(unittest.TestCase): task = json.loads(resp.read()) vol_name = task['target_uri'].split('/')[-1] self.assertEquals('anyurl.wor.kz', vol_name) - self._wait_task(task['id']) + wait_task(self._task_lookup, task['id']) task = json.loads(self.request('/tasks/%s' % task['id']).read()) self.assertEquals('finished', task['status']) resp = self.request('/storagepools/pool-1/storagevolumes/%s' % @@ -1069,7 +1069,7 @@ class RestTests(unittest.TestCase): req, 'POST') self.assertEquals(202, resp.status) task_id = json.loads(resp.read())['id'] - self._wait_task(task_id) + wait_task(self._task_lookup, task_id) status = json.loads(self.request('/tasks/%s' % task_id).read()) self.assertEquals('finished', status['status']) @@ -1531,11 +1531,8 @@ class RestTests(unittest.TestCase): 'DELETE') self.assertEquals(204, resp.status) - def _wait_task(self, taskid, timeout=5): - for i in range(0, timeout): - task = json.loads(self.request('/tasks/%s' % taskid).read()) - if task['status'] == 'running': - time.sleep(1) + def _task_lookup(self, taskid): + return json.loads(self.request('/tasks/%s' % taskid).read()) def test_tasks(self): id1 = model.add_task('/tasks/1', self._async_op) @@ -1550,12 +1547,12 @@ class RestTests(unittest.TestCase): tasks = json.loads(self.request('/tasks').read()) tasks_ids = [int(t['id']) for t in tasks] self.assertEquals(set([id1, id2, id3]) - set(tasks_ids), set([])) - self._wait_task(id2) + wait_task(self._task_lookup, id2) foo2 = json.loads(self.request('/tasks/%s' % id2).read()) keys = ['id', 'status', 'message', 'target_uri'] self.assertEquals(sorted(keys), sorted(foo2.keys())) self.assertEquals('failed', foo2['status']) - self._wait_task(id3) + wait_task(self._task_lookup, id3) foo3 = json.loads(self.request('/tasks/%s' % id3).read()) self.assertEquals('in progress', foo3['message']) self.assertEquals('running', foo3['status']) @@ -1717,7 +1714,7 @@ class RestTests(unittest.TestCase): task = json.loads(resp.read()) # make sure the debugreport doesn't exist until the # the task is finished - self._wait_task(task['id']) + wait_task(self._task_lookup, task['id']) rollback.prependDefer(self._report_delete, 'report2') resp = request(host, ssl_port, '/debugreports/report1') debugreport = json.loads(resp.read()) @@ -1736,7 +1733,7 @@ class RestTests(unittest.TestCase): task = json.loads(resp.read()) # make sure the debugreport doesn't exist until the # the task is finished - self._wait_task(task['id'], 20) + wait_task(self._task_lookup, task['id'], 20) rollback.prependDefer(self._report_delete, 'report1') resp = request(host, ssl_port, '/debugreports/report1') debugreport = json.loads(resp.read()) @@ -1928,7 +1925,7 @@ class RestTests(unittest.TestCase): self.assertEquals(r.status_code, 202) task = r.json() - self._wait_task(task['id']) + wait_task(self._task_lookup, task['id']) resp = self.request('/storagepools/default/storagevolumes/%s' % task['target_uri'].split('/')[-1]) self.assertEquals(200, resp.status) @@ -1948,7 +1945,7 @@ class RestTests(unittest.TestCase): self.assertEquals(r.status_code, 202) task = r.json() - self._wait_task(task['id'], 15) + wait_task(self._task_lookup, task['id'], 15) resp = self.request('/storagepools/default/storagevolumes/%s' % task['target_uri'].split('/')[-1]) diff --git a/tests/utils.py b/tests/utils.py index 140bb1d..9133904 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -25,6 +25,7 @@ import json import os import socket import sys +import time import threading import unittest @@ -36,6 +37,7 @@ import kimchi.mockmodel import kimchi.server from kimchi.config import paths from kimchi.exception import OperationFailed +from kimchi.utils import kimchi_log _ports = {} @@ -195,3 +197,16 @@ def patch_auth(sudo=True): def normalize_xml(xml_str): return etree.tostring(etree.fromstring(xml_str, etree.XMLParser(remove_blank_text=True))) + + +def wait_task(task_lookup, taskid, timeout=10): + for i in range(0, timeout): + task_info = task_lookup(taskid) + if task_info['status'] == "running": + kimchi_log.info("Waiting task %s, message: %s", + taskid, task_info['message']) + time.sleep(1) + else: + return + kimchi_log.error("Timeout while process long-run task, " + "try to increase timeout value.") -- 1.9.3

1 0

[PATCH] Number of CPUs in Host's Basic Information.
by Paulo Vital 29 Oct '14

29 Oct '14

Support to provide the information of the number of online CPUs present in the Host system. Also, updated English help page to express the new information. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 1 + ui/pages/help/en_US/host.dita | 4 ++-- ui/pages/tabs/host.html.tmpl | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 1bc3ca2..ca197c1 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -89,6 +89,7 @@ class HostModel(object): res['cpu'] = line.split(':')[1].strip() break + res['num_cpu'] = psutil.NUM_CPUS res['memory'] = psutil.TOTAL_PHYMEM # Include IBM PowerKVM name to supported distro names diff --git a/ui/pages/help/en_US/host.dita b/ui/pages/help/en_US/host.dita index 335c51c..0dcb670 100644 --- a/ui/pages/help/en_US/host.dita +++ b/ui/pages/help/en_US/host.dita @@ -24,8 +24,8 @@ to the host system, if it is not already connected.</li> <dlentry> <dt>Basic information</dt> <dd>This section displays the host operating system distribution, -version, and code name, as well as the processor type and amount of -memory in GB.</dd> +version, and code name, as well as the processor type, the number of +online CPUs and amount of memory in GB.</dd> </dlentry><dlentry> <dt>System statistics</dt> <dd>This section displays graphs to show statistics for CPU, memory, diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index 8641962..57c7cee 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -75,6 +75,10 @@ <div class="section-value">{cpu}</div> </div> <div class="section-row"> + <div class="section-label">$_("CPU(s)")</div> + <div class="section-value">{num_cpu}</div> + </div> + <div class="section-row"> <div class="section-label">$_("Memory")</div> <div class="section-value">{memory}</div> </div> -- 1.9.3

6 8

[PATCH v7 0/3] Backend support for templates with sockets, cores, and threads
by Christy Perez 29 Oct '14

29 Oct '14

v6->v7 - Add unit tests - Rebase v5->v6: - Change cpu_info to empty dict instead of empty string if not specified - Split translations into different commit v4->v5: - Fix format issues - Remove if check for cpu_info in control, and set cpu_info to the empty string in model if None - Add format requirements error for topology requirements. - Add new error to toplogy in API.json - Update po files v3->v4: - Remove the unused cpu_ elements from common_spec - Pass new_t into validate function to reduce complexity - Rearrange code to decrese indents in _get_cpu_xml v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Christy Perez (3): Backend support for templates with sockets, cores, and threads model test for updating template Translations for new cpu_info messages docs/API.md | 13 ++++++- po/de_DE.po | 76 +++++++++++++++++++++++++++++++++++---- po/en_US.po | 76 +++++++++++++++++++++++++++++++++++---- po/es_ES.po | 76 +++++++++++++++++++++++++++++++++++---- po/fr_FR.po | 76 +++++++++++++++++++++++++++++++++++---- po/it_IT.po | 76 +++++++++++++++++++++++++++++++++++---- po/ja_JP.po | 76 +++++++++++++++++++++++++++++++++++---- po/kimchi.pot | 76 +++++++++++++++++++++++++++++++++++---- po/ko_KR.po | 76 +++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 75 ++++++++++++++++++++++++++++++++++---- po/ru_RU.po | 76 +++++++++++++++++++++++++++++++++++---- po/zh_CN.po | 79 +++++++++++++++++++++++++++++++++++------ po/zh_TW.po | 76 +++++++++++++++++++++++++++++++++++---- src/kimchi/API.json | 36 +++++++++++++++++-- src/kimchi/control/templates.py | 31 ++++++++-------- src/kimchi/i18n.py | 2 ++ src/kimchi/model/templates.py | 32 +++++++++++++++++ src/kimchi/osinfo.py | 5 ++- src/kimchi/vmtemplate.py | 16 +++++++++ tests/test_model.py | 25 +++++++++++++ 20 files changed, 966 insertions(+), 108 deletions(-) -- 1.9.3

3 11

[PATCH v8 0/3] Backend support for templates with sockets, cores, and threads
by Christy Perez 29 Oct '14

29 Oct '14

v7->v8 - Add mockmodel tests for POST, PUT and GET - Move model test into existing function to work around bug (being worked by Zhou) v6->v7 - Add unit tests - Rebase v5->v6: - Change cpu_info to empty dict instead of empty string if not specified - Split translations into different commit v4->v5: - Fix format issues - Remove if check for cpu_info in control, and set cpu_info to the empty string in model if None - Add format requirements error for topology requirements. - Add new error to toplogy in API.json - Update po files v3->v4: - Remove the unused cpu_ elements from common_spec - Pass new_t into validate function to reduce complexity - Rearrange code to decrese indents in _get_cpu_xml v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Christy Perez (3): Backend support for templates with sockets, cores, and threads cpu_info tests for model and mockmodel Translations for new cpu_info messages docs/API.md | 13 ++++++- po/de_DE.po | 76 +++++++++++++++++++++++++++++++++++---- po/en_US.po | 76 +++++++++++++++++++++++++++++++++++---- po/es_ES.po | 76 +++++++++++++++++++++++++++++++++++---- po/fr_FR.po | 76 +++++++++++++++++++++++++++++++++++---- po/it_IT.po | 76 +++++++++++++++++++++++++++++++++++---- po/ja_JP.po | 76 +++++++++++++++++++++++++++++++++++---- po/kimchi.pot | 76 +++++++++++++++++++++++++++++++++++---- po/ko_KR.po | 76 +++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 75 ++++++++++++++++++++++++++++++++++---- po/ru_RU.po | 76 +++++++++++++++++++++++++++++++++++---- po/zh_CN.po | 79 +++++++++++++++++++++++++++++++++++------ po/zh_TW.po | 76 +++++++++++++++++++++++++++++++++++---- src/kimchi/API.json | 36 +++++++++++++++++-- src/kimchi/control/templates.py | 31 ++++++++-------- src/kimchi/i18n.py | 2 ++ src/kimchi/mockmodel.py | 3 ++ src/kimchi/model/templates.py | 32 +++++++++++++++++ src/kimchi/osinfo.py | 5 ++- src/kimchi/vmtemplate.py | 15 ++++++++ tests/test_mockmodel.py | 24 +++++++++++++ tests/test_model.py | 13 +++++++ 22 files changed, 980 insertions(+), 108 deletions(-) -- 1.9.3

3 5

Re: [Kimchi-devel] [PATCH 0/5] Fix various problems in Kimchi tests
by Aline Manera 29 Oct '14

29 Oct '14

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] Update libvirtstoragepool.py to use lxml.builder
by Aline Manera 29 Oct '14

29 Oct '14

Instead of using plan XML text, we should use lxml.builder to avoid any issue while generating the XML. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/libvirtstoragepool.py | 177 +++++++++++++-------------------- tests/test_storagepool.py | 16 ++- 2 files changed, 77 insertions(+), 116 deletions(-) diff --git a/src/kimchi/model/libvirtstoragepool.py b/src/kimchi/model/libvirtstoragepool.py index d7b49e2..c6deafc 100644 --- a/src/kimchi/model/libvirtstoragepool.py +++ b/src/kimchi/model/libvirtstoragepool.py @@ -17,9 +17,10 @@ # 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 copy import os import tempfile +import lxml.etree as ET +from lxml.builder import E import libvirt @@ -65,15 +66,10 @@ class DirPoolDef(StoragePoolDef): # name: # type: # path: - xml = u""" - <pool type='dir'> - <name>{name}</name> - <target> - <path>{path}</path> - </target> - </pool> - """.format(**self.poolArgs) - return xml + pool = E.pool(type='dir') + pool.append(E.name(self.poolArgs['name'])) + pool.append(E.target(E.path(self.poolArgs['path']))) + return ET.tostring(pool, encoding='unicode', pretty_print=True) class NetfsPoolDef(StoragePoolDef): @@ -120,21 +116,16 @@ class NetfsPoolDef(StoragePoolDef): # type: # source[host]: # source[path]: - poolArgs = copy.deepcopy(self.poolArgs) - poolArgs['path'] = self.path - xml = u""" - <pool type='netfs'> - <name>{name}</name> - <source> - <host name='{source[host]}'/> - <dir path='{source[path]}'/> - </source> - <target> - <path>{path}</path> - </target> - </pool> - """.format(**poolArgs) - return xml + pool = E.pool(type='netfs') + pool.append(E.name(self.poolArgs['name'])) + + source = E.source() + source.append(E.host(name=self.poolArgs['source']['host'])) + source.append(E.dir(path=self.poolArgs['source']['path'])) + + pool.append(source) + pool.append(E.target(E.path(self.path))) + return ET.tostring(pool, encoding='unicode', pretty_print=True) class LogicalPoolDef(StoragePoolDef): @@ -150,26 +141,16 @@ class LogicalPoolDef(StoragePoolDef): # name: # type: # source[devices]: - poolArgs = copy.deepcopy(self.poolArgs) - devices = [] - for device_path in poolArgs['source']['devices']: - devices.append('<device path="%s" />' % device_path) - - poolArgs['source']['devices'] = ''.join(devices) - poolArgs['path'] = self.path - - xml = u""" - <pool type='logical'> - <name>{name}</name> - <source> - {source[devices]} - </source> - <target> - <path>{path}</path> - </target> - </pool> - """.format(**poolArgs) - return xml + pool = E.pool(type='logical') + pool.append(E.name(self.poolArgs['name'])) + + source = E.source() + for device_path in self.poolArgs['source']['devices']: + source.append(E.device(path=device_path)) + + pool.append(source) + pool.append(E.target(E.path(self.path))) + return ET.tostring(pool, encoding='unicode', pretty_print=True) class ScsiPoolDef(StoragePoolDef): @@ -199,22 +180,17 @@ class ScsiPoolDef(StoragePoolDef): # source[adapter][wwnn]: # source[adapter][wwpn]: # path: + pool = E.pool(type='scsi') + pool.append(E.name(self.poolArgs['name'])) + + adapter = E.adapter(type=self.poolArgs['source']['adapter']['type']) + adapter.set('name', self.poolArgs['source']['name']) + adapter.set('wwnn', self.poolArgs['source']['adapter']['wwnn']) + adapter.set('wwpn', self.poolArgs['source']['adapter']['wwpn']) - xml = """ - <pool type='scsi'> - <name>{name}</name> - <source> - <adapter type='{source[adapter][type]}'\ - name='{source[name]}'\ - wwnn='{source[adapter][wwnn]}'\ - wwpn='{source[adapter][wwpn]}'/> - </source> - <target> - <path>{path}</path> - </target> - </pool> - """.format(**self.poolArgs) - return xml + pool.append(E.source(adapter)) + pool.append(E.target(E.path(self.poolArgs['path']))) + return ET.tostring(pool, encoding='unicode', pretty_print=True) class IscsiPoolDef(StoragePoolDef): @@ -237,36 +213,19 @@ class IscsiPoolDef(StoragePoolDef): virSecret = conn.secretLookupByUsage( libvirt.VIR_SECRET_USAGE_TYPE_ISCSI, self.poolArgs['name']) except libvirt.libvirtError: - xml = ''' - <secret ephemeral='no' private='yes'> - <description>Secret for iSCSI storage pool {name}</description> - <auth type='chap' username='{username}'/> - <usage type='iscsi'> - <target>{name}</target> - </usage> - </secret>'''.format(name=self.poolArgs['name'], - username=auth['username']) - virSecret = conn.secretDefineXML(xml) + secret = E.secret(ephemeral='no', private='yes') - virSecret.setValue(auth['password']) - - def _format_port(self, poolArgs): - try: - port = poolArgs['source']['port'] - except KeyError: - return "" - return "port='%s'" % port + description = E.description('Secret for iSCSI storage pool %s' % + self.poolArgs['name']) + secret.append(description) + secret.append(E.auth(type='chap', username=auth['username'])) - def _format_auth(self, poolArgs): - try: - auth = poolArgs['source']['auth'] - except KeyError: - return "" + usage = E.usage(type='iscsi') + usage.append(E.target(self.poolArgs['name'])) + secret.append(usage) + virSecret = conn.secretDefineXML(ET.tostring(secret)) - return ''' - <auth type='chap' username='{username}'> - <secret type='iscsi' usage='{name}'/> - </auth>'''.format(name=poolArgs['name'], username=auth['username']) + virSecret.setValue(auth['password']) @property def xml(self): @@ -278,22 +237,28 @@ class IscsiPoolDef(StoragePoolDef): # # Optional parameters # source[port]: - poolArgs = copy.deepcopy(self.poolArgs) - poolArgs['source'].update({'port': self._format_port(poolArgs), - 'auth': self._format_auth(poolArgs)}) - poolArgs['path'] = '/dev/disk/by-id' - - xml = u""" - <pool type='iscsi'> - <name>{name}</name> - <source> - <host name='{source[host]}' {source[port]}/> - <device path='{source[target]}'/> - {source[auth]} - </source> - <target> - <path>{path}</path> - </target> - </pool> - """.format(**poolArgs) - return xml + pool = E.pool(type='iscsi') + pool.append(E.name(self.poolArgs['name'])) + + host = E.host(name=self.poolArgs['source']['host']) + port = self.poolArgs['source'].get('port') + if port is not None: + host.set('port', str(port)) + + source = E.source(host) + source.append(E.device(path=self.poolArgs['source']['target'])) + + source_auth = self.poolArgs['source'].get('auth') + if source_auth is not None: + auth = E.auth(type='chap') + auth.set('username', source_auth['username']) + + secret = E.secret(type='iscsi') + secret.set('usage', self.poolArgs['name']) + auth.append(secret) + + source.append(auth) + + pool.append(source) + pool.append(E.target(E.path('/dev/disk/by-id'))) + return ET.tostring(pool, encoding='unicode', pretty_print=True) diff --git a/tests/test_storagepool.py b/tests/test_storagepool.py index 3fbeed0..ee30e9a 100644 --- a/tests/test_storagepool.py +++ b/tests/test_storagepool.py @@ -17,12 +17,11 @@ # 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 libxml2 +import lxml.etree as ET import unittest from kimchi.model.libvirtstoragepool import StoragePoolDef -from kimchi.rollbackcontext import RollbackContext class storagepoolTests(unittest.TestCase): @@ -166,11 +165,8 @@ class storagepoolTests(unittest.TestCase): for poolDef in poolDefs: defObj = StoragePoolDef.create(poolDef['def']) xmlStr = defObj.xml - with RollbackContext() as rollback: - t1 = libxml2.readDoc(xmlStr, URL='', encoding='UTF-8', - options=libxml2.XML_PARSE_NOBLANKS) - rollback.prependDefer(t1.freeDoc) - t2 = libxml2.readDoc(poolDef['xml'], URL='', encoding='UTF-8', - options=libxml2.XML_PARSE_NOBLANKS) - rollback.prependDefer(t2.freeDoc) - self.assertEquals(t1.serialize(), t2.serialize()) + + parser = ET.XMLParser(remove_blank_text=True) + t1 = ET.fromstring(xmlStr, parser) + t2 = ET.fromstring(poolDef['xml'], parser) + self.assertEquals(ET.tostring(t1), ET.tostring(t2)) -- 1.9.3

4 4

[PATCH 0/3] Backend support for templates with sockets, cores, and threads
by Christy Perez 28 Oct '14

28 Oct '14

v7->v8 - Add mockmodel tests for POST, PUT and GET - Move model test into existing function to work around bug (being worked by Zhou) v6->v7 - Add unit tests - Rebase v5->v6: - Change cpu_info to empty dict instead of empty string if not specified - Split translations into different commit v4->v5: - Fix format issues - Remove if check for cpu_info in control, and set cpu_info to the empty string in model if None - Add format requirements error for topology requirements. - Add new error to toplogy in API.json - Update po files v3->v4: - Remove the unused cpu_ elements from common_spec - Pass new_t into validate function to reduce complexity - Rearrange code to decrese indents in _get_cpu_xml v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Christy Perez (3): Backend support for templates with sockets, cores, and threads cpu_info tests for model and mockmodel Translations for new cpu_info messages docs/API.md | 13 ++++++- po/de_DE.po | 76 +++++++++++++++++++++++++++++++++++---- po/en_US.po | 76 +++++++++++++++++++++++++++++++++++---- po/es_ES.po | 76 +++++++++++++++++++++++++++++++++++---- po/fr_FR.po | 76 +++++++++++++++++++++++++++++++++++---- po/it_IT.po | 76 +++++++++++++++++++++++++++++++++++---- po/ja_JP.po | 76 +++++++++++++++++++++++++++++++++++---- po/kimchi.pot | 76 +++++++++++++++++++++++++++++++++++---- po/ko_KR.po | 76 +++++++++++++++++++++++++++++++++++---- po/pt_BR.po | 75 ++++++++++++++++++++++++++++++++++---- po/ru_RU.po | 76 +++++++++++++++++++++++++++++++++++---- po/zh_CN.po | 79 +++++++++++++++++++++++++++++++++++------ po/zh_TW.po | 76 +++++++++++++++++++++++++++++++++++---- src/kimchi/API.json | 36 +++++++++++++++++-- src/kimchi/control/templates.py | 31 ++++++++-------- src/kimchi/i18n.py | 2 ++ src/kimchi/mockmodel.py | 3 ++ src/kimchi/model/templates.py | 32 +++++++++++++++++ src/kimchi/osinfo.py | 5 ++- src/kimchi/vmtemplate.py | 15 ++++++++ tests/test_mockmodel.py | 24 +++++++++++++ tests/test_model.py | 13 +++++++ 22 files changed, 980 insertions(+), 108 deletions(-) -- 1.9.3

1 4

Re: [Kimchi-devel] [PATCH 3/5] AsyncTask: Improve continuous status feedback
by Crístian Viana 28 Oct '14

28 Oct '14

On 28-10-2014 04:48, Zhou Zheng Sheng wrote: > - inst.storagevolumes_create(pool, params) > + task_id = inst.storagevolumes_create(pool, params)['id'] > rollback.prependDefer(inst.storagevolume_delete, pool, vol) > + self._wait_task(inst, task_id) I think you should add the delete call to the rollback session only after the task has finished (i.e. after waiting for it). What if the task raises an exception and the storage volume isn't created? The rollback session will try to delete it but it won't exist.

2 1

Re: [Kimchi-devel] [PATCH 4/5] ModelTests: Improve leftover cleaning
by Crístian Viana 28 Oct '14

28 Oct '14

As I wrote on the patch 3/5, I think you should only add the deletion rollback calls after you're sure the resource has been created (i.e. after waiting for its task to finish). On 28-10-2014 04:48, Zhou Zheng Sheng wrote: > In ModelTests we use RollbackContext to register undo actions for > cleaning leftovers. The general principle for using RollbackContext is > that we should register an undo action right after the successful > allocation of a resource, otherwise we leave a window between the > resource allocation and cleanup action registration. If it happened to > raise an exception in this window, the allocated resource is not > cleaned. > > In ModelTests, you can find that some test methods is not properly using > RollbackContext, they place assertions between resource allocation and > cleanup registration. This patch tries to adjust the order peroperly.

1 0

[PATCH V2] Enhancement: PCI Device information enhancement
by Wen Wang 28 Oct '14

28 Oct '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: 1) Changed the API name to "getPCIDeviceCompanion". 2) Changed for a more specific way of detecting the related devices. 3) Added the "Affected devices" to the tip with aligned format. 4) tip will when the pointer hang over any section of the affected line. This patch provide the way that shows more specific PCI device information by hanging the mouse on top of device name. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 8a6e416..ebf826b 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1129,6 +1129,20 @@ var kimchi = { }); }, + getPCIDeviceCompanions : function(pcidev, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/devices?_passthrough_affected_by=' + pcidev, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + getISCSITargets : function(server, port, suc, err) { server = encodeURIComponent(server); port = port ? '&_server_port='+encodeURIComponent(port) : ''; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 030e112..2a9c1ab 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -407,6 +407,31 @@ kimchi.guest_edit_main = function() { }); } }); + kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { + var pciTitle = ""; + if(infoData.length>0) { + for(var p=0; p<infoData.length; p++) { + if(infoData[p].device_type === "net") { + pciTitle += "Affected devices:\n"; + pciTitle += infoData[p].name + "\n"; + pciTitle += " " + "interface: " + infoData[p].interface; + pciTitle += ", address: " + infoData[p].address; + pciTitle += ", link_type: " + infoData[p].link_type + "\n"; + } else if(infoData[p].device_type === "storage") { + pciTitle += "Affected devices:\n"; + pciTitle += infoData[p].name + "\n"; + pciTitle += " " + "block: " + infoData[p].block; + pciTitle += ", drive_type: " + infoData[p].drive_type; + pciTitle += ", model: " + infoData[p].model + "\n"; + } + } + for(var q=0; q<infoData.length; q++) { + pciTitle === "" || $(".name", "#" + infoData[q].parent).attr("title", pciTitle); + pciTitle === "" || $(".product", "#" + infoData[q].parent).attr("title", pciTitle); + pciTitle === "" || $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); + } + } + }); } }); }); -- 1.7.1

3 4

[PATCH V2] Guest disk hot plug UI
by Wen Wang 28 Oct '14

28 Oct '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: Enable CDROM hot plug including detaching. Enable users add and detach disk when vm is running. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 030e112..82aeeb6 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -57,17 +57,12 @@ kimchi.guest_edit_main = function() { text: false }); - if(kimchi.thisVMState != "running") { - $('.detach', container).button({ - icons: { - primary: 'ui-icon-trash' - }, - text: false - }); - - } else { - $('.detach', container).remove(); - } + $('.detach', container).button({ + icons: { + primary: 'ui-icon-trash' + }, + text: false + }); $('.save', container).button({ icons: { @@ -443,14 +438,8 @@ kimchi.guest_edit_main = function() { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); kimchi.thisVMState = guest['state']; - refreshCDROMs(); - if(kimchi.thisVMState === "running") { - $("#form-guest-edit-general input").prop("disabled", "disabled"); - $("#guest-edit-attach-cdrom-button").remove(); - $("#form-guest-edit-interface .header button").remove(); - } else { - $('#guest-edit-attach-cdrom-button').button({ + $('#guest-edit-attach-cdrom-button').button({ icons: { primary: "ui-icon-plusthick" }, @@ -459,6 +448,10 @@ kimchi.guest_edit_main = function() { event.preventDefault(); kimchi.window.open("guest-storage-add.html"); }); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-general input").prop("disabled", "disabled"); + $("#form-guest-edit-interface .header button").remove(); + } else { $("#action-button-container").removeClass("hidden"); } -- 1.7.1

3 3

[PATCH 0/8] Create a common function to generate guest disk XML
by Aline Manera 27 Oct '14

27 Oct '14

This patch set moves common functions related to guest disk XML to xmlutils/disk.py. That way model/vmstorages.py and vmtemplate.py can make use of it and we make sure the logic is the same in both cases. It is the first step and only changes the way vmtemplate.py generated the guest CDROM XML. But in the next patches all the guest disk generation on vmtemplate.py will do the same (I prefered to do in parts to avoid huge patch sets) Aline Manera (8): Move _get_storage_xml() to xmlutils/disk.py Move vmdisks.py functions to xmlutils/disk.py Remove 'bus' paramater from /vms/<name>/storages documentation Update get_disk_xml() to get the device same according to bus and index values Remove ignore_src parameter from get_disk_xml() Get disk type according to file path on get_disk_xml() Check QEMU stream DNS capability while generating guest disk XML Update vmtemplate.py to use get_disk_xml() while generating CDROM XML docs/API.md | 1 - src/kimchi/model/storagevolumes.py | 8 +- src/kimchi/model/vms.py | 1 - src/kimchi/model/vmstorages.py | 140 ++++++++----------------------- src/kimchi/vmdisks.py | 75 ----------------- src/kimchi/vmtemplate.py | 78 +++++------------- src/kimchi/xmlutils/disk.py | 163 +++++++++++++++++++++++++++++++++++++ tests/test_model.py | 11 ++- 8 files changed, 233 insertions(+), 244 deletions(-) delete mode 100644 src/kimchi/vmdisks.py create mode 100644 src/kimchi/xmlutils/disk.py -- 1.9.3

1 8

[PATCH] Enhancement: PCI Device information enhancement
by Wen Wang 27 Oct '14

27 Oct '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch provide the way that shows more specific PCI device information by hanging the mouse on top of device name. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 8a6e416..aebac56 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1129,6 +1129,20 @@ var kimchi = { }); }, + getPCIDeviceDescriptions : function(pcidev, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/devices?_passthrough_affected_by=' + pcidev, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + getISCSITargets : function(server, port, suc, err) { server = encodeURIComponent(server); port = port ? '&_server_port='+encodeURIComponent(port) : ''; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 030e112..580f648 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -365,6 +365,9 @@ kimchi.guest_edit_main = function() { kimchi.getCapabilities(function(result) { var pciEnabled = result.kernel_vfio; for(var i=0; i<hostPCIs.length; i++){ + + + var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ name: hostPCIs[i].name, product: hostPCIs[i].product.description, @@ -407,6 +410,28 @@ kimchi.guest_edit_main = function() { }); } }); + kimchi.getPCIDeviceDescriptions(hostPCIs[i].name, function(infoData) { + var pciTitle = ""; + if(infoData.length>0) { + for(var p=0; p<infoData.length; p++) { + if(infoData[p].interface) { + pciTitle += "interface: " + infoData[p].interface; + pciTitle += ", address: " + infoData[p].address; + pciTitle += ", link_type: " + infoData[p].link_type; + pciTitle += " "; + } else if(infoData[p].block) { + pciTitle += "block: " + infoData[p].block; + pciTitle += ", drive_type: " + infoData[p].drive_type; + pciTitle += ", model: " + infoData[p].model; + pciTitle += " "; + } + + } + for(var q=0; q<infoData.length; q++) { + pciTitle === "" || $(".name", "#" + infoData[q].parent).attr("title", pciTitle); + } + } + }); } }); }); -- 1.7.1

2 3

[PATCH 0/2 V3] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 24 Oct '14

24 Oct '14

This patch set changes the way Kimchi loads Help pages of the tabs of the plugins. It also changes the Sample plugin, in order to demonstrate and show properly how to configure the a Help page Rodrigo Trujillo (2): Fix problems to open plugin's help pages Changes in sample plugin to fix and improve help configure.ac | 1 - plugins/sample/Makefile.am | 12 +++++ plugins/sample/sample.conf.in | 5 ++ plugins/sample/ui/config/tab-ext.xml | 11 ++++- plugins/sample/ui/pages/Makefile.am | 2 +- .../sample/ui/pages/help/en_US/sample-tab1.html | 1 + .../sample/ui/pages/help/en_US/sample-tab2.html | 1 + plugins/sample/ui/pages/sample-tab1.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/sample-tab2.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/tab.html.tmpl | 30 ------------ ui/js/src/kimchi.main.js | 55 +++++++++++++++++----- 11 files changed, 133 insertions(+), 45 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab1.html create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab2.html create mode 100644 plugins/sample/ui/pages/sample-tab1.html.tmpl create mode 100644 plugins/sample/ui/pages/sample-tab2.html.tmpl delete mode 100644 plugins/sample/ui/pages/tab.html.tmpl -- 1.9.3

2 3

[PATCH 1/1] add sub-makefile in src/kimchi/xmlutils
by Simon Jin 24 Oct '14

24 Oct '14

Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- configure.ac | 1 + src/kimchi/Makefile.am | 2 +- src/kimchi/xmlutils/Makefile.am | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/xmlutils/Makefile.am diff --git a/configure.ac b/configure.ac index d64ddc2..1b476c3 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,7 @@ AC_CONFIG_FILES([ src/kimchi/control/Makefile src/kimchi/control/vm/Makefile src/kimchi/model/Makefile + src/kimchi/xmlutils/Makefile plugins/Makefile plugins/sample/Makefile plugins/sample/po/Makefile.in diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am index 84def58..5c204e0 100644 --- a/src/kimchi/Makefile.am +++ b/src/kimchi/Makefile.am @@ -17,7 +17,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -SUBDIRS = control model +SUBDIRS = control model xmlutils kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py)) diff --git a/src/kimchi/xmlutils/Makefile.am b/src/kimchi/xmlutils/Makefile.am new file mode 100644 index 0000000..5c246cb --- /dev/null +++ b/src/kimchi/xmlutils/Makefile.am @@ -0,0 +1,25 @@ +# +# 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 + +model_PYTHON = *.py + +modeldir = $(pythondir)/kimchi/xmlutils + +install-data-local: + $(MKDIR_P) $(DESTDIR)$(modeldir) -- 1.9.3

3 3

[PATCH] UI: Clone Guest
by huoyuxin＠linux.vnet.ibm.com 24 Oct '14

24 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 18 ++++++++++ ui/js/src/kimchi.api.js | 13 +++++++ ui/js/src/kimchi.guest_main.js | 68 +++++++++++++++++++++++++++++++++++----- ui/pages/guest.html.tmpl | 4 ++ 4 files changed, 95 insertions(+), 8 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..fc3017b 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/loading.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..216a7dd 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1233,5 +1233,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..113ddfb 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,20 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +273,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -286,6 +328,11 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + kimchi.cloneGuest($(this).closest('li[name=guest]').attr("id"), function(data){ + kimchi.listVmsAuto(); + }); + }); //Maintain menu open state var actionMenu=guestActions.find("div[name=actionmenu]"); @@ -293,6 +340,11 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { $('.popover', actionMenu).toggle(); } + if(vmObject.isCloning){ + guestActions.children().hide(); + result.find('.guest-clone').removeClass('hide-content'); + } + return result; }; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..304749c 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning") ...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,6 +59,7 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> + <button class="button-big running-hidden" name="vm-clone"><span class="text">$_("Clone")</span></button> <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> -- 1.7.1

4 4

[PATCH] UI: Clone Guest
by huoyuxin＠linux.vnet.ibm.com 24 Oct '14

24 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 18 ++++++++++ ui/js/src/kimchi.api.js | 17 ++++++++- ui/js/src/kimchi.guest_main.js | 72 +++++++++++++++++++++++++++++++++++---- ui/pages/guest.html.tmpl | 4 ++ 4 files changed, 101 insertions(+), 10 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 8ffee69..fc3017b 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -275,3 +275,21 @@ text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; padding-left: 10px; } + +.guest-clone { + margin: 10px; +} + +.guest-clone .icon { + background: url('../../images/theme-default/loading.gif') no-repeat; + display: inline-block; + width: 20px; + height: 20px; + vertical-align: middle; +} + +.guest-clone .text { + color: #666666; + margin-left: 5px; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5895a07..2f90219 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,10 +695,10 @@ var kimchi = { }, 2000); break; case 'finished': - suc(result); + suc && suc(result); break; case 'failed': - err(result); + err && err(result); break; default: break; @@ -1233,5 +1233,18 @@ var kimchi = { success : suc, error : err }); + }, + + cloneGuest: function(vm, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(vm)+"/clone", + type : 'POST', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..8c2e8fa 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -15,6 +15,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +kimchi.sampleGuestObject = { + "name": "", + "uuid": "", + "state": "shutoff", + "persistent": true, + "icon": null, + "cpus": 0, + "memory": 0, + "stats": { + "net_throughput": 0, + "io_throughput_peak": 100, + "cpu_utilization": 0, + "io_throughput": 0, + "net_throughput_peak": 100 + }, + "screenshot": null, + "graphics": { + "passwd": null, + "passwdValidTo": null, + "type": "vnc", + "port": null, + "listen": "127.0.0.1" + }, + "users": [], + "groups": [], + "access": "full" +}; + kimchi.vmstart = function(event) { var button=$(this); @@ -173,8 +201,24 @@ kimchi.listVmsAuto = function() { if (kimchi.vmTimeout) { clearTimeout(kimchi.vmTimeout); } + var getCloningGuests = function(){ + var guests = []; + kimchi.getTasksByFilter('status=running&target_uri='+encodeURIComponent('^/vms/*'), function(tasks) { + for(var i=0;i<tasks.length;i++){ + var guestUri = tasks[i].target_uri; + var guestName = guestUri.substring(guestUri.lastIndexOf('/')+1, guestUri.length); + guests.push($.extend({}, kimchi.sampleGuestObject, {name: guestName, isCloning: true})); + if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) + kimchi.trackTask(tasks[i].id, null, function(err){ + kimchi.message.error(err.message); + }, null); + } + }, null, true); + return guests; + }; kimchi.listVMs(function(result, textStatus, jqXHR) { if (result && textStatus=="success") { + result = getCloningGuests().concat(result); if(result.length) { var listHtml = ''; var guestTemplate = kimchi.guestTemplate; @@ -233,14 +277,16 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { imgLoad.attr('src',load_src); //Link the stopped tile to the start action, the running tile to open the console - if (vmRunningBool) { - liveTile.off("click", kimchi.vmstart); - liveTile.on("click", kimchi.openVmConsole); - } - else { - liveTile.off("click", kimchi.openVmConsole); - liveTile.on("click", kimchi.vmstart); - liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + if(!vmObject.isCloning){ + if (vmRunningBool) { + liveTile.off("click", kimchi.vmstart); + liveTile.on("click", kimchi.openVmConsole); + } + else { + liveTile.off("click", kimchi.openVmConsole); + liveTile.on("click", kimchi.vmstart); + liveTile.hover(function(event){$(this).find('.overlay').show()}, function(event){$(this).find('.overlay').hide()}); + } } @@ -286,6 +332,11 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } guestActions.find("[name=vm-edit]").on({click : kimchi.vmedit}); guestActions.find("[name=vm-delete]").on({click : kimchi.vmdelete}); + guestActions.find("[name=vm-clone]").click(function(){ + kimchi.cloneGuest($(this).closest('li[name=guest]').attr("id"), function(data){ + kimchi.listVmsAuto(); + }); + }); //Maintain menu open state var actionMenu=guestActions.find("div[name=actionmenu]"); @@ -293,6 +344,11 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { $('.popover', actionMenu).toggle(); } + if(vmObject.isCloning){ + guestActions.children().hide(); + result.find('.guest-clone').removeClass('hide-content'); + } + return result; }; diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..ffdabe8 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -26,6 +26,9 @@ <div class="guest-general"> <h2 class="title" title="{name}">{name}</h2> </div> + <div class="guest-clone hide-content"> + <span class="icon"></span><span class="text">$_("Cloning")...</span> + </div> </div> <div name="cpu_utilization" class="sortable"> <div class="circleGauge"></div> @@ -56,6 +59,7 @@ <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> + <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> -- 1.7.1

1 0

[PATCH 0/5] Power (ppc) support patches
by Paulo Vital 23 Oct '14

23 Oct '14

This patch set enables Power(ppc) support by default on Kimchi. Whithout them, the upstream code of Kimchi is not fully compatible with the Power architecture. Eli Qiao (2): Add tablet to vmtemplate,to provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC. Fix Bug 110927 - Sosreport throwing kimchi error Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> Mark Wu (1): Add sos plugin for kimchi Paulo Vital (2): PowerKVM: Workaround of numpy byte order bug on PowerPC Add PowerKVM information as ISO otpion to installation. contrib/kimchi.spec.fedora.in | 3 +++ src/kimchi/Makefile.am | 4 +++- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 5 +++-- src/kimchi/sos.py | 37 +++++++++++++++++++++++++++++++++++++ src/kimchi/vmtemplate.py | 5 +++++ src/kimchi/websocket.py | 7 +++++-- 7 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/kimchi/sos.py -- 1.9.3

5 13

[PATCH] Guest disk hot plug UI
by Wen Wang 23 Oct '14

23 Oct '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Enable users add and detach disk when vm is running. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 030e112..eb0254e 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -57,17 +57,14 @@ kimchi.guest_edit_main = function() { text: false }); - if(kimchi.thisVMState != "running") { - $('.detach', container).button({ - icons: { - primary: 'ui-icon-trash' - }, - text: false - }); + $('.detach', container).button({ + icons: { + primary: 'ui-icon-trash' + }, + text: false + }); - } else { - $('.detach', container).remove(); - } + $('.view .detach', container).remove(); $('.save', container).button({ icons: { @@ -443,14 +440,8 @@ kimchi.guest_edit_main = function() { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); kimchi.thisVMState = guest['state']; - refreshCDROMs(); - if(kimchi.thisVMState === "running") { - $("#form-guest-edit-general input").prop("disabled", "disabled"); - $("#guest-edit-attach-cdrom-button").remove(); - $("#form-guest-edit-interface .header button").remove(); - } else { - $('#guest-edit-attach-cdrom-button').button({ + $('#guest-edit-attach-cdrom-button').button({ icons: { primary: "ui-icon-plusthick" }, @@ -459,6 +450,10 @@ kimchi.guest_edit_main = function() { event.preventDefault(); kimchi.window.open("guest-storage-add.html"); }); + if(kimchi.thisVMState === "running") { + $("#form-guest-edit-general input").prop("disabled", "disabled"); + $("#form-guest-edit-interface .header button").remove(); + } else { $("#action-button-container").removeClass("hidden"); } -- 1.7.1

4 10

[RFC] LDAP integration in kimchi
by Royce Lv 22 Oct '14

22 Oct '14

LDAP supports connect to it (bind) for authentication, usr/group/role add/delete for authorization. For kimchi-LDAP integration we need to address following issues: 1. LDAP set up scripts for kimchi: We need to add initial users: guest, admin; roles: netadmin, hostadmin, guestadmin in LDAP server. Adding these schema for user maybe a burden, we may supply a script to init LDAP server configuration 2. Configuration of using LDAP: Configured to use PAM/LDAP, Connecting to a dedicate LDAP server address(As we may use an LDAP to store information of clustered machine, address can be modified). If this LDAP server does not exist, ask user if they want to setup one, and help them with setup scripts. For this release just support one LDAP per host. 3. Module for LDAP operation wrapping: A dedicate module to encapsulate LDAP operations, such as bind/unbind, adding, deleting, query groups/roles. 4. authentication: We need to abstract authenticate class to be compatible with both PAM and LDAP, and call bind/unbind to implement authentication. 5. authorization: Abstract authentication module to distiguish PAM and LDAP, user name still from cherrypy session, when using LDAP, user/role information are all retrieved from LDAP server. 6. user/role maintenance: Manipulate LDAP to add user, delete user, authorize user with a role, add role/delete role, and so on. This part will not be covered in this release.

3 10

[PATCHv1 0/4] LDAP authentication
by lvroyce0210＠gmail.com 22 Oct '14

22 Oct '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> How to test: 1. set an LDAP based on PAM: http://www.debuntu.org/how-to-set-up-a-ldap-server-and-its-clients/ 2. uncommented ldap section in config Tested: 1. authentication with valid user/password 2. wrong password 3. non-existent user 4. wrong ldap settings Royce Lv (4): Add configuration of LDAP Split PAM and LDAP authentication Add LDAP authentication Fix test cases for authentication contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + src/kimchi.conf.in | 9 +++ src/kimchi/auth.py | 153 +++++++++++++++++++++++++++++++----------- src/kimchi/config.py.in | 5 ++ tests/utils.py | 43 ++++++++---- 7 files changed, 159 insertions(+), 54 deletions(-) -- 1.8.3.2

3 13

[RFC: PATCH v1] Prevent disks from being added more than once
by Christy Perez 22 Oct '14

22 Oct '14

The concept of a ref count for disks had been added, but this count was dependant upon the pool name for a disk. However, the pool name wasn't being stored in the VM XML so it wasn't possible to retreive the pool for the disk in order to update the ref count. To fix this, this patch changes the way that disks are added when created in libvirt storage pools. Instead of files, they are treated as volumes in pools. Note: Because of this modification, a small inconsistency in the API, which states that the pool for a vm's "storages" is returned, is corrected. The pool is returned as an empty string if the disk or volume was not create from a pool (e.g. a remote ISO). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 13 ++++++-- src/kimchi/model/vmstorages.py | 68 +++++++++++++++++++++++++++++++++++--- src/kimchi/vmdisks.py | 33 ++++++++++++++---- src/kimchi/vmtemplate.py | 41 ++++++++++++++++------- 4 files changed, 129 insertions(+), 26 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index f9f226f..af97748 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -249,19 +249,26 @@ def _get_ref_cnt(self, pool, name, path): try: ref_cnt = session.get('storagevolume', vol_id)['ref_cnt'] except NotFoundError: + kimchi_log.info('Volume %s not found in obj store.' % vol_id) # Fix storage volume created outside kimchi scope ref_cnt = 0 - # try to find this volume in exsisted vm + # try to find this volume in exsisting vm vms = VMsModel.get_vms(self.conn) for vm in vms: dom = VMModel.get_vm(vm, self.conn) storages = get_vm_disk_list(dom) for disk in storages: - d_info = get_vm_disk(dom, disk) + d_info = get_vm_disk(dom, disk, self.conn) if path == d_info['path']: ref_cnt = ref_cnt + 1 - session.store('storagevolume', vol_id, + try: + session.store('storagevolume', vol_id, {'ref_cnt': ref_cnt}) + except Exception as e: + # Just log an error if the obj store fails: + kimchi_log.warning('Unable to store storage volume id in ' + 'objectstore due error: %s', e.message) + except Exception as e: # This exception is going to catch errors returned by 'with', # specially ones generated by 'session.store'. It is outside diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 4d6c0b2..1b2c0fe 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -32,7 +32,7 @@ from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.storagevolumes import StorageVolumeModel from kimchi.model.utils import get_vm_config_flag -from kimchi.utils import check_url_path +from kimchi.utils import check_url_path, kimchi_log from kimchi.osinfo import lookup from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP @@ -73,6 +73,11 @@ def _get_storage_xml(params, ignore_source=False): source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) + elif src_type == 'volume': + source = E.source() + source.set('pool', params.get('pool')) + source.set('volume', params.get('vol')) + disk.append(source) else: # Fixing source attribute source = E.source() @@ -138,6 +143,8 @@ def create(self, vm_name, params): # Path will never be blank due to API.json verification. # There is no need to cover this case here. params['format'] = 'raw' + vol_info = None + vol_store_name = None if not ('vol' in params) ^ ('path' in params): raise InvalidParameter("KCHVMSTOR0017E") if params.get('vol'): @@ -146,6 +153,7 @@ def create(self, vm_name, params): vol_info = StorageVolumeModel( conn=self.conn, objstore=self.objstore).lookup(pool, params['vol']) + vol_store_name = '%s:%s' % (pool, params['vol']) except KeyError: raise InvalidParameter("KCHVMSTOR0012E") except Exception as e: @@ -158,6 +166,10 @@ def create(self, vm_name, params): params['format'] = vol_info['format'] params['path'] = vol_info['path'] params['src_type'] = _check_path(params['path']) + if params['src_type'] is 'file' and params.get('pool') and \ + params.get('vol'): + params['src_type'] = 'volume' + # change from 'file' to volume if in a pool ^^ if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -171,6 +183,16 @@ def create(self, vm_name, params): dom.attachDeviceFlags(dev_xml, get_vm_config_flag(dom, 'all')) except Exception as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) + + try: + new_ref_cnt = vol_info['ref_cnt'] + 1 + with self.objstore as session: + session.store('storagevolume', vol_store_name, {'ref_cnt': new_ref_cnt}) + except Exception as e: + # Just log an error if the obj store fails: + kimchi_log.warning('Unable to store storage volume id in ' + 'objectstore due error: %s', e.message) + return params['dev'] def _get_storage_device_name(self, vm_name, params): @@ -192,25 +214,41 @@ def get_list(self, vm_name): dom = VMModel.get_vm(vm_name, self.conn) return get_vm_disk_list(dom) - class VMStorageModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] + self.objstore = kargs['objstore'] def lookup(self, vm_name, dev_name): # Retrieve disk xml and format return dict dom = VMModel.get_vm(vm_name, self.conn) - return get_vm_disk(dom, dev_name) + disk = get_vm_disk(dom, dev_name, self.conn) + # Also include the pool and volume + pool_name = '' + vol_name = '' + try: + pool_name = disk.get('pool') + vol_name = disk.get('volume') + except Exception as e: + kimchi_log.warning('VMDisk lookup error: %s' % e.message) + + disk['pool'] = pool_name + disk['volume'] = vol_name + return disk def delete(self, vm_name, dev_name): # Get storage device xml dom = VMModel.get_vm(vm_name, self.conn) + disk_info = None + disk_xml = None + pool_name = '' + vol_name = '' try: - bus_type = self.lookup(vm_name, dev_name)['bus'] + disk_info = self.lookup(vm_name, dev_name) + bus_type = disk_info['bus'] except NotFoundError: raise - dom = VMModel.get_vm(vm_name, self.conn) if (bus_type not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -224,10 +262,30 @@ def delete(self, vm_name, dev_name): except Exception as e: raise OperationFailed("KCHVMSTOR0010E", {'error': e.message}) + # Get the pool and vol of a disk so we can + # decrement its ref_cnt in the obj store + pool_name = disk_info.get('pool') + vol_name = disk_info.get('volume') + + if(pool_name and vol_name): + try: + vol_id = '%s:%s' % (pool_name, vol_name) + with self.objstore as session: + vol = session.get('storagevolume', vol_id) + if vol: + ref_cnt = vol['ref_cnt'] + if ref_cnt > 0: + ref_cnt = ref_cnt - 1 + session.store('storagevolume', vol_id, {'ref_cnt': ref_cnt}) + except Exception as e: + kimchi_log.warning('Unable to decrement volume ref count due to %s.' + % e.message) + def update(self, vm_name, dev_name, params): path = params.get('path') if path and len(path) != 0: params['src_type'] = _check_path(path) + # change from 'file' to 'volume' if pool ^^ ignore_source = False else: params['src_type'] = 'file' diff --git a/src/kimchi/vmdisks.py b/src/kimchi/vmdisks.py index 6012ada..185a499 100644 --- a/src/kimchi/vmdisks.py +++ b/src/kimchi/vmdisks.py @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import libvirt +import os from lxml import objectify from kimchi.exception import NotFoundError @@ -34,37 +36,56 @@ def get_device_xml(dom, dev_name): return None return disk[0] +def get_pool_xml(conn, pool_name): + conn = conn.get() + return objectify.fromstring(conn.\ + storagePoolLookupByName(pool_name).XMLDesc(0)) -def get_vm_disk(dom, dev_name): +def get_vm_disk(dom, dev_name, conn): # Retrieve disk xml and format return dict disk = get_device_xml(dom, dev_name) if disk is None: raise NotFoundError( "KCHVMSTOR0007E", {'dev_name': dev_name, 'vm_name': dom.name()}) - path = "" + path = '' dev_bus = 'ide' + pool_name = '' + vol_name = '' try: source = disk.source if source is not None: - src_type = disk.attrib['type'] + src_type = disk.get('type') if src_type == 'network': host = source.host path = (source.attrib['protocol'] + '://' + host.attrib['name'] + ':' + host.attrib['port'] + source.attrib['name']) + elif src_type == 'volume': + pool_name = disk.source.get('pool') + pool = get_pool_xml(conn, pool_name) + pool_path = str(pool.target.path) + vol_name = disk.source.attrib['volume'] + path = os.path.join(pool_path, vol_name) else: path = source.attrib[DEV_TYPE_SRC_ATTR_MAP[src_type]] # Retrieve storage bus type dev_bus = disk.target.attrib['bus'] - except: - pass + except Exception as e: + kimchi_log.warning("get_vm_disk exception: %s " % e.message) + dev_type = disk.attrib['device'] + + # Pool and volume may be empty strings, if the user passed a disk name. + # If the disk was from a storage pool, let's use that so we can keep track + # of its ref_cnt in the objects store. return {'dev': dev_name, 'type': dev_type, 'path': path, 'format': disk.driver.attrib['type'], - 'bus': dev_bus} + 'bus': dev_bus, + 'pool': pool_name, + 'volume': vol_name} def get_vm_disk_list(dom): diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5f22db9..1940911 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -187,24 +187,41 @@ def _get_cdrom_xml(self, libvirt_stream_protocols, qemu_stream_dns): return network_file % (params) def _get_disks_xml(self, vm_uuid): - storage_path = self._get_storage_path() + def TYPE(v): + return {'type': v} + + #storage_path = self._get_storage_path() + _pool = pool_name_from_uri(self.info['storagepool']) ret = "" for i, disk in enumerate(self.info['disks']): index = disk.get('index', i) - volume = "%s-%s.img" % (vm_uuid, index) - src = os.path.join(storage_path, volume) + _volume = "%s-%s.img" % (vm_uuid, index) + #src = os.path.join(storage_path, volume) dev = "%s%s" % (self._bus_to_dev[self.info['disk_bus']], string.lowercase[index]) fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' - params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], - 'type': fmt} - ret += """ - <disk type='file' device='disk'> - <driver name='qemu' type='%(type)s' cache='none'/> - <source file='%(src)s' /> - <target dev='%(dev)s' bus='%(bus)s' /> - </disk> - """ % params + #params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], + # 'type': fmt} + #ret += """ + #<disk type='file' device='disk'> + # <driver name='qemu' type='%(type)s' cache='none'/> + # <source file='%(src)s' /> + # <target dev='%(dev)s' bus='%(bus)s' /> + #</disk> + #""" % params + + # Instead do: + #<disk type='volume'> + # <driver name='qemu' type='%(type)s' cache='none'/> + # <source pool='%(pool)s' volume='%(volume)s' /> + # <target dev='%(dev)s' bus='%(bus)s /> + #</disk> + disk = E.disk( + E.driver(TYPE(fmt), name='qemu', cache='none'), + E.source(pool=_pool, volume=_volume), + E.target(dev=dev, bus=self.info['disk_bus']), + TYPE('volume')) + ret += etree.tostring(disk) return ret def _get_graphics_xml(self, params): -- 1.9.3

3 9

RFC: Add serial as a valid graphics type
by Yu Xin Huo 22 Oct '14

22 Oct '14

https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/ht… Per my understanding: 1. To enable the serial console, it needs configuration on guest OS. / You must configure the virtualized operating system to output information to the virtual serial port.// // The serial port is called //|ttyS0|//on Linux or //|COM1|//on Windows./ It need to modify the |/boot/grub/grub.conf| file on guest OS and reboot guest. So VM must have OS already installed, seems like it needs the guest to be running. 2. The serial console can be accessed with 'virsh console' or 'use |virt-manager| to display the virtual text console'. So the target of this work item is to add a 'web command line console' in kimchi UI to access the 'serial console'? ||||

4 12

[PATCH v3] Disabling screen log in production environment
by Daniel Henrique Barboza 20 Oct '14

20 Oct '14

When building kimchi's RPM, some messages are getting logged in /var/log/messages because cherrypy is logging in the standard output. This happens because a function in FeatureTests is enabling log.screen regardless of the current environment. This patch makes a verification that prevents the screen log to be enabled in the production environment. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 31 ++++++++++++++++--------------- src/kimchi/model/utils.py | 4 ++-- src/kimchi/server.py | 6 +++++- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index c6f4687..f1eb8ae 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -80,30 +80,31 @@ SCSI_FC_XML = """ class FeatureTests(object): @staticmethod - def disable_screen_error_logging(): + def disable_libvirt_error_logging(): def libvirt_errorhandler(userdata, error): # A libvirt error handler to ignore annoying messages in stderr pass + # Filter functions are enable only in production env + if cherrypy.config.get('environment') != 'production': + return # Register the error handler to hide libvirt error in stderr libvirt.registerErrorHandler(f=libvirt_errorhandler, ctx=None) - # Disable cherrypy screen logging, in order to log errors on kimchi - # file without displaying them on screen - cherrypy.log.screen = False @staticmethod - def enable_screen_error_logging(): + def enable_libvirt_error_logging(): + # Filter functions are enable only in production env + if cherrypy.config.get('environment') != 'production': + return # Unregister the error handler libvirt.registerErrorHandler(f=None, ctx=None) - # Enable cherrypy screen logging - cherrypy.log.screen = True @staticmethod def libvirt_supports_iso_stream(protocol): xml = ISO_STREAM_XML % {'protocol': protocol} conn = None try: - FeatureTests.disable_screen_error_logging() + FeatureTests.disable_libvirt_error_logging() conn = libvirt.open(None) dom = conn.defineXML(xml) dom.undefine() @@ -112,7 +113,7 @@ class FeatureTests(object): kimchi_log.error(e.message) return False finally: - FeatureTests.enable_screen_error_logging() + FeatureTests.enable_libvirt_error_logging() conn is None or conn.close() @staticmethod @@ -123,7 +124,7 @@ class FeatureTests(object): return xml try: conn = libvirt.open(None) - FeatureTests.disable_screen_error_logging() + FeatureTests.disable_libvirt_error_logging() conn.findStoragePoolSources('netfs', _get_xml(), 0) except libvirt.libvirtError as e: kimchi_log.error(e.message) @@ -132,7 +133,7 @@ class FeatureTests(object): # it returns 38--general system call failure return False finally: - FeatureTests.enable_screen_error_logging() + FeatureTests.enable_libvirt_error_logging() conn is None or conn.close() return True @@ -173,7 +174,7 @@ class FeatureTests(object): @staticmethod def libvirt_support_fc_host(): try: - FeatureTests.disable_screen_error_logging() + FeatureTests.disable_libvirt_error_logging() conn = libvirt.open(None) pool = None pool = conn.storagePoolDefineXML(SCSI_FC_XML, 0) @@ -182,7 +183,7 @@ class FeatureTests(object): # Libvirt requires adapter name, not needed when supports to FC return False finally: - FeatureTests.enable_screen_error_logging() + FeatureTests.enable_libvirt_error_logging() pool is None or pool.undefine() conn is None or conn.close() return True @@ -192,8 +193,8 @@ class FeatureTests(object): KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi/" KIMCHI_NAMESPACE = "kimchi" with RollbackContext() as rollback: - FeatureTests.disable_screen_error_logging() - rollback.prependDefer(FeatureTests.enable_screen_error_logging) + FeatureTests.disable_libvirt_error_logging() + rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) conn = libvirt.open(None) rollback.prependDefer(conn.close) dom = conn.defineXML(SIMPLE_VM_XML) diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index ac7086a..4d8e65a 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -85,7 +85,7 @@ def _kimchi_set_metadata_node(dom, node): def libvirt_get_kimchi_metadata_node(dom, mode="current"): - FeatureTests.disable_screen_error_logging() + FeatureTests.disable_libvirt_error_logging() try: xml = dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, KIMCHI_META_URL, @@ -94,7 +94,7 @@ def libvirt_get_kimchi_metadata_node(dom, mode="current"): except libvirt.libvirtError: return None finally: - FeatureTests.enable_screen_error_logging() + FeatureTests.enable_libvirt_error_logging() def set_metadata_node(dom, node, mode="all"): diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 8d166e5..6cc7143 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -91,13 +91,17 @@ class Server(object): max_body_size_in_bytes = eval(options.max_body_size) * 1024 cherrypy.server.max_request_body_size = max_body_size_in_bytes - cherrypy.log.screen = True cherrypy.log.access_file = options.access_log cherrypy.log.error_file = options.error_log logLevel = LOGGING_LEVEL.get(options.log_level, logging.DEBUG) dev_env = options.environment != 'production' + # Enable cherrypy screen logging if running environment + # is not 'production' + if dev_env: + cherrypy.log.screen = True + # Create handler to rotate access log file h = logging.handlers.RotatingFileHandler(options.access_log, 'a', 10000000, 1000) -- 1.8.3.1

2 1

[PATCH 0/2] Create a xmlutils module to hold all the XML manipulation
by Aline Manera 20 Oct '14

20 Oct '14

It is the first step to do a VMTemplate refactor, as all the XML manipulation will be in a single place. Aline Manera (2): Create a xmlutils module to hold all the XML manipulation Move networkxml.py to xmlutils module and update it to use lxml.builder src/kimchi/config.py.in | 2 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/hostdev.py | 2 +- src/kimchi/model/networks.py | 30 ++++----- src/kimchi/model/storagepools.py | 16 ++--- src/kimchi/model/storagevolumes.py | 5 +- src/kimchi/model/templates.py | 8 +-- src/kimchi/model/vms.py | 21 +++--- src/kimchi/networkxml.py | 127 ------------------------------------- src/kimchi/xmlutils.py | 63 ------------------ src/kimchi/xmlutils/__init__.py | 18 ++++++ src/kimchi/xmlutils/network.py | 123 +++++++++++++++++++++++++++++++++++ src/kimchi/xmlutils/utils.py | 63 ++++++++++++++++++ tests/test_networkxml.py | 29 ++++----- tests/test_vmtemplate.py | 2 +- 15 files changed, 261 insertions(+), 252 deletions(-) delete mode 100644 src/kimchi/networkxml.py delete mode 100644 src/kimchi/xmlutils.py create mode 100644 src/kimchi/xmlutils/__init__.py create mode 100644 src/kimchi/xmlutils/network.py create mode 100644 src/kimchi/xmlutils/utils.py -- 1.9.3

2 4

[PATCH 0/2 V4] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 20 Oct '14

20 Oct '14

This patch set changes the way Kimchi loads Help pages of the tabs of the plugins. It also changes the Sample plugin, in order to demonstrate and show properly how to configure the a Help page Rodrigo Trujillo (2): Fix problems to open plugin's help pages Changes in sample plugin to fix and improve help configure.ac | 1 - plugins/sample/Makefile.am | 12 +++++ plugins/sample/sample.conf.in | 5 ++ plugins/sample/ui/config/tab-ext.xml | 11 ++++- plugins/sample/ui/pages/Makefile.am | 2 +- .../sample/ui/pages/help/en_US/sample-tab1.html | 1 + .../sample/ui/pages/help/en_US/sample-tab2.html | 1 + plugins/sample/ui/pages/sample-tab1.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/sample-tab2.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/tab.html.tmpl | 30 ------------ ui/js/src/kimchi.main.js | 53 ++++++++++++++++------ 11 files changed, 129 insertions(+), 47 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab1.html create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab2.html create mode 100644 plugins/sample/ui/pages/sample-tab1.html.tmpl create mode 100644 plugins/sample/ui/pages/sample-tab2.html.tmpl delete mode 100644 plugins/sample/ui/pages/tab.html.tmpl -- 1.9.3

4 10

[PATCH 0/6 V2] Use installed spice-html5 package when possible
by Aline Manera 20 Oct '14

20 Oct '14

V1 -> V2: - Check novnc/spice directory exists otherwise fallback to default directory /usr/share/<novnc|spice-html5> - Fix conditional to properly use --with-spice-html5 in kimchi.spec.fedora.in Aline Manera (6): Import the latest spice-html5 code into Kimchi Modify spice_auto.html for Kimchi proposals Add new spice-html5 code to Kimchi build process Update Kimchi to use the installed spice-html5 Delete former imported spice code Update COPYING content to expose the imported code COPYING | 10 +- configure.ac | 15 +- contrib/DEBIAN/control.in | 3 +- contrib/kimchi.spec.fedora.in | 30 +- contrib/kimchi.spec.suse.in | 24 +- docs/README.md | 10 +- src/kimchi/Makefile.am | 11 +- src/kimchi/config.py.in | 42 +- tests/test_config.py.in | 15 +- ui/Makefile.am | 2 +- ui/css/Makefile.am | 2 - ui/css/spice/Makefile.am | 20 - ui/css/spice/spice.css | 115 --- ui/js/Makefile.am | 2 - ui/js/spice/Makefile.am | 22 - ui/js/spice/atKeynames.js | 183 ----- ui/js/spice/bitmap.js | 51 -- ui/js/spice/cursor.js | 92 --- ui/js/spice/display.js | 806 -------------------- ui/js/spice/enums.js | 282 ------- ui/js/spice/inputs.js | 251 ------- ui/js/spice/jsbn.js | 589 --------------- ui/js/spice/lz.js | 166 ---- ui/js/spice/main.js | 176 ----- ui/js/spice/png.js | 256 ------- ui/js/spice/prng4.js | 79 -- ui/js/spice/quic.js | 1335 --------------------------------- ui/js/spice/rng.js | 102 --- ui/js/spice/rsa.js | 146 ---- ui/js/spice/sha1.js | 346 --------- ui/js/spice/spiceconn.js | 447 ----------- ui/js/spice/spicedataview.js | 96 --- ui/js/spice/spicemsg.js | 883 ---------------------- ui/js/spice/spicetype.js | 480 ------------ ui/js/spice/ticket.js | 250 ------ ui/js/spice/utils.js | 261 ------- ui/js/spice/wire.js | 123 --- ui/js/src/kimchi.api.js | 2 +- ui/pages/spice.html.tmpl | 140 ---- ui/spice-html5/Makefile.am | 25 + ui/spice-html5/atKeynames.js | 183 +++++ ui/spice-html5/bitmap.js | 51 ++ ui/spice-html5/css/Makefile.am | 20 + ui/spice-html5/css/spice.css | 118 +++ ui/spice-html5/cursor.js | 110 +++ ui/spice-html5/display.js | 823 ++++++++++++++++++++ ui/spice-html5/enums.js | 324 ++++++++ ui/spice-html5/inputs.js | 280 +++++++ ui/spice-html5/lz.js | 166 ++++ ui/spice-html5/main.js | 231 ++++++ ui/spice-html5/pages/Makefile.am | 20 + ui/spice-html5/pages/spice_auto.html | 200 +++++ ui/spice-html5/playback.js | 278 +++++++ ui/spice-html5/png.js | 256 +++++++ ui/spice-html5/quic.js | 1335 +++++++++++++++++++++++++++++++++ ui/spice-html5/resize.js | 70 ++ ui/spice-html5/simulatecursor.js | 202 +++++ ui/spice-html5/spicearraybuffer.js | 58 ++ ui/spice-html5/spiceconn.js | 460 ++++++++++++ ui/spice-html5/spicedataview.js | 120 +++ ui/spice-html5/spicemsg.js | 1047 ++++++++++++++++++++++++++ ui/spice-html5/spicetype.js | 473 ++++++++++++ ui/spice-html5/thirdparty/Makefile.am | 20 + ui/spice-html5/thirdparty/jsbn.js | 589 +++++++++++++++ ui/spice-html5/thirdparty/prng4.js | 79 ++ ui/spice-html5/thirdparty/rng.js | 102 +++ ui/spice-html5/thirdparty/rsa.js | 146 ++++ ui/spice-html5/thirdparty/sha1.js | 346 +++++++++ ui/spice-html5/ticket.js | 250 ++++++ ui/spice-html5/utils.js | 265 +++++++ ui/spice-html5/webm.js | 553 ++++++++++++++ ui/spice-html5/wire.js | 123 +++ 72 files changed, 9425 insertions(+), 7763 deletions(-) delete mode 100644 ui/css/spice/Makefile.am delete mode 100644 ui/css/spice/spice.css delete mode 100644 ui/js/spice/Makefile.am delete mode 100644 ui/js/spice/atKeynames.js delete mode 100644 ui/js/spice/bitmap.js delete mode 100644 ui/js/spice/cursor.js delete mode 100644 ui/js/spice/display.js delete mode 100644 ui/js/spice/enums.js delete mode 100644 ui/js/spice/inputs.js delete mode 100644 ui/js/spice/jsbn.js delete mode 100644 ui/js/spice/lz.js delete mode 100644 ui/js/spice/main.js delete mode 100644 ui/js/spice/png.js delete mode 100644 ui/js/spice/prng4.js delete mode 100644 ui/js/spice/quic.js delete mode 100644 ui/js/spice/rng.js delete mode 100644 ui/js/spice/rsa.js delete mode 100644 ui/js/spice/sha1.js delete mode 100644 ui/js/spice/spiceconn.js delete mode 100644 ui/js/spice/spicedataview.js delete mode 100644 ui/js/spice/spicemsg.js delete mode 100644 ui/js/spice/spicetype.js delete mode 100644 ui/js/spice/ticket.js delete mode 100644 ui/js/spice/utils.js delete mode 100644 ui/js/spice/wire.js delete mode 100644 ui/pages/spice.html.tmpl create mode 100644 ui/spice-html5/Makefile.am create mode 100644 ui/spice-html5/atKeynames.js create mode 100644 ui/spice-html5/bitmap.js create mode 100644 ui/spice-html5/css/Makefile.am create mode 100644 ui/spice-html5/css/spice.css create mode 100644 ui/spice-html5/cursor.js create mode 100644 ui/spice-html5/display.js create mode 100644 ui/spice-html5/enums.js create mode 100644 ui/spice-html5/inputs.js create mode 100644 ui/spice-html5/lz.js create mode 100644 ui/spice-html5/main.js create mode 100644 ui/spice-html5/pages/Makefile.am create mode 100644 ui/spice-html5/pages/spice_auto.html create mode 100644 ui/spice-html5/playback.js create mode 100644 ui/spice-html5/png.js create mode 100644 ui/spice-html5/quic.js create mode 100644 ui/spice-html5/resize.js create mode 100644 ui/spice-html5/simulatecursor.js create mode 100644 ui/spice-html5/spicearraybuffer.js create mode 100644 ui/spice-html5/spiceconn.js create mode 100644 ui/spice-html5/spicedataview.js create mode 100644 ui/spice-html5/spicemsg.js create mode 100644 ui/spice-html5/spicetype.js create mode 100644 ui/spice-html5/thirdparty/Makefile.am create mode 100644 ui/spice-html5/thirdparty/jsbn.js create mode 100644 ui/spice-html5/thirdparty/prng4.js create mode 100644 ui/spice-html5/thirdparty/rng.js create mode 100644 ui/spice-html5/thirdparty/rsa.js create mode 100644 ui/spice-html5/thirdparty/sha1.js create mode 100644 ui/spice-html5/ticket.js create mode 100644 ui/spice-html5/utils.js create mode 100644 ui/spice-html5/webm.js create mode 100644 ui/spice-html5/wire.js -- 1.9.3

2 8

[PATCH v2] Disabling screen log in production environment
by Daniel Henrique Barboza 20 Oct '14

20 Oct '14

When building kimchi's RPM, some messages are getting logged in /var/log/messages because cherrypy is logging in the standard output. This happens because a function in FeatureTests is enabling log.screen regardless of the current environment. This patch makes a verification that prevents the screen log to be enabled in the production environment. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 31 ++++++++++++++++--------------- src/kimchi/server.py | 6 +++++- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index c6f4687..f1eb8ae 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -80,30 +80,31 @@ SCSI_FC_XML = """ class FeatureTests(object): @staticmethod - def disable_screen_error_logging(): + def disable_libvirt_error_logging(): def libvirt_errorhandler(userdata, error): # A libvirt error handler to ignore annoying messages in stderr pass + # Filter functions are enable only in production env + if cherrypy.config.get('environment') != 'production': + return # Register the error handler to hide libvirt error in stderr libvirt.registerErrorHandler(f=libvirt_errorhandler, ctx=None) - # Disable cherrypy screen logging, in order to log errors on kimchi - # file without displaying them on screen - cherrypy.log.screen = False @staticmethod - def enable_screen_error_logging(): + def enable_libvirt_error_logging(): + # Filter functions are enable only in production env + if cherrypy.config.get('environment') != 'production': + return # Unregister the error handler libvirt.registerErrorHandler(f=None, ctx=None) - # Enable cherrypy screen logging - cherrypy.log.screen = True @staticmethod def libvirt_supports_iso_stream(protocol): xml = ISO_STREAM_XML % {'protocol': protocol} conn = None try: - FeatureTests.disable_screen_error_logging() + FeatureTests.disable_libvirt_error_logging() conn = libvirt.open(None) dom = conn.defineXML(xml) dom.undefine() @@ -112,7 +113,7 @@ class FeatureTests(object): kimchi_log.error(e.message) return False finally: - FeatureTests.enable_screen_error_logging() + FeatureTests.enable_libvirt_error_logging() conn is None or conn.close() @staticmethod @@ -123,7 +124,7 @@ class FeatureTests(object): return xml try: conn = libvirt.open(None) - FeatureTests.disable_screen_error_logging() + FeatureTests.disable_libvirt_error_logging() conn.findStoragePoolSources('netfs', _get_xml(), 0) except libvirt.libvirtError as e: kimchi_log.error(e.message) @@ -132,7 +133,7 @@ class FeatureTests(object): # it returns 38--general system call failure return False finally: - FeatureTests.enable_screen_error_logging() + FeatureTests.enable_libvirt_error_logging() conn is None or conn.close() return True @@ -173,7 +174,7 @@ class FeatureTests(object): @staticmethod def libvirt_support_fc_host(): try: - FeatureTests.disable_screen_error_logging() + FeatureTests.disable_libvirt_error_logging() conn = libvirt.open(None) pool = None pool = conn.storagePoolDefineXML(SCSI_FC_XML, 0) @@ -182,7 +183,7 @@ class FeatureTests(object): # Libvirt requires adapter name, not needed when supports to FC return False finally: - FeatureTests.enable_screen_error_logging() + FeatureTests.enable_libvirt_error_logging() pool is None or pool.undefine() conn is None or conn.close() return True @@ -192,8 +193,8 @@ class FeatureTests(object): KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi/" KIMCHI_NAMESPACE = "kimchi" with RollbackContext() as rollback: - FeatureTests.disable_screen_error_logging() - rollback.prependDefer(FeatureTests.enable_screen_error_logging) + FeatureTests.disable_libvirt_error_logging() + rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) conn = libvirt.open(None) rollback.prependDefer(conn.close) dom = conn.defineXML(SIMPLE_VM_XML) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 8d166e5..6cc7143 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -91,13 +91,17 @@ class Server(object): max_body_size_in_bytes = eval(options.max_body_size) * 1024 cherrypy.server.max_request_body_size = max_body_size_in_bytes - cherrypy.log.screen = True cherrypy.log.access_file = options.access_log cherrypy.log.error_file = options.error_log logLevel = LOGGING_LEVEL.get(options.log_level, logging.DEBUG) dev_env = options.environment != 'production' + # Enable cherrypy screen logging if running environment + # is not 'production' + if dev_env: + cherrypy.log.screen = True + # Create handler to rotate access log file h = logging.handlers.RotatingFileHandler(options.access_log, 'a', 10000000, 1000) -- 1.8.3.1

2 2

[PATCH v5] Backend support for templates with sockets, cores, and threads
by Christy Perez 20 Oct '14

20 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU v4->v5: - Fix format issues - Remove if check for cpu_info in control, and set cpu_info to the empty string in model if None - Add format requirements error for topology requirements. - Add new error to toplogy in API.json - Update po files v3->v4: - Remove the unused cpu_ elements from common_spec - Pass new_t into validate function to reduce complexity - Rearrange code to decrese indents in _get_cpu_xml v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 13 ++++++++++- po/de_DE.po | 49 +++++++++++++++++++++++++++++++++++++- po/en_US.po | 49 +++++++++++++++++++++++++++++++++++++- po/es_ES.po | 49 +++++++++++++++++++++++++++++++++++++- po/fr_FR.po | 49 +++++++++++++++++++++++++++++++++++++- po/it_IT.po | 49 +++++++++++++++++++++++++++++++++++++- po/ja_JP.po | 49 +++++++++++++++++++++++++++++++++++++- po/kimchi.pot | 49 +++++++++++++++++++++++++++++++++++++- po/ko_KR.po | 49 +++++++++++++++++++++++++++++++++++++- po/pt_BR.po | 48 ++++++++++++++++++++++++++++++++++++- po/ru_RU.po | 49 +++++++++++++++++++++++++++++++++++++- po/zh_CN.po | 52 +++++++++++++++++++++++++++++++++++++---- po/zh_TW.po | 49 +++++++++++++++++++++++++++++++++++++- src/kimchi/API.json | 36 ++++++++++++++++++++++++++-- src/kimchi/control/templates.py | 31 +++++++++++++----------- src/kimchi/i18n.py | 2 ++ src/kimchi/model/templates.py | 33 ++++++++++++++++++++++++++ src/kimchi/osinfo.py | 5 ++-- src/kimchi/vmtemplate.py | 16 +++++++++++++ 19 files changed, 690 insertions(+), 36 deletions(-) diff --git a/docs/API.md b/docs/API.md index 92fbbd5..6984649 100644 --- a/docs/API.md +++ b/docs/API.md @@ -194,7 +194,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * name: The name of the Template. Used to identify the Template in this API * os_distro *(optional)*: The operating system distribution * os_version *(optional)*: The version of the operating system distribution - * cpus *(optional)*: The number of CPUs assigned to the VM. Default is 1. + * cpus *(optional)*: The number of CPUs assigned to the VM. + Default is 1, unlees specifying a cpu topology. In that case, cpus + will default to a product of the topology values (see cpu_info). * memory *(optional)*: The amount of memory assigned to the VM. Default is 1024M. * cdrom *(optional)*: A volume name or URI to an ISO image. @@ -216,6 +218,15 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. + If specifying both cpus and CPU topology, make sure cpus is + equal to the product of sockets, cores, and threads. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/po/de_DE.po b/po/de_DE.po index 98bde90..9d4cf00 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -70,6 +70,15 @@ msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen" msgid "Specify %(item)s to login into Kimchi" msgstr "Geben Sie %(item)s an, um sich bei Kimchi anzumelden" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "Fehler beim Abrufen von Blockeinheiten. Details: %(err)s" @@ -284,6 +293,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "" "Schnittstelle %(iface)s ist in virtueller Maschine %(name)s nicht vorhanden" @@ -416,6 +445,16 @@ msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Speicherpool %(name)s ist bereits vorhanden" @@ -850,6 +889,9 @@ msgstr "" msgid "Node device '%(name)s' not found" msgstr "Knoteneinheit '%(name)s' nicht gefunden" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "Keine Pakete für Aktualisierung markiert" @@ -1055,6 +1097,11 @@ msgstr "Repository konnte nicht hinzugefügt werden. Details: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Repository konnte nicht entfernt werden. Details: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "FEHLERCODE" diff --git a/po/en_US.po b/po/en_US.po index eb571ca..14ed24b 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -68,6 +68,15 @@ msgstr "" msgid "Specify %(item)s to login into Kimchi" msgstr "" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "" @@ -259,6 +268,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "" @@ -371,6 +400,16 @@ msgstr "" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" @@ -744,6 +783,9 @@ msgstr "" msgid "Node device '%(name)s' not found" msgstr "" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "" @@ -931,6 +973,11 @@ msgstr "" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 5a3fa46..1709b10 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -69,6 +69,15 @@ msgstr "No tiene autorización para acceder a Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Especifique %(item)s para iniciar la sesión en Kimchi" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "" @@ -284,6 +293,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "La interfaz %(iface)s no existe en la máquina virtual %(name)s" @@ -413,6 +442,16 @@ msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "La agrupación de almacenamiento %(name)s ya existe" @@ -863,6 +902,9 @@ msgstr "" msgid "Node device '%(name)s' not found" msgstr "No se ha encontrado el dispositivo de nodo '%(name)s'" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "No hay paquetes marcados para su actualización" @@ -1073,6 +1115,11 @@ msgstr "No se puede añadir el repositorio. Detalles: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "No se puede eliminar el repositorio. Detalles: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERROR" diff --git a/po/fr_FR.po b/po/fr_FR.po index 414dd4a..b1b4702 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2014-08-27 21:30+0000\n" "Last-Translator: BobSynfig\n" "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/" @@ -74,6 +74,15 @@ msgstr "Vous n'êtes pas autorisé à accéder à Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Spécifiez %(item)s pour vous logguer dans Kimchi" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "Erreur durant l'accès aux périphériques de bloc. Détails: %(err)s" @@ -290,6 +299,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "L'interface %(iface)s n'existe pas dans la machine virtuelle %(name)s" @@ -421,6 +450,16 @@ msgstr "L'image de base de modèle doit petre un fichier image local valide" msgid "Cannot identify base image %(path)s format" msgstr "Ne peut identifier le format de l'image de base %(path)s" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Le pool de stockage %(name)s existe déjà" @@ -855,6 +894,9 @@ msgstr "" msgid "Node device '%(name)s' not found" msgstr "Périphérique de noeud '%(name)s' non trouvé" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "Aucun paquet marqué pour mise à jour" @@ -1061,6 +1103,11 @@ msgstr "Impossible d'ajouter un dépôt. Détails: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Impossible de supprimer un dépôt. Détails: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "ERROR CODE" diff --git a/po/it_IT.po b/po/it_IT.po index 4a6c919..91e17d4 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -69,6 +69,15 @@ msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Specificare %(item)s per accedere a Kimchi" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "" @@ -278,6 +287,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "L'interfaccia %(iface)s non esiste nella macchina virtuale %(name)s" @@ -406,6 +435,16 @@ msgstr "Il CDROM del modello deve essere un file ISO locale o remoto" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Pool di memoria %(name)s già esistente" @@ -834,6 +873,9 @@ msgstr "" msgid "Node device '%(name)s' not found" msgstr "Dispositivo nodo '%(name)s' non trovato" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "Nessun pacchetto contrassegnato per l'aggiornamento" @@ -1042,6 +1084,11 @@ msgstr "Impossibile aggiungere il repository. Dettagli: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Impossibile rimuovere il repository. Dettagli: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "CODICE DI ERRORE" diff --git a/po/ja_JP.po b/po/ja_JP.po index af00487..23c1ce7 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -68,6 +68,15 @@ msgstr "Kimchi へのアクセスを許可されていません" msgid "Specify %(item)s to login into Kimchi" msgstr "Kimchi にログインするには、%(item)s を指定します" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "" @@ -275,6 +284,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "インターフェース %(iface)s は仮想マシン %(name)s には存在しません" @@ -413,6 +442,16 @@ msgstr "" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "ストレージ・プール %(name)s は既に存在します" @@ -847,6 +886,9 @@ msgstr "稼働中の仮想マシンがあるため、ホスト・マシンをリ msgid "Node device '%(name)s' not found" msgstr "ノード・デバイス「%(name)s」が見つかりません" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "更新の対象としてマークされているパッケージはありません" @@ -1054,6 +1096,11 @@ msgstr "リポジトリーを追加できません。詳細: 「%(err)s」" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "リポジトリーを削除できません。詳細: 「%(err)s」" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "エラー・コード" diff --git a/po/kimchi.pot b/po/kimchi.pot index 685802e..9fe3491 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -68,6 +68,15 @@ msgstr "" msgid "Specify %(item)s to login into Kimchi" msgstr "" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "" @@ -259,6 +268,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "" @@ -371,6 +400,16 @@ msgstr "" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" @@ -744,6 +783,9 @@ msgstr "" msgid "Node device '%(name)s' not found" msgstr "" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "" @@ -931,6 +973,11 @@ msgstr "" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index a9f82e4..f36d782 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -67,6 +67,15 @@ msgstr "Kimchi에 액세스할 권한이 없습니다." msgid "Specify %(item)s to login into Kimchi" msgstr "Kimchi에 로그인하려면 %(item)s을(를) 지정하십시오." +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "블록 장치를 가져오는 중에 오류가 발생했습니다. 세부사항: %(err)s" @@ -268,6 +277,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "가상 머신 %(name)s에 %(iface)s 인터페이스가 없습니다." @@ -387,6 +416,16 @@ msgstr "템플리트 CDROM은 로컬 또는 원격 ISO 파일이어야 합니다 msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "스토리지 풀 %(name)s이(가) 이미 존재합니다." @@ -796,6 +835,9 @@ msgstr "가상 머신을 실행 중인 호스트 머신을 다시 부팅할 수 msgid "Node device '%(name)s' not found" msgstr "노드 장치 '%(name)s'이(가) 없습니다." +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "업데이트 표시된 패키지가 없습니다." @@ -985,6 +1027,11 @@ msgstr "저장소를 추가할 수 없습니다. 세부사항: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "저장소를 제거할 수 없습니다. 세부사항: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "오류 코드" diff --git a/po/pt_BR.po b/po/pt_BR.po index f2fba64..ff1a7a8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2014-09-16 18:45+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -87,6 +87,15 @@ msgstr "Você não está autorizado para acessar o Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Especifique %(item)s para autenticar no Kimchi" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "Erro ao consultar block devices. Detalhes %(err)s" @@ -303,6 +312,25 @@ msgid "The life time for the guest console password must be a number." msgstr "O tempo de vida da senha do console do guest deve ser um número." #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "Interface %(iface)s não existe na máquina virtual %(name)s" @@ -424,6 +452,16 @@ msgstr "Imagem base do modelo deve ser um arquivo de imagem local válido" msgid "Cannot identify base image %(path)s format" msgstr "Não foi possível identificar o formato da imagem base %(path)s" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s já existe" @@ -853,6 +891,9 @@ msgstr "" msgid "Node device '%(name)s' not found" msgstr "Dispositivo de nó '%(name)s' não encontrado" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "Nenhum pacote marcado para atualização" @@ -1064,6 +1105,11 @@ msgstr "Não foi possível adicionar o repositório. Detalhes: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Não foi possível remover o repositório. Detalhes: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERRO" diff --git a/po/ru_RU.po b/po/ru_RU.po index 059b999..e55d170 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2014-08-28 17:32+0000\n" "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/" @@ -68,6 +68,15 @@ msgstr "Нет прав доступа к Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "Укажите %(item)s для входа в Kimchi" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "Ошибка получения блочных устройств. Сведения: %(err)s" @@ -271,6 +280,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "Интерфейс %(iface)s не существует в виртуальной машине %(name)s" @@ -385,6 +414,16 @@ msgstr "CDROM шаблона должен быть локальным или у msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Пул памяти %(name)s уже существует" @@ -791,6 +830,9 @@ msgstr "Не удалось перезагрузить систему хоста msgid "Node device '%(name)s' not found" msgstr "Устройство %(name)s узла не найдено" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "Нет пакетов, помеченных для обновления" @@ -985,6 +1027,11 @@ msgstr "Не удалось добавить хранилище. Сведени msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Не удалось удалить хранилище. Сведения: %(err)s" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "Код ошибки" diff --git a/po/zh_CN.po b/po/zh_CN.po index f77e405..a6f511f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -84,6 +84,15 @@ msgstr "您没有被授权访问Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "指定登录Kimchi的%(item)s" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "获取块设备时出错。详情：%(err)s" @@ -280,6 +289,25 @@ msgid "The life time for the guest console password must be a number." msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "虚拟机 %(name)s 中没有接口 %(iface)s" @@ -392,6 +420,16 @@ msgstr "模板基础镜像必须为一个有效的本地镜像文件" msgid "Cannot identify base image %(path)s format" msgstr "未能识别基础镜像%(path)s格式" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "存储池%(name)s已经存在" @@ -767,6 +805,9 @@ msgstr "有虚拟机在运行，不能重起主机" msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -954,6 +995,11 @@ msgstr "不能增加软件仓库。详情：'%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "不能移除软件仓库。详情：'%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "软件仓库不支持配置类型: %(items)s" + msgid "ERROR CODE" msgstr "错误码" @@ -1866,7 +1912,3 @@ msgstr "没有发现模板" msgid "Clone" msgstr "制作副本" - -#~ msgid "" -#~ "Configuration items: '%(items)s' are not supported by repository manager" -#~ msgstr "软件仓库不支持配置类型: %(items)s" diff --git a/po/zh_TW.po b/po/zh_TW.po index 4040b2a..792d004 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-25 13:47-0300\n" +"POT-Creation-Date: 2014-10-14 10:45-0500\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -67,6 +67,15 @@ msgstr "您未獲授權來存取 Kimchi" msgid "Specify %(item)s to login into Kimchi" msgstr "指定 %(item)s 以登入 Kimchi" +msgid "Unknown \"_cap\" specified" +msgstr "" + +msgid "\"_passthrough\" should be \"true\" or \"false\"" +msgstr "" + +msgid "\"_passthrough_affected_by\" should be a device name string" +msgstr "" + #, python-format msgid "Error while getting block devices. Details: %(err)s" msgstr "取得區塊裝置時發生錯誤。詳細資料：%(err)s" @@ -262,6 +271,26 @@ msgid "The life time for the guest console password must be a number." msgstr "" #, python-format +msgid "" +"VM %(vmid)s does not contain directly assigned host device %(dev_name)s." +msgstr "" + +#, python-format +msgid "The host device %(dev_name)s is not allowed to directly assign to VM." +msgstr "" + +msgid "" +"No IOMMU groups found. Host PCI pass through needs IOMMU group to function " +"correctly. Please enable Intel VT-d or AMD IOMMU in your BIOS, then verify " +"the Kernel is compiled with IOMMU support. For Intel CPU, add intel_iommu=on " +"to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " +"iommu=1." +msgstr "" + +msgid "\"name\" should be a device name string" +msgstr "" + +#, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" msgstr "介面 %(iface)s 不存在於虛擬機器 %(name)s 中" @@ -374,6 +403,16 @@ msgstr "範本 CDROM 必須是本端或遠端 ISO 檔案" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "" +"When specifying CPU topology, VCPUs must be a product of sockets, cores, and " +"threads." +msgstr "" + +msgid "" +"When specifying CPU topology, each element must be an integer greater than " +"zero." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "儲存區 %(name)s 已存在" @@ -747,6 +786,9 @@ msgstr "無法將主機重新開機，因為有一些虛擬機器正在執行中 msgid "Node device '%(name)s' not found" msgstr "找不到節點裝置 '%(name)s'" +msgid "Conflicting flag filters specified." +msgstr "" + msgid "No packages marked for update" msgstr "沒有套件標示為要進行更新" @@ -934,6 +976,11 @@ msgstr "無法新增儲存庫。詳細資料：'%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "無法移除儲存庫。詳細資料：'%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "錯誤碼" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index d9e13f0..a1156d5 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,36 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "integer", + "required": true, + "minimum": 1, + "error": "KCHTMPL0026E" + }, + "cores": { + "type": "integer", + "required": true, + "minimum": 1, + "error": "KCHTMPL0026E" + }, + "threads": { + "type": "integer", + "required": true, + "minimum": 1, + "error": "KCHTMPL0026E" + } + } + } + } } }, "properties": { @@ -448,7 +478,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -612,7 +643,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..70c9457 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,22 +38,25 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, - 'icon': self.info['icon'], - 'invalid': self.info['invalid'], - 'os_distro': self.info['os_distro'], - 'os_version': self.info['os_version'], - 'cpus': self.info['cpus'], - 'memory': self.info['memory'], - 'cdrom': self.info.get('cdrom', None), - 'disks': self.info['disks'], - 'storagepool': self.info['storagepool'], - 'networks': self.info['networks'], - 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + return { + 'name': self.ident, + 'icon': self.info['icon'], + 'invalid': self.info['invalid'], + 'os_distro': self.info['os_distro'], + 'os_version': self.info['os_version'], + 'cpus': self.info['cpus'], + 'memory': self.info['memory'], + 'cdrom': self.info.get('cdrom', None), + 'disks': self.info['disks'], + 'storagepool': self.info['storagepool'], + 'networks': self.info['networks'], + 'folder': self.info.get('folder', []), + 'graphics': self.info['graphics'], + 'cpu_info': self.info.get('cpu_info') + } diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 75fb076..74ea98e 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -143,6 +143,8 @@ "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), + "KCHTMPL0025E": _("When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads."), + "KCHTMPL0026E": _("When specifying CPU topology, each element must be an integer greater than zero."), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 9278cdc..c75fc7b 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -48,6 +48,23 @@ def create(self, params): {'filename': iso, 'user': user, 'err': excp}) + cpu_info = params.get('cpu_info') + if cpu_info: + topology = cpu_info.get('topology') + # Check, even though currently only topology + # is supported. + if topology: + sockets = topology['sockets'] + cores = topology['cores'] + threads = topology['threads'] + vcpus = params.get('cpus') + if vcpus is None: + params['cpus'] = sockets * cores * threads + elif vcpus != sockets * cores * threads: + raise InvalidParameter("KCHTMPL0025E") + else: + params['cpu_info'] = '' + conn = self.conn.get() pool_uri = params.get(u'storagepool', '') if pool_uri: @@ -156,6 +173,10 @@ def update(self, name, params): old_t = self.lookup(name) new_t = copy.copy(old_t) new_t.update(params) + + if not self._validate_updated_cpu_params(new_t): + raise InvalidParameter('KCHTMPL0025E') + ident = name conn = self.conn.get() @@ -187,6 +208,18 @@ def update(self, name, params): raise return ident + def _validate_updated_cpu_params(self, info): + # Note: cpu_info is the parent of topology. cpus is vcpus + vcpus = info['cpus'] + cpu_info = info.get('cpu_info') + if cpu_info is None: + return True + topology = cpu_info.get('topology') + if topology is None: + return True + return vcpus == topology['sockets'] * topology['cores'] * \ + topology['threads'] + class LibvirtVMTemplate(VMTemplate): def __init__(self, args, scan=False, conn=None): diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 6ee5e48..0e16b50 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,9 +32,8 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, - 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', - 'cdrom_index': 2, 'mouse_bus': 'ps2'} +common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], + 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} modern_spec = dict(common_spec, disk_bus='virtio', nic_model='virtio') diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5f22db9..18d802b 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -358,6 +358,20 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is None: + return "" + cpu_topo = cpu_info.get('topology') + if cpu_topo is None: + return "" + return etree.tostring(E.cpu(E.topology( + sockets=str(cpu_topo['sockets']), + cores=str(cpu_topo['cores']), + threads=str(cpu_topo['threads'])))) + + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -369,6 +383,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params['qemu-stream-cmdline'] = '' graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + params['cpu_info'] = self._get_cpu_xml() # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) @@ -400,6 +415,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

2 4

[PATCH v4] Backend support for templates with sockets, cores, and threads
by Christy Perez 20 Oct '14

20 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU v3->v4: - Remove the unused cpu_ elements from common_spec - Pass new_t into validate function to reduce complexity - Rearrange code to decrese indents in _get_cpu_xml v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 13 ++++++++++++- po/en_US.po | 3 +++ po/pt_BR.po | 3 +++ po/zh_CN.po | 3 +++ src/kimchi/API.json | 33 +++++++++++++++++++++++++++++++-- src/kimchi/control/templates.py | 13 ++++++++++--- src/kimchi/i18n.py | 1 + src/kimchi/model/templates.py | 32 ++++++++++++++++++++++++++++++++ src/kimchi/osinfo.py | 5 ++--- src/kimchi/vmtemplate.py | 16 ++++++++++++++++ 10 files changed, 113 insertions(+), 9 deletions(-) diff --git a/docs/API.md b/docs/API.md index 92fbbd5..6984649 100644 --- a/docs/API.md +++ b/docs/API.md @@ -194,7 +194,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * name: The name of the Template. Used to identify the Template in this API * os_distro *(optional)*: The operating system distribution * os_version *(optional)*: The version of the operating system distribution - * cpus *(optional)*: The number of CPUs assigned to the VM. Default is 1. + * cpus *(optional)*: The number of CPUs assigned to the VM. + Default is 1, unlees specifying a cpu topology. In that case, cpus + will default to a product of the topology values (see cpu_info). * memory *(optional)*: The amount of memory assigned to the VM. Default is 1024M. * cdrom *(optional)*: A volume name or URI to an ISO image. @@ -216,6 +218,15 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. + If specifying both cpus and CPU topology, make sure cpus is + equal to the product of sockets, cores, and threads. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/po/en_US.po b/po/en_US.po index eb571ca..a88675c 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -371,6 +371,9 @@ msgstr "" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index f2fba64..1bebe30 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -424,6 +424,9 @@ msgstr "Imagem base do modelo deve ser um arquivo de imagem local válido" msgid "Cannot identify base image %(path)s format" msgstr "Não foi possível identificar o formato da imagem base %(path)s" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s já existe" diff --git a/po/zh_CN.po b/po/zh_CN.po index f77e405..f944b8d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -392,6 +392,9 @@ msgstr "模板基础镜像必须为一个有效的本地镜像文件" msgid "Cannot identify base image %(path)s format" msgstr "未能识别基础镜像%(path)s格式" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "存储池%(name)s已经存在" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index d9e13f0..d3edf27 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,33 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "integer", + "required": true, + "minimum": 1 + }, + "cores": { + "type": "integer", + "required": true, + "minimum": 1 + }, + "threads": { + "type": "integer", + "required": true, + "minimum": 1 + } + } + } + } } }, "properties": { @@ -448,7 +475,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -612,7 +640,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..54caa92 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,13 +38,14 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, + return_data = { + 'name': self.ident, 'icon': self.info['icon'], 'invalid': self.info['invalid'], 'os_distro': self.info['os_distro'], @@ -56,4 +57,10 @@ def data(self): 'storagepool': self.info['storagepool'], 'networks': self.info['networks'], 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + 'graphics': self.info['graphics'] + } + if (self.info.get('cpu_info')): + return_data['cpu_info'] = self.info['cpu_info'] + else: + return_data['cpu_info'] = '' + return return_data diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 75fb076..611316c 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -143,6 +143,7 @@ "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), + "KCHTMPL0025E": _("When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads."), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 9278cdc..2954148 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -48,6 +48,22 @@ def create(self, params): {'filename': iso, 'user': user, 'err': excp}) + cpu_info = params.get('cpu_info') + if cpu_info: + cpu_info = dict(params['cpu_info']) + topology = cpu_info.get('topology') + # Check, even though currently only topology + # is supported. + if topology: + sockets = topology['sockets'] + cores = topology['cores'] + threads = topology['threads'] + vcpus = params.get('cpus') + if vcpus is None: + params['cpus'] = sockets * cores * threads + elif vcpus != sockets * cores * threads: + raise InvalidParameter("KCHTMPL0025E") + conn = self.conn.get() pool_uri = params.get(u'storagepool', '') if pool_uri: @@ -156,6 +172,10 @@ def update(self, name, params): old_t = self.lookup(name) new_t = copy.copy(old_t) new_t.update(params) + + if not self._validate_updated_cpu_params(new_t): + raise InvalidParameter('KCHTMPL0025E') + ident = name conn = self.conn.get() @@ -187,6 +207,18 @@ def update(self, name, params): raise return ident + def _validate_updated_cpu_params(self, info): + # Note: cpu_info is the parent of topology. cpus is vcpus + vcpus = info['cpus'] + cpu_info = info.get('cpu_info') + if cpu_info is None: + return True + topology = cpu_info.get('topology') + if topology is None: + return True + return vcpus == topology['sockets'] * topology['cores'] * \ + topology['threads'] + class LibvirtVMTemplate(VMTemplate): def __init__(self, args, scan=False, conn=None): diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 6ee5e48..0e16b50 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,9 +32,8 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, - 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', - 'cdrom_index': 2, 'mouse_bus': 'ps2'} +common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], + 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} modern_spec = dict(common_spec, disk_bus='virtio', nic_model='virtio') diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5f22db9..cfb7704 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -358,6 +358,20 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is None: + return "" + cpu_topo = cpu_info.get('topology') + if cpu_topo is None: + return "" + return etree.tostring(E.cpu(E.topology( + sockets=str(cpu_topo['sockets']), + cores=str(cpu_topo['cores']), + threads=str(cpu_topo['threads'])))) + + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -369,6 +383,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params['qemu-stream-cmdline'] = '' graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + params['cpu_info'] = self._get_cpu_xml() # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) @@ -400,6 +415,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

3 5

[PATCH 0/2 V5] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 15 Oct '14

15 Oct '14

This patch set changes the way Kimchi loads Help pages of the tabs of the plugins. It also changes the Sample plugin, in order to demonstrate and show properly how to configure the a Help page V5: - removed do_substituion. Use kimchi.config.PluginPaths - make changes proposed by Aline in kimchi.main.js Rodrigo Trujillo (2): Fix problems to open plugin's help pages Changes in sample plugin to fix and improve help plugins/sample/sample.conf.in | 5 ++ plugins/sample/ui/config/tab-ext.xml | 11 ++++- plugins/sample/ui/pages/Makefile.am | 2 +- .../sample/ui/pages/help/en_US/sample-tab1.html | 1 + .../sample/ui/pages/help/en_US/sample-tab2.html | 1 + plugins/sample/ui/pages/sample-tab1.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/sample-tab2.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/tab.html.tmpl | 30 ------------ ui/js/src/kimchi.main.js | 53 ++++++++++++++++------ 9 files changed, 116 insertions(+), 47 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab1.html create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab2.html create mode 100644 plugins/sample/ui/pages/sample-tab1.html.tmpl create mode 100644 plugins/sample/ui/pages/sample-tab2.html.tmpl delete mode 100644 plugins/sample/ui/pages/tab.html.tmpl -- 1.9.3

3 4

[PATCH] Disabling screen log in production environment
by Daniel Henrique Barboza 15 Oct '14

15 Oct '14

When building kimchi's RPM, some messages are getting logged in /var/log/messages because cherrypy is logging in the standard output. This happens because a function in FeatureTests is enabling log.screen regardless of the current environment. This patch makes a verification that prevents the screen log to be enabled in the production environment. The line 'cherrypy.log.screen = True' was removed in server.py because it has no effect. It is ignored in the default (=production) environment and it is redundant in dev environment because the screen log is activated by default. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 6 ++++-- src/kimchi/server.py | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index c6f4687..1310745 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -95,8 +95,10 @@ class FeatureTests(object): def enable_screen_error_logging(): # Unregister the error handler libvirt.registerErrorHandler(f=None, ctx=None) - # Enable cherrypy screen logging - cherrypy.log.screen = True + # Enable cherrypy screen logging if running environment + # is not 'production' + if cherrypy.config.get('environment') != 'production': + cherrypy.log.screen = True @staticmethod def libvirt_supports_iso_stream(protocol): diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 8d166e5..46f128c 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -91,7 +91,6 @@ class Server(object): max_body_size_in_bytes = eval(options.max_body_size) * 1024 cherrypy.server.max_request_body_size = max_body_size_in_bytes - cherrypy.log.screen = True cherrypy.log.access_file = options.access_log cherrypy.log.error_file = options.error_log -- 1.8.3.1

2 1

[RFC] Mock of new "Edit Template" dialogue
by Wen Wang 15 Oct '14

15 Oct '14

FYI, This is the new design of the "Edit Template" dialogue. Any comment is welcomed. Best Regards Wang Wen

4 9

[PATCH V13] Host device passthrough (Front-end): Add PCI Devices to VM
by Wen Wang 14 Oct '14

14 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 90 ++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 55 +++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 81 +++++++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 30 ++++++++++++ 4 files changed, 254 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 76fbaf2..b1d3931 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -17,8 +17,8 @@ */ #guest-edit-window { font-size: 13px; - height: 400px; - width: 610px; + height: 420px; + width: 820px; } #guest-edit-tabs { @@ -261,3 +261,89 @@ width: 46%; float: right; } + +.guest-edit-pci { + height: 79%; + overflow: auto; + font-size: 12px; +} + +.guest-edit-pci .guest-scroll-indent { + width: 783px; +} + +.guest-edit-pci .filter { + height: 35px; + margin-right: 5px; + overflow: hidden; +} + +.guest-edit-pci .group { + float: right; +} + +.guest-edit-pci .filter .control { + border: 1px solid #AAAAAA; + font-size: 12px; + background-color: white; +} + +.guest-edit-pci .filter select { + border-right: 0px!important; + border-radius: 7px 0px 0px 7px; + padding: 2px 2px 2px 7px; + width: 100px; +} + +.guest-edit-pci .filter select option { + padding-left: 7px; +} + +.guest-edit-pci .filter input { + border-radius: 0px 7px 7px 0px; + padding: 3px 3px 3px 10px; + width: 200px; + font-style: italic; +} + +.guest-edit-pci .header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; +} + +.guest-edit-pci .item { + margin-bottom: 4px; + overflow: hidden; +} + +.guest-edit-pci .cell { + display: inline-block; + vertical-align: middle; + margin-right: 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.guest-edit-pci .item button { + width: 20px; + height: 20px; + float: right; +} + +.guest-edit-pci .name { + width: 18%; + max-width: 18%; +} + +.guest-edit-pci .product { + width: 45%; + max-width: 45%; +} + +.guest-edit-pci .vendor { + width: 25%; + max-width: 25%; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index f0506fa..5895a07 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1115,6 +1115,20 @@ var kimchi = { }); }, + getHostPCIDevices : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/devices?_passthrough=true&_cap=pci', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + getISCSITargets : function(server, port, suc, err) { server = encodeURIComponent(server); port = port ? '&_server_port='+encodeURIComponent(port) : ''; @@ -1145,6 +1159,47 @@ var kimchi = { }); }, + getVMPCIDevices : function(id, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(id)+'/hostdevs', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + addVMPCIDevice : function(vm, device, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+ encodeURIComponent(vm) +'/hostdevs', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + data : JSON.stringify(device), + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + removeVMPCIDevice : function(vm, device, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+ encodeURIComponent(vm) +'/hostdevs/' + encodeURIComponent(device), + type : 'DELETE', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + /** * Add a volume to a given storage pool. */ diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c281289..030e112 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -359,6 +359,86 @@ kimchi.guest_edit_main = function() { }); }; + var setupPCIDevice = function(){ + kimchi.getHostPCIDevices(function(hostPCIs){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){ + kimchi.getCapabilities(function(result) { + var pciEnabled = result.kernel_vfio; + for(var i=0; i<hostPCIs.length; i++){ + var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ + name: hostPCIs[i].name, + product: hostPCIs[i].product.description, + vendor: hostPCIs[i].vendor.description + })); + $(".body", "#form-guest-edit-pci").append(itemNode); + var iconClass = "ui-icon-plus"; + for(var j=0; j<vmPCIs.length; j++){ + if(hostPCIs[i].name==vmPCIs[j].name){ + iconClass = "ui-icon-minus"; + break; + } + } + pciEnabled || $("button", itemNode).remove(); + $("button", itemNode).button({ + icons: { primary: iconClass }, + text: false + }).click(function(){ + var obj = $(this); + if(obj.button("option", "icons").primary == "ui-icon-minus"){ + kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<hostPCIs.length; k++) { + $("button", "#" + hostPCIs[k].name).button("option", "icons", {primary: "ui-icon-plus"}); + } + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } + }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + }else{ + kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } + }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } + }); + } + }); + }); + }); + var filterNodes = function(group, text){ + text = text.toLowerCase(); + $(".body", "#form-guest-edit-pci").children().each(function(){ + var textFilter = $(".name", this).text().toLowerCase().indexOf(text)!=-1; + textFilter = textFilter || $(".product", this).text().toLowerCase().indexOf(text)!=-1; + textFilter = textFilter || $(".vendor", this).text().toLowerCase().indexOf(text)!=-1; + var display = "none"; + var itemGroup = $("button", this).button("option", "icons").primary; + if(textFilter){ + if(group == "all"){ + display = ""; + }else if(group=="toAdd" && itemGroup=="ui-icon-plus"){ + display = "" + }else if(group == "added" && itemGroup=="ui-icon-minus"){ + display = "" + } + } + $(this).css("display", display); + }); + }; + $("select", "#form-guest-edit-pci").change(function(){ + filterNodes($(this).val(), $("input", "#form-guest-edit-pci").val()); + }); + $("input", "#form-guest-edit-pci").on("keyup", function() { + filterNodes($("select", "#form-guest-edit-pci").val(), $(this).val()); + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -395,6 +475,7 @@ kimchi.guest_edit_main = function() { initStorageListeners(); setupInterface(); setupPermission(); + setupPCIDevice(); kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached); kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 917b2e8..512909a 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -41,6 +41,9 @@ <li> <a href="#form-guest-edit-permission">$_("Permission")</a> </li> + <li> + <a href="#form-guest-edit-pci">$_("Host PCI Device")</a> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -138,6 +141,25 @@ </div> </div> </form> + <form id="form-guest-edit-pci" class="guest-edit-pci"> + <div class="guest-scroll-indent"> + <div class="filter"> + <span class="group"> + <select class="control"> + <option value="all">$_("All")</option> + <option value="toAdd">$_("To Add")</option> + <option value="added">$_("Added")</option> + </select><input type="text" class="control" placeholder="$_("filter")"> + </span> + </div> + <div class="header"> + <span class="cell name">$_("Name")</span> + <span class="cell product">$_("Product")</span> + <span class="cell vendor">$_("Vendor")</span> + </div> + <div class="body"></div> + </div> + </form> </div> </div> <footer> @@ -221,6 +243,14 @@ <label>{val}</label> </div> </script> +<script id="pci-tmpl" type="text/html"> +<div class="item" id="{name}"> + <span class="cell name" title="{name}">{name}</span> + <span class="cell product" title="{product}">{product}</span> + <span class="cell vendor" title="{vendor}">{vendor}</span> + <button></button> +</div> +</script> <script type="text/javascript"> kimchi.guest_edit_main(); </script> -- 1.7.1

2 1

[PATCH 0/6] Use installed spice-html5 package when possible
by Aline Manera 14 Oct '14

14 Oct '14

spice-html5 is present in almost all supported Linux distributions (RHEL6.5, Fedora20 and Ubuntu 14.04). So in those cases we should not package the spice-html5 code into Kimchi and instead of that uses the spice-html5 package as dependency. This patch set change the build process to check the spice-html5 package availability in order to decide to package or not the spice-html5 code. It also gets the latest spice-html5 code into Kimchi and update the COPYING content to point to the imported codes. spice-html5 package is not available for RHEL7 and openSUSE 13.1. So for those distributions, you must run the following command to Kimchi includes the spice-html5 into its package. ./autogen.sh --with-spice-html5 Aline Manera (6): Import the latest spice-html5 code into Kimchi Modify spice_auto.html for Kimchi proposals Add new spice-html5 code to Kimchi build process Update Kimchi to use the installed spice-html5 Delete former imported spice code Update COPYING content to expose the imported code COPYING | 10 +- autogen.sh | 2 + configure.ac | 15 +- contrib/DEBIAN/control.in | 3 +- contrib/kimchi.spec.fedora.in | 30 +- contrib/kimchi.spec.suse.in | 24 +- docs/README.md | 10 +- src/kimchi/Makefile.am | 11 +- src/kimchi/config.py.in | 33 +- tests/test_config.py.in | 15 +- ui/Makefile.am | 2 +- ui/css/Makefile.am | 2 - ui/css/spice/Makefile.am | 20 - ui/css/spice/spice.css | 115 --- ui/js/Makefile.am | 2 - ui/js/spice/Makefile.am | 22 - ui/js/spice/atKeynames.js | 183 ----- ui/js/spice/bitmap.js | 51 -- ui/js/spice/cursor.js | 92 --- ui/js/spice/display.js | 806 -------------------- ui/js/spice/enums.js | 282 ------- ui/js/spice/inputs.js | 251 ------- ui/js/spice/jsbn.js | 589 --------------- ui/js/spice/lz.js | 166 ---- ui/js/spice/main.js | 176 ----- ui/js/spice/png.js | 256 ------- ui/js/spice/prng4.js | 79 -- ui/js/spice/quic.js | 1335 --------------------------------- ui/js/spice/rng.js | 102 --- ui/js/spice/rsa.js | 146 ---- ui/js/spice/sha1.js | 346 --------- ui/js/spice/spiceconn.js | 447 ----------- ui/js/spice/spicedataview.js | 96 --- ui/js/spice/spicemsg.js | 883 ---------------------- ui/js/spice/spicetype.js | 480 ------------ ui/js/spice/ticket.js | 250 ------ ui/js/spice/utils.js | 261 ------- ui/js/spice/wire.js | 123 --- ui/js/src/kimchi.api.js | 2 +- ui/pages/spice.html.tmpl | 140 ---- ui/spice-html5/Makefile.am | 25 + ui/spice-html5/atKeynames.js | 183 +++++ ui/spice-html5/bitmap.js | 51 ++ ui/spice-html5/css/Makefile.am | 20 + ui/spice-html5/css/spice.css | 118 +++ ui/spice-html5/cursor.js | 110 +++ ui/spice-html5/display.js | 823 ++++++++++++++++++++ ui/spice-html5/enums.js | 324 ++++++++ ui/spice-html5/inputs.js | 280 +++++++ ui/spice-html5/lz.js | 166 ++++ ui/spice-html5/main.js | 231 ++++++ ui/spice-html5/pages/Makefile.am | 20 + ui/spice-html5/pages/spice_auto.html | 200 +++++ ui/spice-html5/playback.js | 278 +++++++ ui/spice-html5/png.js | 256 +++++++ ui/spice-html5/quic.js | 1335 +++++++++++++++++++++++++++++++++ ui/spice-html5/resize.js | 70 ++ ui/spice-html5/simulatecursor.js | 202 +++++ ui/spice-html5/spicearraybuffer.js | 58 ++ ui/spice-html5/spiceconn.js | 460 ++++++++++++ ui/spice-html5/spicedataview.js | 120 +++ ui/spice-html5/spicemsg.js | 1047 ++++++++++++++++++++++++++ ui/spice-html5/spicetype.js | 473 ++++++++++++ ui/spice-html5/thirdparty/Makefile.am | 20 + ui/spice-html5/thirdparty/jsbn.js | 589 +++++++++++++++ ui/spice-html5/thirdparty/prng4.js | 79 ++ ui/spice-html5/thirdparty/rng.js | 102 +++ ui/spice-html5/thirdparty/rsa.js | 146 ++++ ui/spice-html5/thirdparty/sha1.js | 346 +++++++++ ui/spice-html5/ticket.js | 250 ++++++ ui/spice-html5/utils.js | 265 +++++++ ui/spice-html5/webm.js | 553 ++++++++++++++ ui/spice-html5/wire.js | 123 +++ 73 files changed, 9419 insertions(+), 7762 deletions(-) delete mode 100644 ui/css/spice/Makefile.am delete mode 100644 ui/css/spice/spice.css delete mode 100644 ui/js/spice/Makefile.am delete mode 100644 ui/js/spice/atKeynames.js delete mode 100644 ui/js/spice/bitmap.js delete mode 100644 ui/js/spice/cursor.js delete mode 100644 ui/js/spice/display.js delete mode 100644 ui/js/spice/enums.js delete mode 100644 ui/js/spice/inputs.js delete mode 100644 ui/js/spice/jsbn.js delete mode 100644 ui/js/spice/lz.js delete mode 100644 ui/js/spice/main.js delete mode 100644 ui/js/spice/png.js delete mode 100644 ui/js/spice/prng4.js delete mode 100644 ui/js/spice/quic.js delete mode 100644 ui/js/spice/rng.js delete mode 100644 ui/js/spice/rsa.js delete mode 100644 ui/js/spice/sha1.js delete mode 100644 ui/js/spice/spiceconn.js delete mode 100644 ui/js/spice/spicedataview.js delete mode 100644 ui/js/spice/spicemsg.js delete mode 100644 ui/js/spice/spicetype.js delete mode 100644 ui/js/spice/ticket.js delete mode 100644 ui/js/spice/utils.js delete mode 100644 ui/js/spice/wire.js delete mode 100644 ui/pages/spice.html.tmpl create mode 100644 ui/spice-html5/Makefile.am create mode 100644 ui/spice-html5/atKeynames.js create mode 100644 ui/spice-html5/bitmap.js create mode 100644 ui/spice-html5/css/Makefile.am create mode 100644 ui/spice-html5/css/spice.css create mode 100644 ui/spice-html5/cursor.js create mode 100644 ui/spice-html5/display.js create mode 100644 ui/spice-html5/enums.js create mode 100644 ui/spice-html5/inputs.js create mode 100644 ui/spice-html5/lz.js create mode 100644 ui/spice-html5/main.js create mode 100644 ui/spice-html5/pages/Makefile.am create mode 100644 ui/spice-html5/pages/spice_auto.html create mode 100644 ui/spice-html5/playback.js create mode 100644 ui/spice-html5/png.js create mode 100644 ui/spice-html5/quic.js create mode 100644 ui/spice-html5/resize.js create mode 100644 ui/spice-html5/simulatecursor.js create mode 100644 ui/spice-html5/spicearraybuffer.js create mode 100644 ui/spice-html5/spiceconn.js create mode 100644 ui/spice-html5/spicedataview.js create mode 100644 ui/spice-html5/spicemsg.js create mode 100644 ui/spice-html5/spicetype.js create mode 100644 ui/spice-html5/thirdparty/Makefile.am create mode 100644 ui/spice-html5/thirdparty/jsbn.js create mode 100644 ui/spice-html5/thirdparty/prng4.js create mode 100644 ui/spice-html5/thirdparty/rng.js create mode 100644 ui/spice-html5/thirdparty/rsa.js create mode 100644 ui/spice-html5/thirdparty/sha1.js create mode 100644 ui/spice-html5/ticket.js create mode 100644 ui/spice-html5/utils.js create mode 100644 ui/spice-html5/webm.js create mode 100644 ui/spice-html5/wire.js -- 1.9.3

3 15

[RFC] Guest cloning
by Crístian Viana 14 Oct '14

14 Oct '14

Hi everyone, I'm presenting here my proposal for the feature "Guest cloning" which is expected to be implemented for Kimchi 1.4. Description Cloning a guest means creating a new guest with a copy of the settings and data of the original guest. All data described by its XML will be copied completely, with the following exceptions: * name: the new guest will have an automatically generated name. We can append "-clone<n>" to the original guest's name, where <n> is related to the number of clones created from that guest. For example, cloning a guest named "myfedora" will create a new guest named "myfedora-clone1"; if another clone for that same guest is requested, it will be named "myfedora-clone2". * uuid: the new guest will have an automatically generated UUID. We can create a random UUID for every cloned guest. * devices/interface/mac: the new guest will have an automatically generated MAC address for every network interface. We can create random MAC addresses for every cloned guest. * devices/disk: the new guest will have copies of the original guest's disks. Depending on the storage pool type of each disk, a different procedure may be used to copy that disk: * DIR, NFS, Logical: the disk file will be copied to a new file with a modified name (e.g. "disk.img" -> "disk-clone1.img") on the same storage pool. * SCSI, iSCSI: the volume data will be copied as a new disk file on the storage pool "default". REST API Only one new REST command will be added. Syntax POST /vms/<vm-name>/clone Parameters: None. Return: An asynchronous Task with "target_uri" containing "/vms/<new-vm-name>". As expected with any Task, the cloning process can be tracked by checking the corresponding task's status. Discussion I think the most challenging part of this feature is how to deal with different types of disks while not prompting the user with any input. There are a lot of possibilities and a lot of things that can go wrong during the disks copy but we still need to do whatever is easier for the user. For example, do we really have to create the new disks in the same storage pool as the original disk's? If that's not possible (e.g. not available space), should we create them in another pool with available space? Should we ask any input from the user (e.g. "Would you like to create the new disk on the same storage pool or on a different one?")? What about the *SCSI pool types, is it OK to copy the volume data to a different storage pool (i.e. "default") like I'm proposing here? I couldn't think of a way to add a new volume in an existing pool of those types. How about making the *SCSI volumes shareable between the original and the new VMs? I don't like that approach because then both VMs will use the same disk, whatever is changed in one VM is also changed in the other one, and that's not a clone for me, that's a "hardlink". Any feedback is welcome! Best regards, Crístian.

7 17

[PATCH v12 0/6] Host Device Passthrough
by Zhou Zheng Sheng 14 Oct '14

14 Oct '14

Hi all, Host device passthrough is to directly assign host device to guest exclusively, so there is no virtualization overhead, and it improves guest performance greatly. It's useful if you have a server with lots of PCIe slots and cards. Changelog: This v12 patch improves the coding style. For example, using reflection instead of maintaining method map, using lxml.builder to generate XML strings. The v11 patch series improve disto compatibility and device filtering. Firstly, the patches adapt to Ubuntu 14.04, RHEL 6.5, RHEL 7, Fedora 20 and Fedora 19. It just relies on libvirt node-device API, kernel vfio framework and /sys/kernel/iommu_group. So any distribution providing these features should work. On old distributions like RHEL 6.5, they are shipped with 2.6.X kernel which do not support vfio and sysfs iommu group. We also try to be compatible, but as far as we tested, the PCI passthrough feature using the traditional pci-stub + kvm approach is buggy and not mature. So in this patch series, the back-end provides a capability in /config/capabilities for the front-end to check, and then freezes PCI passthrough web UI in this case. Didn't test on SuSe, just because the author could not find a physical SuSe server. The patches should work on SuSe as long as it provides the dependencies. Secondly, there is 2 changes in PCI device filtering. Previously, we only allowed to assign the "leaf" devices to guest. For example, instead of assigning a USB controller, we assign the connected USB device. We also made a PCI device whitelist according to the class code. After some tests, we find that it's hardly useful if we only allow "leaf" device, because in many cases the user wants to assign a parent device. For example, the user may want to assign an HBA card to guest, while there are many children LUNs under this card. The PCI device code is also not a good way for checking if a device is suitable to be passed through. There are too many vendors and devices, you'll always find some "good" devices are out of the whitelist, and if we grant the relared class code, it'll introduce "bad" devices. So in this patch we just filter out video cards and PCI bridges. They are not for passthrough absolutely. We also allow to passthrough a parent device. The back-end provides API to check the affected devices if you passthrough a particular one. The affected devices are the devices in the same iommu group and their children devices. As regard to the front-end, we only implemented PCI device passthrough, PCI devices are the mostly useful and interesting devices to passthrough. The back-end actually supports passing through LUNs and USB devices. To test the patches, firstly reboot your host os, enable vt-d in BIOS. Before loading Linux kernel, append "intel_iommu=on" to kernel arguments. If you want to make it persistent, edit "grub.conf" and append it. Then just apply the patch, start Kimchi daemon, edit a shutdown guest, you'll see "Host PCI Device" tab. In the listing, select "To Add", then click "+" besides one of the device. You'll find PCI devices in the same group are also added. Then close the dialogue and start the guest. In guest OS, "lspci" can show you the passthrough devices. In future, we plan to add more helpful information to assist user. For example, when the user selects an NIC card, the front-end shows the configured IP address. When the user selects an HBA card, the front-end shows the related block devices such as sda sdb ... So the user can avoid assigning a device in use by the host. Yu Xin Huo (1): Host device passthrough (Front-end): Add PCI Devices to VM Zhou Zheng Sheng (5): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device Host device passthrough: Add unit tests and documents docs/API.md | 66 ++++++- src/kimchi/API.json | 38 ++++ src/kimchi/control/host.py | 7 + src/kimchi/control/vm/hostdevs.py | 43 +++++ src/kimchi/featuretests.py | 10 +- src/kimchi/i18n.py | 13 ++ src/kimchi/mockmodel.py | 94 +++++++++- src/kimchi/model/config.py | 6 +- src/kimchi/model/host.py | 48 +++-- src/kimchi/model/hostdev.py | 323 +++++++++++++++++++++++++++++++++ src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/vmhostdevs.py | 314 ++++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 24 +++ tests/test_model.py | 31 ++++ tests/test_rest.py | 12 +- tests/test_storagepool.py | 7 +- ui/css/theme-default/guest-edit.css | 86 ++++++++- ui/js/src/kimchi.api.js | 55 ++++++ ui/js/src/kimchi.guest_edit_main.js | 81 +++++++++ ui/pages/guest-edit.html.tmpl | 28 +++ 21 files changed, 1251 insertions(+), 56 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/model/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.3

3 15

[PATCH] Backend support for templates with sockets, cores, and threads
by Christy Perez 14 Oct '14

14 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU v3->v4: - Remove the unused cpu_ elements from common_spec - Pass new_t into validate function to reduce complexity - Rearrange code to decrese indents in _get_cpu_xml v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 13 ++++++++++++- po/en_US.po | 3 +++ po/pt_BR.po | 3 +++ po/zh_CN.po | 3 +++ src/kimchi/API.json | 33 +++++++++++++++++++++++++++++++-- src/kimchi/control/templates.py | 13 ++++++++++--- src/kimchi/i18n.py | 1 + src/kimchi/model/templates.py | 32 ++++++++++++++++++++++++++++++++ src/kimchi/osinfo.py | 5 ++--- src/kimchi/vmtemplate.py | 16 ++++++++++++++++ 10 files changed, 113 insertions(+), 9 deletions(-) diff --git a/docs/API.md b/docs/API.md index 92fbbd5..6984649 100644 --- a/docs/API.md +++ b/docs/API.md @@ -194,7 +194,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * name: The name of the Template. Used to identify the Template in this API * os_distro *(optional)*: The operating system distribution * os_version *(optional)*: The version of the operating system distribution - * cpus *(optional)*: The number of CPUs assigned to the VM. Default is 1. + * cpus *(optional)*: The number of CPUs assigned to the VM. + Default is 1, unlees specifying a cpu topology. In that case, cpus + will default to a product of the topology values (see cpu_info). * memory *(optional)*: The amount of memory assigned to the VM. Default is 1024M. * cdrom *(optional)*: A volume name or URI to an ISO image. @@ -216,6 +218,15 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. + If specifying both cpus and CPU topology, make sure cpus is + equal to the product of sockets, cores, and threads. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/po/en_US.po b/po/en_US.po index eb571ca..a88675c 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -371,6 +371,9 @@ msgstr "" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index f2fba64..1bebe30 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -424,6 +424,9 @@ msgstr "Imagem base do modelo deve ser um arquivo de imagem local válido" msgid "Cannot identify base image %(path)s format" msgstr "Não foi possível identificar o formato da imagem base %(path)s" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s já existe" diff --git a/po/zh_CN.po b/po/zh_CN.po index f77e405..f944b8d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -392,6 +392,9 @@ msgstr "模板基础镜像必须为一个有效的本地镜像文件" msgid "Cannot identify base image %(path)s format" msgstr "未能识别基础镜像%(path)s格式" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "存储池%(name)s已经存在" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index d9e13f0..d3edf27 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,33 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "integer", + "required": true, + "minimum": 1 + }, + "cores": { + "type": "integer", + "required": true, + "minimum": 1 + }, + "threads": { + "type": "integer", + "required": true, + "minimum": 1 + } + } + } + } } }, "properties": { @@ -448,7 +475,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -612,7 +640,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..54caa92 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,13 +38,14 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, + return_data = { + 'name': self.ident, 'icon': self.info['icon'], 'invalid': self.info['invalid'], 'os_distro': self.info['os_distro'], @@ -56,4 +57,10 @@ def data(self): 'storagepool': self.info['storagepool'], 'networks': self.info['networks'], 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + 'graphics': self.info['graphics'] + } + if (self.info.get('cpu_info')): + return_data['cpu_info'] = self.info['cpu_info'] + else: + return_data['cpu_info'] = '' + return return_data diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 75fb076..611316c 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -143,6 +143,7 @@ "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), + "KCHTMPL0025E": _("When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads."), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 9278cdc..2954148 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -48,6 +48,22 @@ def create(self, params): {'filename': iso, 'user': user, 'err': excp}) + cpu_info = params.get('cpu_info') + if cpu_info: + cpu_info = dict(params['cpu_info']) + topology = cpu_info.get('topology') + # Check, even though currently only topology + # is supported. + if topology: + sockets = topology['sockets'] + cores = topology['cores'] + threads = topology['threads'] + vcpus = params.get('cpus') + if vcpus is None: + params['cpus'] = sockets * cores * threads + elif vcpus != sockets * cores * threads: + raise InvalidParameter("KCHTMPL0025E") + conn = self.conn.get() pool_uri = params.get(u'storagepool', '') if pool_uri: @@ -156,6 +172,10 @@ def update(self, name, params): old_t = self.lookup(name) new_t = copy.copy(old_t) new_t.update(params) + + if not self._validate_updated_cpu_params(new_t): + raise InvalidParameter('KCHTMPL0025E') + ident = name conn = self.conn.get() @@ -187,6 +207,18 @@ def update(self, name, params): raise return ident + def _validate_updated_cpu_params(self, info): + # Note: cpu_info is the parent of topology. cpus is vcpus + vcpus = info['cpus'] + cpu_info = info.get('cpu_info') + if cpu_info is None: + return True + topology = cpu_info.get('topology') + if topology is None: + return True + return vcpus == topology['sockets'] * topology['cores'] * \ + topology['threads'] + class LibvirtVMTemplate(VMTemplate): def __init__(self, args, scan=False, conn=None): diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 6ee5e48..0e16b50 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,9 +32,8 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, - 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', - 'cdrom_index': 2, 'mouse_bus': 'ps2'} +common_spec = {'cpus': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], + 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} modern_spec = dict(common_spec, disk_bus='virtio', nic_model='virtio') diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5f22db9..cfb7704 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -358,6 +358,20 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is None: + return "" + cpu_topo = cpu_info.get('topology') + if cpu_topo is None: + return "" + return etree.tostring(E.cpu(E.topology( + sockets=str(cpu_topo['sockets']), + cores=str(cpu_topo['cores']), + threads=str(cpu_topo['threads'])))) + + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -369,6 +383,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params['qemu-stream-cmdline'] = '' graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + params['cpu_info'] = self._get_cpu_xml() # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) @@ -400,6 +415,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

1 1

[PATCH v3] Backend support for templates with sockets, cores, and threads
by Christy Perez 14 Oct '14

14 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU v2->v3: - Set vcpus based on topology, if specified. - Move the update cpu+topology validation out to a function for redability - Add a minimum value of 1 for topology values - Leave new English error msg as empty string - Update the API documentation on cpu defaults v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 13 ++++++++++- po/en_US.po | 3 +++ po/pt_BR.po | 3 +++ po/zh_CN.po | 3 +++ src/kimchi/API.json | 33 ++++++++++++++++++++++++-- src/kimchi/control/templates.py | 13 ++++++++--- src/kimchi/i18n.py | 1 + src/kimchi/model/templates.py | 52 +++++++++++++++++++++++++++++++++++++++++ src/kimchi/osinfo.py | 2 +- src/kimchi/vmtemplate.py | 15 ++++++++++++ 10 files changed, 131 insertions(+), 7 deletions(-) diff --git a/docs/API.md b/docs/API.md index cc438cc..7f1a8c2 100644 --- a/docs/API.md +++ b/docs/API.md @@ -179,7 +179,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * name: The name of the Template. Used to identify the Template in this API * os_distro *(optional)*: The operating system distribution * os_version *(optional)*: The version of the operating system distribution - * cpus *(optional)*: The number of CPUs assigned to the VM. Default is 1. + * cpus *(optional)*: The number of CPUs assigned to the VM. + Default is 1, unlees specifying a cpu topology. In that case, cpus + will default to a product of the topology values (see cpu_info). * memory *(optional)*: The amount of memory assigned to the VM. Default is 1024M. * cdrom *(optional)*: A volume name or URI to an ISO image. @@ -201,6 +203,15 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. + If specifying both cpus and CPU topology, make sure cpus is + equal to the product of sockets, cores, and threads. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/po/en_US.po b/po/en_US.po index eb571ca..a88675c 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -371,6 +371,9 @@ msgstr "" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index f2fba64..1bebe30 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -424,6 +424,9 @@ msgstr "Imagem base do modelo deve ser um arquivo de imagem local válido" msgid "Cannot identify base image %(path)s format" msgstr "Não foi possível identificar o formato da imagem base %(path)s" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s já existe" diff --git a/po/zh_CN.po b/po/zh_CN.po index f77e405..f944b8d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -392,6 +392,9 @@ msgstr "模板基础镜像必须为一个有效的本地镜像文件" msgid "Cannot identify base image %(path)s format" msgstr "未能识别基础镜像%(path)s格式" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "存储池%(name)s已经存在" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 5b752dc..fe3df72 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,33 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "integer", + "required": true, + "minimum": 1 + }, + "cores": { + "type": "integer", + "required": true, + "minimum": 1 + }, + "threads": { + "type": "integer", + "required": true, + "minimum": 1 + } + } + } + } } }, "properties": { @@ -448,7 +475,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -612,7 +640,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..54caa92 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,13 +38,14 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, + return_data = { + 'name': self.ident, 'icon': self.info['icon'], 'invalid': self.info['invalid'], 'os_distro': self.info['os_distro'], @@ -56,4 +57,10 @@ def data(self): 'storagepool': self.info['storagepool'], 'networks': self.info['networks'], 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + 'graphics': self.info['graphics'] + } + if (self.info.get('cpu_info')): + return_data['cpu_info'] = self.info['cpu_info'] + else: + return_data['cpu_info'] = '' + return return_data diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 1b543ce..9ce8e86 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -131,6 +131,7 @@ "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), + "KCHTMPL0025E": _("When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads."), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 9278cdc..04d2af9 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -48,6 +48,22 @@ def create(self, params): {'filename': iso, 'user': user, 'err': excp}) + cpu_info = params.get('cpu_info') + if cpu_info: + cpu_info = dict(params['cpu_info']) + topology = cpu_info.get('topology') + # Check, even though currently only topology + # is supported. + if topology: + sockets = topology['sockets'] + cores = topology['cores'] + threads = topology['threads'] + vcpus = params.get('cpus') + if vcpus is None: + params['cpus'] = sockets * cores * threads + elif sockets * cores * threads != vcpus: + raise InvalidParameter("KCHTMPL0025E") + conn = self.conn.get() pool_uri = params.get(u'storagepool', '') if pool_uri: @@ -154,6 +170,9 @@ def delete(self, name): def update(self, name, params): old_t = self.lookup(name) + if not self._verify_updated_cpu_params(params, old_t): + raise InvalidParameter('KCHTMPL0025E') + new_t = copy.copy(old_t) new_t.update(params) ident = name @@ -187,6 +206,39 @@ def update(self, name, params): raise return ident + def _verify_updated_cpu_params(self, params, old_t): + # Note: cpu_info is the parent of topology. cpus is vcpus + # Keep two check_ variables for what we'll verify at the end to + # keep from duplicating code. + check_cpu = None + check_topology = None + # First see what parameters were passed in. + new_vcpus = params.get('cpus') + new_cpu_info = params.get('cpu_info') + new_topology = '' + if new_cpu_info: + new_topology = new_cpu_info.get('topology') + # Now figure out what needs to be verified. + if new_vcpus and new_topology: + check_cpu = new_vcpus + check_topology = new_topology + elif new_vcpus: + old_cpu_info = old_t.get('cpu_info') + if old_cpu_info: + old_topology = old_cpu_info.get('topology') + if old_topology: + check_cpu = new_vcpus + check_topology = old_topology + elif new_topology: + check_cpu = old_t.get('cpus') + check_topology = new_topology + # Now verify the cpu and topoloy parameters + if check_cpu and (check_cpu != check_topology['sockets'] * \ + check_topology['cores'] * check_topology['threads']): + return False + + return True + class LibvirtVMTemplate(VMTemplate): def __init__(self, args, scan=False, conn=None): diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 6ee5e48..10d0ab0 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,7 +32,7 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, +common_spec = {'cpus': 1, 'cpu_sockets': '1', 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5f22db9..34720de 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -358,6 +358,19 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is not None: + cpu_topo = cpu_info.get('topology') + if cpu_topo is not None: + return etree.tostring(E.cpu(E.topology( + sockets=str(cpu_topo['sockets']), + cores=str(cpu_topo['cores']), + threads=str(cpu_topo['threads'])))) + + return "" + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -369,6 +382,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params['qemu-stream-cmdline'] = '' graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + params['cpu_info'] = self._get_cpu_xml() # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) @@ -400,6 +414,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

3 5

[v3 0/1] Ticket UI to set vnc ticket password
by Simon Jin 13 Oct '14

13 Oct '14

V3-V2: - Increase the diablog width and height to avoid the scroll and keep 'Console password' in one line. V2-V1: - Put new password input box on 'general' tab instead of being a sperate tab. - Rename the input lobel as 'Console password' Simon Jin (1): Ticket UI to set vnc ticket password ui/css/theme-default/guest-edit.css | 2 +- ui/js/src/kimchi.guest_edit_main.js | 4 ++++ ui/pages/guest-edit.html.tmpl | 11 +++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) -- 1.9.3

2 4

[RFC] UI to allow user adds disks from different pools to a Template
by Wen Wang 13 Oct '14

13 Oct '14

Hi all, I have the following suggestions of this work item. I agree with Aline's proposal that we should display the "Edit Template" dialogue the same way as "Edit Guest" in tabs. Considering that we are going to add another function to allow users attaching multiple disks to template, My proposal is to devide the "Edit Guest" into tabs: 1) General: includes the basic information of the template. Items included under this tab are: --Name --Vendor --Version --CPU Number --Memory --CDROM --Graphics 2) Storage: Associated storage information of the template(Multiple lines with title of these two indicates multiple volumes) --Storage Pool --Disk(GB) 3) Interface:(Multiple lines of network information) --Network I will have the mock sent tomorrow and any comment is welcomed -- ======================================================= Best Regards Wang Wen

2 1

[PATCH v2] Backend support for templates with sockets, cores, and threads
by Christy Perez 09 Oct '14

09 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU v1->v2: - Added a check to make sure that vcpus = sockets*cores*threads - Set individual topoology params to required in API.json - Change the topology object types from string to integer - Always return cpu_info from templates lookup() - Removed check for cpu_info in to_vm_xml - Build cpu_info xml using lxml.builder instead of string - CPU and topology verification on template update Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 11 +++++++++- po/en_US.po | 3 +++ po/pt_BR.po | 3 +++ po/zh_CN.po | 3 +++ src/kimchi/API.json | 30 ++++++++++++++++++++++++-- src/kimchi/control/templates.py | 13 +++++++++--- src/kimchi/i18n.py | 1 + src/kimchi/model/templates.py | 47 +++++++++++++++++++++++++++++++++++++++++ src/kimchi/osinfo.py | 2 +- src/kimchi/vmtemplate.py | 15 +++++++++++++ 10 files changed, 121 insertions(+), 7 deletions(-) diff --git a/docs/API.md b/docs/API.md index cc438cc..6281f70 100644 --- a/docs/API.md +++ b/docs/API.md @@ -179,7 +179,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * name: The name of the Template. Used to identify the Template in this API * os_distro *(optional)*: The operating system distribution * os_version *(optional)*: The version of the operating system distribution - * cpus *(optional)*: The number of CPUs assigned to the VM. Default is 1. + * cpus *(optional)*: The number of CPUs assigned to the VM. + Default is 1. If specifying a CPU topology, make sure this value is + equal to the product of sockets, cores, and threads. * memory *(optional)*: The amount of memory assigned to the VM. Default is 1024M. * cdrom *(optional)*: A volume name or URI to an ISO image. @@ -201,6 +203,13 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/po/en_US.po b/po/en_US.po index eb571ca..74f1ec6 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -371,6 +371,9 @@ msgstr "" msgid "Cannot identify base image %(path)s format" msgstr "" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index f2fba64..1bebe30 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -424,6 +424,9 @@ msgstr "Imagem base do modelo deve ser um arquivo de imagem local válido" msgid "Cannot identify base image %(path)s format" msgstr "Não foi possível identificar o formato da imagem base %(path)s" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s já existe" diff --git a/po/zh_CN.po b/po/zh_CN.po index f77e405..f944b8d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -392,6 +392,9 @@ msgstr "模板基础镜像必须为一个有效的本地镜像文件" msgid "Cannot identify base image %(path)s format" msgstr "未能识别基础镜像%(path)s格式" +msgid "When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads." +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "存储池%(name)s已经存在" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 5b752dc..0fe3993 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,30 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "integer", + "required": true + }, + "cores": { + "type": "integer", + "required": true + }, + "threads": { + "type": "integer", + "required": true + } + } + } + } } }, "properties": { @@ -448,7 +472,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -612,7 +637,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..54caa92 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,13 +38,14 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, + return_data = { + 'name': self.ident, 'icon': self.info['icon'], 'invalid': self.info['invalid'], 'os_distro': self.info['os_distro'], @@ -56,4 +57,10 @@ def data(self): 'storagepool': self.info['storagepool'], 'networks': self.info['networks'], 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + 'graphics': self.info['graphics'] + } + if (self.info.get('cpu_info')): + return_data['cpu_info'] = self.info['cpu_info'] + else: + return_data['cpu_info'] = '' + return return_data diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 1b543ce..9ce8e86 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -131,6 +131,7 @@ "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), + "KCHTMPL0025E": _("When specifying CPU topology, VCPUs must be a product of sockets, cores, and threads."), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 9278cdc..203c324 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -48,6 +48,22 @@ def create(self, params): {'filename': iso, 'user': user, 'err': excp}) + cpu_info = params.get('cpu_info') + if cpu_info: + cpu_info = dict(params['cpu_info']) + topology = cpu_info.get('topology') + # Check, even though currently only topology + # is supported. + if topology: + sockets = int(topology.get('sockets')) + cores = int(topology.get('cores')) + threads = int(topology.get('threads')) + vcpus = params.get('cpus') + if vcpus is None: + vcpus = 1 + if sockets * cores * threads != vcpus: + raise InvalidParameter("KCHTMPL0025E") + conn = self.conn.get() pool_uri = params.get(u'storagepool', '') if pool_uri: @@ -154,6 +170,37 @@ def delete(self, name): def update(self, name, params): old_t = self.lookup(name) + # If changing vcpus, check for topology values, and vice versa + # Note: cpu_info is the parent of topology. cpus is vcpus + # Keep two check_ variables for what we'll verify at the end to + # keep from duplicating code. + check_cpu = None + check_topology = None + # First see what parameters were passed in. + new_vcpus = params.get('cpus') + new_cpu_info = params.get('cpu_info') + new_topology = '' + if new_cpu_info: + new_topology = new_cpu_info.get('topology') + # Now figure out what needs to be verified. + if new_vcpus and new_topology: + check_cpu = new_vcpus + check_topology = new_topology + elif new_vcpus: + old_cpu_info = old_t.get('cpu_info') + if old_cpu_info: + old_topology = old_cpu_info.get('topology') + if old_topology: + check_cpu = new_vcpus + check_topology = old_topology + elif new_topology: + check_cpu = old_t.get('cpus') + check_topology = new_topology + # Now verify the cpu and topoloy parameters + if check_cpu and (check_cpu != check_topology['sockets'] * \ + check_topology['cores'] * check_topology['threads']): + raise InvalidParameter('KCHTMPL0025E') + new_t = copy.copy(old_t) new_t.update(params) ident = name diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 6ee5e48..10d0ab0 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,7 +32,7 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, +common_spec = {'cpus': 1, 'cpu_sockets': '1', 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5f22db9..34720de 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -358,6 +358,19 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is not None: + cpu_topo = cpu_info.get('topology') + if cpu_topo is not None: + return etree.tostring(E.cpu(E.topology( + sockets=str(cpu_topo['sockets']), + cores=str(cpu_topo['cores']), + threads=str(cpu_topo['threads'])))) + + return "" + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -369,6 +382,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params['qemu-stream-cmdline'] = '' graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + params['cpu_info'] = self._get_cpu_xml() # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) @@ -400,6 +414,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

2 2

[PATCH] Addition of custom mac address field for interfaces v4
by bbaude＠redhat.com 09 Oct '14

09 Oct '14

From: Brent Baude <bbaude(a)redhat.com> Included review feedback --- docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ src/kimchi/control/vms.py | 2 +- src/kimchi/exception.py | 1 - src/kimchi/i18n.py | 4 ++++ src/kimchi/model/vmifaces.py | 38 +++++++++++++++++++++++++++++-------- tests/test_model.py | 12 ++++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 10 files changed, 76 insertions(+), 21 deletions(-) diff --git a/docs/API.md b/docs/API.md index b679ce7..4f92eaa 100644 --- a/docs/API.md +++ b/docs/API.md @@ -221,6 +221,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom MAC address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b8604d2..6cea55d 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,12 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string", + "pattern": "(^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$)?", + "error": "KCHVMIF0009E" } } }, diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 88d8a81..627f1cc 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -36,7 +36,7 @@ class VM(Resource): super(VM, self).__init__(model, ident) self.role_key = 'guests' self.update_params = ["name", "users", "groups", "cpus", "memory", - "graphics"] + "graphics", "custommac"] self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' for ident, node in sub_nodes.items(): diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 039152a..7ab1878 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -46,7 +46,6 @@ class KimchiException(Exception): msg = self._get_translation() else: msg = _messages.get(code, code) - msg = unicode(msg, 'utf-8') % args pattern = "%s: %s" % (code, msg) Exception.__init__(self, pattern) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..4473a99 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,10 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("Invalid MAC address format. Expected a 12 character hexadecimal value separated by colons(:)"), + "KCHVMIF0010E": _("The custom MAC address %(custommac)s is already in use on this guest"), + "KCHVMIF0011E": _("Libvirt requires a unicast MAC address which %(value)s is not."), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..ef67d34 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,20 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def checkduplicatemacs(vm, custommac): + macs = self.get_list(vm) + if custommac in macs: + raise InvalidParameter("KCHVMIF0010E", {'custommac': mac}) + + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + raise InvalidParameter("KCHVMIF0009E", {'custommac': mac}) + else: + # Checking for multicast + if (int(mymac.split(":")[0], 16) & 0x1) == 1: + raise InvalidParameter("KCHVMIF0011E", {'custommac': mac}) + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -56,14 +71,22 @@ class VMIfacesModel(object): if DOM_STATE_MAP[dom.info()[0]] != "shutoff": raise InvalidOperation("KCHVMIF0003E") - macs = (iface.mac.get('address') - for iface in self.get_vmifaces(vm, self.conn)) - - mac = randomMAC() - while True: - if mac not in macs: - break + if 'custommac' not in params: + macs = (iface.mac.get('address') + for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + while True: + if mac not in macs: + break + mac = randomMAC() + + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + validMac(mac) + checkduplicatemacs(vm, mac) children = [E.mac(address=mac)] ("network" in params.keys() and @@ -75,7 +98,6 @@ class VMIfacesModel(object): xml = etree.tostring(E.interface(*children, **attrib)) dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - return mac @staticmethod diff --git a/tests/test_model.py b/tests/test_model.py index ceedc6f..6d67398 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,18 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + self.assertRaises(InvalidParameter, inst.vmifaces_create, + 'kimchi-ifaces', iface_args) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c281289..7baf296 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -176,7 +176,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -215,20 +218,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

4 4

[PATCH 0/2] PCI Passthrough: Add device to VM
by huoyuxin＠linux.vnet.ibm.com 09 Oct '14

09 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): Passthrough: Add PCI Devices to VM update po files po/en_US.po | 15 ++++++ po/kimchi.pot | 15 ++++++ po/pt_BR.po | 15 ++++++ po/zh_CN.po | 15 ++++++ ui/css/theme-default/guest-edit.css | 86 ++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 55 ++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 66 +++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 28 +++++++++++ 8 files changed, 293 insertions(+), 2 deletions(-)

3 4

[PATCH 0/2 V2] Delete imported novnc code
by Aline Manera 08 Oct '14

08 Oct '14

If you don't get the second patch "Delete imported novnc code" by ML. Please, check my upstream branch: Repository: https://github.com/alinefm/kimchi/ Branch: alinefm/remove-novnc V1 -> V2: - Fix rpm build - Rebase Aline Manera (2): Add novnc as Kimchi dependency Delete imported novnc code Makefile.am | 8 +- configure.ac | 17 - contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 17 +- contrib/kimchi.spec.suse.in | 17 +- docs/README.md | 7 +- src/kimchi/Makefile.am | 1 + src/kimchi/config.py.in | 5 +- tests/Makefile.am | 1 + tests/test_config.py.in | 5 +- ui/css/Makefile.am | 6 +- ui/css/fonts/Makefile.am | 18 - ui/css/fonts/novnc/Makefile.am | 20 - ui/css/fonts/novnc/Orbitron700.ttf | Bin 38580 -> 0 bytes ui/css/fonts/novnc/Orbitron700.woff | Bin 17472 -> 0 bytes ui/css/novnc/Makefile.am | 20 - ui/css/novnc/base.css | 405 ------ ui/js/Makefile.am | 2 +- ui/js/novnc/Makefile.am | 22 - ui/js/novnc/base64.js | 115 -- ui/js/novnc/des.js | 273 ---- ui/js/novnc/display.js | 770 ----------- ui/js/novnc/input.js | 1946 --------------------------- ui/js/novnc/jsunzip.js | 676 ---------- ui/js/novnc/main.js | 103 -- ui/js/novnc/rfb.js | 1866 ------------------------- ui/js/novnc/util.js | 381 ------ ui/js/novnc/web-socket-js/Makefile.am | 24 - ui/js/novnc/web-socket-js/README.txt | 109 -- ui/js/novnc/web-socket-js/WebSocketMain.swf | Bin 177114 -> 0 bytes ui/js/novnc/web-socket-js/swfobject.js | 4 - ui/js/novnc/web-socket-js/web_socket.js | 391 ------ ui/js/novnc/websock.js | 422 ------ ui/js/novnc/webutil.js | 216 --- ui/js/src/kimchi.api.js | 3 +- ui/pages/vnc_auto.html.tmpl | 44 - ui/pages/websockify/console.html | 2 +- 37 files changed, 23 insertions(+), 7894 deletions(-) delete mode 100644 ui/css/fonts/Makefile.am delete mode 100644 ui/css/fonts/novnc/Makefile.am delete mode 100644 ui/css/fonts/novnc/Orbitron700.ttf delete mode 100644 ui/css/fonts/novnc/Orbitron700.woff delete mode 100644 ui/css/novnc/Makefile.am delete mode 100644 ui/css/novnc/base.css delete mode 100644 ui/js/novnc/Makefile.am delete mode 100644 ui/js/novnc/base64.js delete mode 100644 ui/js/novnc/des.js delete mode 100644 ui/js/novnc/display.js delete mode 100644 ui/js/novnc/input.js delete mode 100755 ui/js/novnc/jsunzip.js delete mode 100644 ui/js/novnc/main.js delete mode 100644 ui/js/novnc/rfb.js delete mode 100644 ui/js/novnc/util.js delete mode 100644 ui/js/novnc/web-socket-js/Makefile.am delete mode 100644 ui/js/novnc/web-socket-js/README.txt delete mode 100644 ui/js/novnc/web-socket-js/WebSocketMain.swf delete mode 100644 ui/js/novnc/web-socket-js/swfobject.js delete mode 100644 ui/js/novnc/web-socket-js/web_socket.js delete mode 100644 ui/js/novnc/websock.js delete mode 100644 ui/js/novnc/webutil.js delete mode 100644 ui/pages/vnc_auto.html.tmpl -- 1.9.3

2 4

[PATCH] Bugfix#414: Cannot login by clicking on the login button
by Wen Wang 08 Oct '14

08 Oct '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fixes the bug that without moving the mouse, user cannot log in kimchi by clicking on "Log in" button in Chrome as well as Opera. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.login.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.login.js b/ui/js/src/kimchi.login.js index cacfa65..19b8691 100644 --- a/ui/js/src/kimchi.login.js +++ b/ui/js/src/kimchi.login.js @@ -68,5 +68,5 @@ kimchi.login_main = function() { return false; }; - $('#form-login').on('submit', login); + $('#btn-login').bind('click', login); }; -- 1.7.1

3 2

[PATCH] Enable remote libvirtds v2
by bbaude＠redhat.com 08 Oct '14

08 Oct '14

From: Brent Baude <bbaude(a)redhat.com> v2 patch to remove static qemu assignments which will allow a remote livirtd --- src/kimchi/config.py.in | 2 +- src/kimchi/featuretests.py | 8 ++++---- src/kimchi/kvmusertests.py | 2 +- src/kimchi/model/libvirtconnection.py | 20 +++++++++++++++++--- src/kimchi/model/model.py | 5 +++-- src/kimchi/model/networks.py | 2 +- tests/test_model.py | 16 ++++++++-------- 7 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index 91e5f48..6e24d11 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -62,7 +62,7 @@ def get_version(): def find_qemu_binary(find_emulator=False): try: - connect = libvirt.open('qemu:///system') + connect = libvirt.open(None) except Exception, e: raise Exception("Unable to get qemu binary location: %s" % e) try: diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 8964098..b7b482a 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -104,7 +104,7 @@ class FeatureTests(object): conn = None try: FeatureTests.disable_screen_error_logging() - conn = libvirt.open('qemu:///system') + conn = libvirt.open(None) dom = conn.defineXML(xml) dom.undefine() return True @@ -122,7 +122,7 @@ class FeatureTests(object): xml = ET.tostring(obj) return xml try: - conn = libvirt.open('qemu:///system') + conn = libvirt.open(None) FeatureTests.disable_screen_error_logging() conn.findStoragePoolSources('netfs', _get_xml(), 0) except libvirt.libvirtError as e: @@ -174,7 +174,7 @@ class FeatureTests(object): def libvirt_support_fc_host(): try: FeatureTests.disable_screen_error_logging() - conn = libvirt.open('qemu:///system') + conn = libvirt.open(None) pool = None pool = conn.storagePoolDefineXML(SCSI_FC_XML, 0) except libvirt.libvirtError as e: @@ -194,7 +194,7 @@ class FeatureTests(object): with RollbackContext() as rollback: FeatureTests.disable_screen_error_logging() rollback.prependDefer(FeatureTests.enable_screen_error_logging) - conn = libvirt.open('qemu:///system') + conn = libvirt.open(None) rollback.prependDefer(conn.close) dom = conn.defineXML(SIMPLE_VM_XML) rollback.prependDefer(dom.undefine) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 1ac2beb..2326727 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -49,7 +49,7 @@ class UserTests(object): xml = cls.SIMPLE_VM_XML % (vm_name, vm_uuid) with RollbackContext() as rollback: - conn = libvirt.open('qemu:///system') + conn = libvirt.open(None) rollback.prependDefer(conn.close) dom = conn.defineXML(xml) rollback.prependDefer(dom.undefine) diff --git a/src/kimchi/model/libvirtconnection.py b/src/kimchi/model/libvirtconnection.py index 80348a3..4fd2393 100644 --- a/src/kimchi/model/libvirtconnection.py +++ b/src/kimchi/model/libvirtconnection.py @@ -93,10 +93,13 @@ class LibvirtConnection(object): except libvirt.libvirtError: kimchi_log.error('Unable to connect to libvirt.') if not retries: - err = 'Libvirt is not available, exiting.' - kimchi_log.error(err) + kimchi_log.error("Unable to establish connection " + "with libvirt. Please check " + "your libvirt URI which is often " + "defined in " + "/etc/libvirt/libvirt.conf") cherrypy.engine.stop() - raise + exit(1) time.sleep(2) for name in dir(libvirt.virConnect): @@ -117,3 +120,14 @@ class LibvirtConnection(object): # However the values need to be considered wisely to not affect # hosts which are hosting a lot of virtual machines return conn + + def isQemuURI(self): + """ + This method will return True or Value when the system libvirt + URI is a qemu based URI. For example: + qemu:///system or qemu+tcp://someipaddress/system + """ + if self.get().getURI().startswith('qemu'): + return True + else: + return False diff --git a/src/kimchi/model/model.py b/src/kimchi/model/model.py index ac70852..566be66 100644 --- a/src/kimchi/model/model.py +++ b/src/kimchi/model/model.py @@ -38,12 +38,13 @@ DEFAULT_POOLS = {'default': {'path': '/var/lib/libvirt/images'}, class Model(BaseModel): - def __init__(self, libvirt_uri='qemu:///system', objstore_loc=None): + def __init__(self, libvirt_uri=None, objstore_loc=None): + self.objstore = ObjectStore(objstore_loc) self.conn = LibvirtConnection(libvirt_uri) kargs = {'objstore': self.objstore, 'conn': self.conn} - if 'qemu:///' in libvirt_uri: + if self.conn.isQemuURI(): for pool_name, pool_arg in DEFAULT_POOLS.iteritems(): self._default_pool_check(pool_name, pool_arg) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0ea9449..43f9d50 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -41,7 +41,7 @@ KIMCHI_BRIDGE_PREFIX = 'kb' class NetworksModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] - if 'qemu:///' in self.conn.get().getURI(): + if self.conn.isQemuURI(): self._default_network_check() def _default_network_check(self): diff --git a/tests/test_model.py b/tests/test_model.py index 1f2e79c..3bb090e 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -457,7 +457,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_storagepool(self): - inst = model.Model('qemu:///system', self.tmp_store) + inst = model.Model(None, self.tmp_store) poolDefs = [ {'type': 'dir', @@ -524,7 +524,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_storagevolume(self): - inst = model.Model('qemu:///system', self.tmp_store) + inst = model.Model(None, self.tmp_store) with RollbackContext() as rollback: path = '/tmp/kimchi-images' @@ -742,7 +742,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_clone(self): - inst = model.Model('qemu:///system', + inst = model.Model(None, objstore_loc=self.tmp_store) with RollbackContext() as rollback: orig_params = {'name': 'test-template', 'memory': 1024, @@ -761,7 +761,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_update(self): - inst = model.Model('qemu:///system', + inst = model.Model(None, objstore_loc=self.tmp_store) with RollbackContext() as rollback: net_name = 'test-network' @@ -801,7 +801,7 @@ class ModelTests(unittest.TestCase): 'new-test', params) def test_vm_edit(self): - inst = model.Model('qemu:///system', + inst = model.Model(None, objstore_loc=self.tmp_store) orig_params = {'name': 'test', 'memory': '1024', 'cpus': '1', @@ -914,7 +914,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_network(self): - inst = model.Model('qemu:///system', self.tmp_store) + inst = model.Model(None, self.tmp_store) with RollbackContext() as rollback: @@ -1240,7 +1240,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_get_hostinfo(self): - inst = model.Model('qemu:///system', + inst = model.Model(None, objstore_loc=self.tmp_store) info = inst.host_lookup() distro, version, codename = platform.linux_distribution() @@ -1279,7 +1279,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_deep_scan(self): - inst = model.Model('qemu:///system', + inst = model.Model(None, objstore_loc=self.tmp_store) with RollbackContext() as rollback: path = '/tmp/kimchi-images/tmpdir' -- 1.9.3

3 3

Error in the log when using VMs not created by kimchi
by Wen Wang 08 Oct '14

08 Oct '14

Hi all, When kimchi deal with VMs that are not created by kimchi or build before we introducing "metadata", an error "metadata not found: Requested metadata element is not present" will continuously appear in the log, I have one suggestion from the feedback that is it possible to have this part removed? I mean the error message. One proper suggestion is :"Whichever function is causing that can be redirected to device called /dev/null so that it won't come to /var/log/messages". Best Regards Wang Wen

2 2

[PATCH v11 0/6] Host Device Passthrough
by Zhou Zheng Sheng 08 Oct '14

08 Oct '14

Hi all, Host device passthrough is to directly assign host device to guest exclusively, so there is no virtualization overhead, and it improves guest performance greatly. It's useful if you have a server with lots of PCIe slots and cards. This v11 patch series improve disto compatibility and device filtering. Firstly, the patches adapt to Ubuntu 14.04, RHEL 6.5, RHEL 7, Fedora 20 and Fedora 19. It just relies on libvirt node-device API, kernel vfio framework and /sys/kernel/iommu_group. So any distribution providing these features should work. On old distributions like RHEL 6.5, they are shipped with 2.6.X kernel which do not support vfio and sysfs iommu group. We also try to be compatible, but as far as we tested, the PCI passthrough feature using the traditional pci-stub + kvm approach is buggy and not mature. So in this patch series, the back-end provides a capability in /config/capabilities for the front-end to check, and then freezes PCI passthrough web UI in this case. Didn't test on SuSe, just because the author could not find a physical SuSe server. The patches should work on SuSe as long as it provides the dependencies. Secondly, there is 2 changes in PCI device filtering. Previously, we only allowed to assign the "leaf" devices to guest. For example, instead of assigning a USB controller, we assign the connected USB device. We also made a PCI device whitelist according to the class code. After some tests, we find that it's hardly useful if we only allow "leaf" device, because in many cases the user wants to assign a parent device. For example, the user may want to assign an HBA card to guest, while there are many children LUNs under this card. The PCI device code is also not a good way for checking if a device is suitable to be passed through. There are too many vendors and devices, you'll always find some "good" devices are out of the whitelist, and if we grant the relared class code, it'll introduce "bad" devices. So in this patch we just filter out video cards and PCI bridges. They are not for passthrough absolutely. We also allow to passthrough a parent device. The back-end provides API to check the affected devices if you passthrough a particular one. The affected devices are the devices in the same iommu group and their children devices. As regard to the front-end, we only implemented PCI device passthrough, PCI devices are the mostly useful and interesting devices to passthrough. The back-end actually supports passing through LUNs and USB devices. To test the patches, firstly reboot your host os, enable vt-d in BIOS. Before loading Linux kernel, append "intel_iommu=on" to kernel arguments. If you want to make it persistent, edit "grub.conf" and append it. Then just apply the patch, start Kimchi daemon, edit a shutdown guest, you'll see "Host PCI Device" tab. In the listing, select "To Add", then click "+" besides one of the device. You'll find PCI devices in the same group are also added. Then close the dialogue and start the guest. In guest OS, "lspci" can show you the passthrough devices. In future, we plan to add more helpful information to assist user. For example, when the user selects an NIC card, the front-end shows the configured IP address. When the user selects an HBA card, the front-end shows the related block devices such as sda sdb ... So the user can avoid assigning a device in use by the host. Yu Xin Huo (1): Host device passthrough (Front-end): Add PCI Devices to VM Zhou Zheng Sheng (5): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device Host device passthrough: Add unit tests and documents docs/API.md | 66 ++++++- src/kimchi/API.json | 31 +++ src/kimchi/control/host.py | 7 + src/kimchi/control/vm/hostdevs.py | 44 +++++ src/kimchi/featuretests.py | 10 +- src/kimchi/i18n.py | 8 + src/kimchi/mockmodel.py | 127 +++++++++++- src/kimchi/model/config.py | 6 +- src/kimchi/model/host.py | 48 +++-- src/kimchi/model/hostdev.py | 351 +++++++++++++++++++++++++++++++++ src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/vmhostdevs.py | 324 ++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 ++- tests/test_model.py | 31 +++ tests/test_rest.py | 12 +- tests/test_storagepool.py | 7 +- ui/css/theme-default/guest-edit.css | 86 +++++++- ui/js/src/kimchi.api.js | 55 ++++++ ui/js/src/kimchi.guest_edit_main.js | 81 ++++++++ ui/pages/guest-edit.html.tmpl | 28 +++ 21 files changed, 1312 insertions(+), 57 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/model/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.3

2 15

[PATCHv5 0/2] Repository related fixes
by lvroyce＠linux.vnet.ibm.com 07 Oct '14

07 Oct '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v3>v5, fixed style error. Royce Lv (2): Fix: Avoid passing unexpected config params to repository manager Fix: Add rollback to update repository src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 40 +++++++++++++++++++++++++--------------- tests/test_model.py | 10 ++++++++-- 4 files changed, 35 insertions(+), 18 deletions(-) -- 1.8.3.2

6 10

[PATCH] Bug 440 Fix
by huoyuxin＠linux.vnet.ibm.com 07 Oct '14

07 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> 2 Issues: 1. In menu widget, it handle the passin params incorrectly. 2. Filter out storage pools without any available volume. Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 2 +- ui/js/widgets/select-menu.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..6e01d3e 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -61,7 +61,7 @@ kimchi.guest_storage_add_main = function() { var options = []; if (result && result.length) { $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { + if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso') && storagePool.nr_volumes) { options.push({ label: storagePool.name, value: storagePool.name diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..c4b0209 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -36,8 +36,10 @@ var selectedClass = 'active'; var itemTag = 'li'; var item; + that.listControl.find('li').remove(); + that.label.text(""); + that.target.val(""); if (options.length > 0) { - that.listControl.find('li').remove(); $.each(options, function(index, option) { item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); item.data('value', option.value); @@ -58,8 +60,6 @@ that.target.change(); } }); - } else { - kimchi.message.error.code('KCHAPI6006E'); } }, -- 1.7.1

4 6

[PATCH 0/2] Delete imported websockify code
by Aline Manera 07 Oct '14

07 Oct '14

Aline Manera (2): Add websockify as Kimchi dependency Delete imported websockify code contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 7 +- src/kimchi/server.py | 2 +- src/kimchi/vnc.py | 22 +- src/kimchi/websocket.py | 982 ------------------------------------------ src/kimchi/websockify.py | 393 ----------------- 8 files changed, 22 insertions(+), 1387 deletions(-) delete mode 100644 src/kimchi/websocket.py delete mode 100755 src/kimchi/websockify.py -- 1.9.3

2 4

[PATCH] bug fix: Redirect user to the URL accessed prior to login
by Aline Manera 07 Oct '14

07 Oct '14

When a non-logged user tries to access a guest console: https://localhost:8001/vnc_auto.html?port=64667&path=?token=dWJ1bnR1MTQuMDQ… He/she will be asked to login and then he/she must be redirected back to the same URL accessed prior to login (ie, the guest console). To do that, we use the "next" query parameter. But commit 22eba438 wrongly overrided this logic by only querying the last tab visited which was redirecting user to the Kimchi main page instead of the guest console. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.login.js | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/js/src/kimchi.login.js b/ui/js/src/kimchi.login.js index f9c9af0..cacfa65 100644 --- a/ui/js/src/kimchi.login.js +++ b/ui/js/src/kimchi.login.js @@ -56,7 +56,6 @@ kimchi.login_main = function() { var lastPage = kimchi.cookie.get('lastPage'); var next_url = lastPage ? lastPage.replace(/\"/g,'') : "/"; } - var next_url = lastPage ? lastPage.replace(/\"/g,'') : "/"; kimchi.cookie.set('roles',JSON.stringify(data.roles)); window.location.replace(next_url) }, function() { -- 1.9.3

2 2

[PATCH] pep8: Use blacklist instead of whitelist
by Crístian Viana 07 Oct '14

07 Oct '14

Currently, the command "make check-local" runs the PEP8 verification rules only on files listed in a configuration files. New files must still be added manually and not all files are being checked. List the files which *shouldn't* be checked against the PEP8 rules instead of listing the files which should be checked. Also, fix the errors on those new files. The blacklisted files are: src/kimchi/{i18n,websocket,websockify}.py. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- Makefile.am | 48 ++------------------------------------------- src/kimchi/__init__.py | 2 +- src/kimchi/basemodel.py | 4 +++- src/kimchi/netinfo.py | 2 +- src/kimchi/screenshot.py | 17 +++++++++------- src/kimchi/sslcert.py | 5 +++-- src/kimchi/vmdisks.py | 6 +++--- src/kimchi/vnc.py | 2 +- src/kimchi/xmlutils.py | 2 +- tests/test_authorization.py | 20 +++++++++++-------- tests/test_exception.py | 10 +++++----- tests/test_server.py | 5 +---- tests/test_vmtemplate.py | 2 +- 13 files changed, 44 insertions(+), 81 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3293d9e..c04ba32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,51 +38,7 @@ EXTRA_DIST = \ $(NULL) -# When fixing a file to conform with pep8, add it to the WL here. -# So it will be checked from now on. -PEP8_WHITELIST = \ - plugins/__init__.py \ - plugins/sample/__init__.py \ - plugins/sample/model.py \ - src/kimchid.in \ - src/kimchi/asynctask.py \ - src/kimchi/auth.py \ - src/kimchi/cachebust.py \ - src/kimchi/config.py.in \ - src/kimchi/control/*.py \ - src/kimchi/control/vm/*.py \ - src/kimchi/disks.py \ - src/kimchi/distroloader.py \ - src/kimchi/exception.py \ - src/kimchi/featuretests.py \ - src/kimchi/imageinfo.py \ - src/kimchi/iscsi.py \ - src/kimchi/isoinfo.py \ - src/kimchi/kvmusertests.py \ - src/kimchi/mockmodel.py \ - src/kimchi/model/*.py \ - src/kimchi/objectstore.py \ - src/kimchi/osinfo.py \ - src/kimchi/proxy.py \ - src/kimchi/repositories.py \ - src/kimchi/rollbackcontext.py \ - src/kimchi/root.py \ - src/kimchi/scan.py \ - src/kimchi/server.py \ - src/kimchi/swupdate.py \ - src/kimchi/template.py \ - src/kimchi/utils.py \ - src/kimchi/vmtemplate.py \ - tests/test_config.py.in \ - tests/test_mockmodel.py \ - tests/test_model.py \ - tests/test_osinfo.py \ - tests/test_plugin.py \ - tests/test_rest.py \ - tests/test_rollbackcontext.py \ - tests/test_storagepool.py \ - tests/utils.py \ - $(NULL) +PEP8_BLACKLIST = "src/kimchi/i18n.py,src/kimchi/websocket.py,src/kimchi/websockify.py" SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" @@ -98,7 +54,7 @@ check-local: while read LINE; do echo "$$LINE"; false; done $(PEP8) --version - $(PEP8) --filename '*.py,*.py.in' $(PEP8_WHITELIST) + $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" . # Link built mo files in the source tree to enable use of translations from diff --git a/src/kimchi/__init__.py b/src/kimchi/__init__.py index 1237e99..edf8e5d 100644 --- a/src/kimchi/__init__.py +++ b/src/kimchi/__init__.py @@ -15,4 +15,4 @@ # # 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 diff --git a/src/kimchi/basemodel.py b/src/kimchi/basemodel.py index 93aab0c..096c66b 100644 --- a/src/kimchi/basemodel.py +++ b/src/kimchi/basemodel.py @@ -46,7 +46,9 @@ class BaseModel(object): class Singleton(type): _instances = {} + def __call__(cls, *args, **kwargs): if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs) + inst = super(Singleton, cls).__call__(*args, **kwargs) + cls._instances[cls] = inst return cls._instances[cls] diff --git a/src/kimchi/netinfo.py b/src/kimchi/netinfo.py index 2eaf4ac..bb50479 100644 --- a/src/kimchi/netinfo.py +++ b/src/kimchi/netinfo.py @@ -185,7 +185,7 @@ def get_interface_type(iface): def get_interface_info(iface): - if not iface in ethtool.get_devices(): + if iface not in ethtool.get_devices(): raise ValueError('unknown interface: %s' % iface) ipaddr = '' diff --git a/src/kimchi/screenshot.py b/src/kimchi/screenshot.py index 8528a39..e599d40 100644 --- a/src/kimchi/screenshot.py +++ b/src/kimchi/screenshot.py @@ -15,7 +15,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 @@ -39,6 +39,7 @@ from kimchi.utils import kimchi_log (fd, pipe) = tempfile.mkstemp() stream_test_result = None + class VMScreenshot(object): OUTDATED_SECS = 5 THUMBNAIL_SIZE = (256, 256) @@ -48,8 +49,9 @@ class VMScreenshot(object): def __init__(self, args): self.vm_uuid = args['uuid'] args.setdefault('thumbnail', - os.path.join(config.get_screenshot_path(), - '%s-%s.png' % (self.vm_uuid, str(uuid.uuid4())))) + os.path.join(config.get_screenshot_path(), + '%s-%s.png' % + (self.vm_uuid, str(uuid.uuid4())))) self.info = args @staticmethod @@ -66,8 +68,8 @@ class VMScreenshot(object): if now - last_update > self.OUTDATED_SECS: self._clean_extra(self.LIVE_WINDOW) self._generate_thumbnail() - return '/data/screenshots/%s' % os.path.basename(self.info['thumbnail']) - + return '/data/screenshots/%s' %\ + os.path.basename(self.info['thumbnail']) def _clean_extra(self, window=-1): """ @@ -77,7 +79,8 @@ class VMScreenshot(object): try: now = time.time() clear_list = glob.glob("%s/%s-*.png" % - (config.get_screenshot_path(), self.vm_uuid)) + (config.get_screenshot_path(), + self.vm_uuid)) for f in clear_list: if now - os.path.getmtime(f) > window: os.unlink(f) @@ -122,7 +125,7 @@ class VMScreenshot(object): else: counter = 0 ret = os.waitpid(pid, os.WNOHANG) - while ret == (0,0) and counter < 3: + while ret == (0, 0) and counter < 3: counter += 1 time.sleep(1) ret = os.waitpid(pid, os.WNOHANG) diff --git a/src/kimchi/sslcert.py b/src/kimchi/sslcert.py index bf4d261..e772dc8 100644 --- a/src/kimchi/sslcert.py +++ b/src/kimchi/sslcert.py @@ -19,7 +19,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 time @@ -34,6 +34,7 @@ class SSLCert(object): def _gen(self): def keygen_cb(*args): pass + def passphrase_cb(*args): return '' @@ -54,7 +55,6 @@ class SSLCert(object): subject.CN = 'kimchi' subject.O = 'kimchi-project.org' - t = long(time.time()) + time.timezone now = ASN1.ASN1_UTCTIME() now.set_time(t) @@ -80,6 +80,7 @@ class SSLCert(object): def key_pem(self): return self._key + def main(): c = SSLCert() print c.cert_text() diff --git a/src/kimchi/vmdisks.py b/src/kimchi/vmdisks.py index b61c883..f1c3f02 100644 --- a/src/kimchi/vmdisks.py +++ b/src/kimchi/vmdisks.py @@ -39,9 +39,9 @@ def get_vm_disk(dom, dev_name): # Retrieve disk xml and format return dict disk = get_device_xml(dom, dev_name) if disk is None: - raise NotFoundError( - "KCHVMSTOR0007E", - {'dev_name': dev_name, 'vm_name': dom.name()}) + raise NotFoundError("KCHVMSTOR0007E", + {'dev_name': dev_name, + 'vm_name': dom.name()}) path = "" dev_bus = disk.target.attrib['bus'] try: diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py index cfa7c6d..09a4cad 100644 --- a/src/kimchi/vnc.py +++ b/src/kimchi/vnc.py @@ -16,7 +16,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 base64 import errno diff --git a/src/kimchi/xmlutils.py b/src/kimchi/xmlutils.py index 8612e66..d3db32a 100644 --- a/src/kimchi/xmlutils.py +++ b/src/kimchi/xmlutils.py @@ -26,7 +26,7 @@ from xml.etree import ElementTree def xpath_get_text(xml, expr): doc = libxml2.parseDoc(xml) res = doc.xpathEval(expr) - ret = [None if x.children == None else x.children.content for x in res] + ret = [None if x.children is None else x.children.content for x in res] doc.freeDoc() return ret diff --git a/tests/test_authorization.py b/tests/test_authorization.py index 2c342a5..71b416f 100644 --- a/tests/test_authorization.py +++ b/tests/test_authorization.py @@ -40,7 +40,7 @@ ssl_port = None def setUpModule(): global test_server, model, host, port, ssl_port - patch_auth(sudo = False) + patch_auth(sudo=False) model = kimchi.mockmodel.MockModel('/tmp/obj-store-test') host = '127.0.0.1' port = get_free_port('http') @@ -111,23 +111,27 @@ class AuthorizationTests(unittest.TestCase): resp = self.request('/templates/test', '{}', 'DELETE') self.assertEquals(403, resp.status) - # Non-root users can only get vms authorized to them model.templates_create({'name': u'test', 'cdrom': '/nonexistent.iso'}) model.vms_create({'name': u'test-me', 'template': '/templates/test'}) - model.vm_update(u'test-me', {'users': [ kimchi.mockmodel.fake_user.keys()[0] ], 'groups': []}) + model.vm_update(u'test-me', + {'users': [kimchi.mockmodel.fake_user.keys()[0]], + 'groups': []}) - model.vms_create({'name': u'test-usera', 'template': '/templates/test'}) - model.vm_update(u'test-usera', {'users': [ 'userA' ], 'groups': []}) + model.vms_create({'name': u'test-usera', + 'template': '/templates/test'}) + model.vm_update(u'test-usera', {'users': ['userA'], 'groups': []}) - model.vms_create({'name': u'test-groupa', 'template': '/templates/test'}) - model.vm_update(u'test-groupa', {'groups': [ 'groupA' ]}) + model.vms_create({'name': u'test-groupa', + 'template': '/templates/test'}) + model.vm_update(u'test-groupa', {'groups': ['groupA']}) resp = self.request('/vms', '{}', 'GET') self.assertEquals(200, resp.status) vms_data = json.loads(resp.read()) - self.assertEquals([ u'test-groupa', u'test-me' ], sorted([ v['name'] for v in vms_data ])) + self.assertEquals([u'test-groupa', u'test-me'], + sorted([v['name'] for v in vms_data])) resp = self.request('/vms', req, 'POST') self.assertEquals(403, resp.status) diff --git a/tests/test_exception.py b/tests/test_exception.py index 90c1ea1..a533015 100644 --- a/tests/test_exception.py +++ b/tests/test_exception.py @@ -15,7 +15,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 json import os @@ -77,8 +77,8 @@ class ExceptionTests(unittest.TestCase): req = json.dumps({}) resp = json.loads(request(host, ssl_port, '/vms', req, 'POST').read()) self.assertEquals('400 Bad Request', resp.get('code')) - msg = u"KCHVM0016E: Specify a template to create a virtual machine from" - self.assertEquals(msg, resp.get('reason')) + m = u"KCHVM0016E: Specify a template to create a virtual machine from" + self.assertEquals(m, resp.get('reason')) self.assertNotIn('call_stack', resp) def test_development_env(self): @@ -106,7 +106,7 @@ class ExceptionTests(unittest.TestCase): # test 400 missing required parameter req = json.dumps({}) resp = json.loads(request(host, ssl_port, '/vms', req, 'POST').read()) - msg = u"KCHVM0016E: Specify a template to create a virtual machine from" + m = u"KCHVM0016E: Specify a template to create a virtual machine from" self.assertEquals('400 Bad Request', resp.get('code')) - self.assertEquals(msg, resp.get('reason')) + self.assertEquals(m, resp.get('reason')) self.assertIn('call_stack', resp) diff --git a/tests/test_server.py b/tests/test_server.py index 9beba6c..bebc383 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -15,7 +15,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 os import unittest @@ -24,7 +24,6 @@ import unittest import utils import kimchi.mockmodel -#utils.silence_server() class ServerTests(unittest.TestCase): def test_server_start(self): @@ -44,5 +43,3 @@ class ServerTests(unittest.TestCase): finally: os.unlink('/tmp/obj-store-test') s.stop() - - diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 4ae1d36..2a6fb8e 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -15,7 +15,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 os import unittest -- 1.9.3

3 5

[PATCH v2 0/2] pep8: Fix errors
by Crístian Viana 07 Oct '14

07 Oct '14

This is the difference between this and the previous patchset (v1): - Add the files *config.py to the PEP8 blacklist. - Split the previous patch into two separate patches: one which fixes all the files and another one which enables PEP8 for every file except the ones blacklisted. Crístian Viana (2): pep8: Fix errors in all files pep8: Use blacklist instead of whitelist Makefile.am | 48 ++------------------------------------------- src/kimchi/__init__.py | 2 +- src/kimchi/basemodel.py | 4 +++- src/kimchi/netinfo.py | 2 +- src/kimchi/screenshot.py | 17 +++++++++------- src/kimchi/sslcert.py | 5 +++-- src/kimchi/vmdisks.py | 6 +++--- src/kimchi/vnc.py | 2 +- src/kimchi/xmlutils.py | 2 +- tests/test_authorization.py | 20 +++++++++++-------- tests/test_exception.py | 10 +++++----- tests/test_server.py | 5 +---- tests/test_vmtemplate.py | 2 +- 13 files changed, 44 insertions(+), 81 deletions(-) -- 1.9.3

2 3

[PATCH v2] Display "README" with markdown style on Github
by Crístian Viana 07 Oct '14

07 Oct '14

This is the difference between this and the previous patchset (v1): - Add the Automake rule "foreign" so it doesn't look for the file "README". That was one of the requirements of a GNU (i.e. non-foreign) project. Check here for more details: http://www.gnu.org/software/automake/manual/automake.html#Strictness Crístian Viana (1): Display "README" with markdown style on Github Makefile.am | 2 ++ README | 1 - README.md | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) delete mode 120000 README create mode 120000 README.md -- 1.9.3

2 3

[PATCH 0/2] Delete imported novnc code
by Aline Manera 07 Oct '14

07 Oct '14

Aline Manera (2): Add novnc as Kimchi dependency Delete imported novnc code Makefile.am | 8 +- configure.ac | 17 - contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 18 +- contrib/kimchi.spec.suse.in | 18 +- docs/README.md | 7 +- src/kimchi/Makefile.am | 1 + src/kimchi/config.py.in | 14 +- tests/Makefile.am | 1 + tests/test_config.py.in | 14 +- ui/css/Makefile.am | 6 +- ui/css/fonts/Makefile.am | 18 - ui/css/fonts/novnc/Makefile.am | 20 - ui/css/fonts/novnc/Orbitron700.ttf | Bin 38580 -> 0 bytes ui/css/fonts/novnc/Orbitron700.woff | Bin 17472 -> 0 bytes ui/css/novnc/Makefile.am | 20 - ui/css/novnc/base.css | 405 ------ ui/js/Makefile.am | 2 +- ui/js/novnc/Makefile.am | 22 - ui/js/novnc/base64.js | 115 -- ui/js/novnc/des.js | 273 ---- ui/js/novnc/display.js | 770 ----------- ui/js/novnc/input.js | 1946 --------------------------- ui/js/novnc/jsunzip.js | 676 ---------- ui/js/novnc/main.js | 103 -- ui/js/novnc/rfb.js | 1866 ------------------------- ui/js/novnc/util.js | 381 ------ ui/js/novnc/web-socket-js/Makefile.am | 24 - ui/js/novnc/web-socket-js/README.txt | 109 -- ui/js/novnc/web-socket-js/WebSocketMain.swf | Bin 177114 -> 0 bytes ui/js/novnc/web-socket-js/swfobject.js | 4 - ui/js/novnc/web-socket-js/web_socket.js | 391 ------ ui/js/novnc/websock.js | 422 ------ ui/js/novnc/webutil.js | 216 --- ui/js/src/kimchi.api.js | 3 +- ui/pages/vnc_auto.html.tmpl | 44 - ui/pages/websockify/console.html | 2 +- 37 files changed, 41 insertions(+), 7896 deletions(-) delete mode 100644 ui/css/fonts/Makefile.am delete mode 100644 ui/css/fonts/novnc/Makefile.am delete mode 100644 ui/css/fonts/novnc/Orbitron700.ttf delete mode 100644 ui/css/fonts/novnc/Orbitron700.woff delete mode 100644 ui/css/novnc/Makefile.am delete mode 100644 ui/css/novnc/base.css delete mode 100644 ui/js/novnc/Makefile.am delete mode 100644 ui/js/novnc/base64.js delete mode 100644 ui/js/novnc/des.js delete mode 100644 ui/js/novnc/display.js delete mode 100644 ui/js/novnc/input.js delete mode 100755 ui/js/novnc/jsunzip.js delete mode 100644 ui/js/novnc/main.js delete mode 100644 ui/js/novnc/rfb.js delete mode 100644 ui/js/novnc/util.js delete mode 100644 ui/js/novnc/web-socket-js/Makefile.am delete mode 100644 ui/js/novnc/web-socket-js/README.txt delete mode 100644 ui/js/novnc/web-socket-js/WebSocketMain.swf delete mode 100644 ui/js/novnc/web-socket-js/swfobject.js delete mode 100644 ui/js/novnc/web-socket-js/web_socket.js delete mode 100644 ui/js/novnc/websock.js delete mode 100644 ui/js/novnc/webutil.js delete mode 100644 ui/pages/vnc_auto.html.tmpl -- 1.9.3

1 3

[PATCH] Remove static qemu URIs and add function to lookup the system URI
by bbaude＠redhat.com 06 Oct '14

06 Oct '14

From: Brent Baude <bbaude(a)redhat.com> This patch removes the static QEMU URIs that are defined and replaces them with a function to lookup the system URI. This helps Kimchi work with a remote libvirtd. --- src/kimchi/config.py.in | 4 ++-- src/kimchi/featuretests.py | 10 +++++----- src/kimchi/kvmusertests.py | 3 ++- src/kimchi/model/libvirtconnection.py | 25 +++++++++++++++++++++++++ src/kimchi/model/model.py | 6 +++--- src/kimchi/model/networks.py | 2 +- tests/test_model.py | 17 +++++++++-------- 7 files changed, 47 insertions(+), 20 deletions(-) diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index 91e5f48..51cd442 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -23,7 +23,6 @@ import os import platform import threading - from ConfigParser import SafeConfigParser @@ -61,8 +60,9 @@ def get_version(): def find_qemu_binary(find_emulator=False): + from kimchi.model.libvirtconnection import LibvirtConnection try: - connect = libvirt.open('qemu:///system') + connect = libvirt.open(LibvirtConnection.getSystemURI()) except Exception, e: raise Exception("Unable to get qemu binary location: %s" % e) try: diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 8964098..a2a942b 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -27,7 +27,7 @@ import threading from lxml.builder import E - +from kimchi.model.libvirtconnection import LibvirtConnection from kimchi.rollbackcontext import RollbackContext from kimchi.utils import kimchi_log @@ -104,7 +104,7 @@ class FeatureTests(object): conn = None try: FeatureTests.disable_screen_error_logging() - conn = libvirt.open('qemu:///system') + conn = libvirt.open(LibvirtConnection.getSystemURI()) dom = conn.defineXML(xml) dom.undefine() return True @@ -122,7 +122,7 @@ class FeatureTests(object): xml = ET.tostring(obj) return xml try: - conn = libvirt.open('qemu:///system') + conn = libvirt.open(LibvirtConnection.getSystemURI()) FeatureTests.disable_screen_error_logging() conn.findStoragePoolSources('netfs', _get_xml(), 0) except libvirt.libvirtError as e: @@ -174,7 +174,7 @@ class FeatureTests(object): def libvirt_support_fc_host(): try: FeatureTests.disable_screen_error_logging() - conn = libvirt.open('qemu:///system') + conn = libvirt.open(LibvirtConnection.getSystemURI()) pool = None pool = conn.storagePoolDefineXML(SCSI_FC_XML, 0) except libvirt.libvirtError as e: @@ -194,7 +194,7 @@ class FeatureTests(object): with RollbackContext() as rollback: FeatureTests.disable_screen_error_logging() rollback.prependDefer(FeatureTests.enable_screen_error_logging) - conn = libvirt.open('qemu:///system') + conn = libvirt.open(LibvirtConnection.getSystemURI()) rollback.prependDefer(conn.close) dom = conn.defineXML(SIMPLE_VM_XML) rollback.prependDefer(dom.undefine) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 1ac2beb..ae1df25 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -24,6 +24,7 @@ import libvirt from kimchi.rollbackcontext import RollbackContext +from kimchi.model.libvirtconnection import LibvirtConnection class UserTests(object): @@ -49,7 +50,7 @@ class UserTests(object): xml = cls.SIMPLE_VM_XML % (vm_name, vm_uuid) with RollbackContext() as rollback: - conn = libvirt.open('qemu:///system') + conn = libvirt.open(LibvirtConnection.getSystemURI()) rollback.prependDefer(conn.close) dom = conn.defineXML(xml) rollback.prependDefer(dom.undefine) diff --git a/src/kimchi/model/libvirtconnection.py b/src/kimchi/model/libvirtconnection.py index 80348a3..bac276f 100644 --- a/src/kimchi/model/libvirtconnection.py +++ b/src/kimchi/model/libvirtconnection.py @@ -117,3 +117,28 @@ class LibvirtConnection(object): # However the values need to be considered wisely to not affect # hosts which are hosting a lot of virtual machines return conn + + @staticmethod + def getSystemURI(): + """ + This method looks up the livbirt URI for the system instead of + relying on a statically defined URI. + """ + try: + uriconn = libvirt.openReadOnly(None) + return uriconn.getURI() + except: + err = 'Unable to connect to libvirtd to determine the URI' + kimchi_log.error(err) + + @staticmethod + def isQemuURI(libvirt_uri): + """ + This method will return True or Value when the system libvirt + URI is a qemu based URI. For example: + qemu:///system or qemu+tcp://someipaddress/system + """ + if libvirt_uri.startswith('qemu'): + return True + else: + return False diff --git a/src/kimchi/model/model.py b/src/kimchi/model/model.py index ac70852..b8b2f9d 100644 --- a/src/kimchi/model/model.py +++ b/src/kimchi/model/model.py @@ -38,12 +38,12 @@ DEFAULT_POOLS = {'default': {'path': '/var/lib/libvirt/images'}, class Model(BaseModel): - def __init__(self, libvirt_uri='qemu:///system', objstore_loc=None): + def __init__(self, libvirt_uri=LibvirtConnection.getSystemURI(), + objstore_loc=None): self.objstore = ObjectStore(objstore_loc) self.conn = LibvirtConnection(libvirt_uri) kargs = {'objstore': self.objstore, 'conn': self.conn} - - if 'qemu:///' in libvirt_uri: + if (self.conn.isQemuURI(libvirt_uri)): for pool_name, pool_arg in DEFAULT_POOLS.iteritems(): self._default_pool_check(pool_name, pool_arg) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 0ea9449..f01bed0 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -41,7 +41,7 @@ KIMCHI_BRIDGE_PREFIX = 'kb' class NetworksModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] - if 'qemu:///' in self.conn.get().getURI(): + if self.conn.isQemuURI(self.conn.get().getURI()): self._default_network_check() def _default_network_check(self): diff --git a/tests/test_model.py b/tests/test_model.py index 1f2e79c..e23acf3 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -44,6 +44,7 @@ from kimchi.model import model from kimchi.rollbackcontext import RollbackContext from kimchi.utils import add_task +from kimchi.model.libvirtconnection import LibvirtConnection invalid_repository_urls = ['www.fedora.org', # missing protocol '://www.fedora.org', # missing protocol @@ -457,7 +458,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_storagepool(self): - inst = model.Model('qemu:///system', self.tmp_store) + inst = model.Model(LibvirtConnection.getSystemURI(), self.tmp_store) poolDefs = [ {'type': 'dir', @@ -524,7 +525,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_storagevolume(self): - inst = model.Model('qemu:///system', self.tmp_store) + inst = model.Model(LibvirtConnection.getSystemURI(), self.tmp_store) with RollbackContext() as rollback: path = '/tmp/kimchi-images' @@ -742,7 +743,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_clone(self): - inst = model.Model('qemu:///system', + inst = model.Model(LibvirtConnection.getSystemURI(), objstore_loc=self.tmp_store) with RollbackContext() as rollback: orig_params = {'name': 'test-template', 'memory': 1024, @@ -761,7 +762,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_update(self): - inst = model.Model('qemu:///system', + inst = model.Model(LibvirtConnection.getSystemURI(), objstore_loc=self.tmp_store) with RollbackContext() as rollback: net_name = 'test-network' @@ -801,7 +802,7 @@ class ModelTests(unittest.TestCase): 'new-test', params) def test_vm_edit(self): - inst = model.Model('qemu:///system', + inst = model.Model(LibvirtConnection.getSystemURI(), objstore_loc=self.tmp_store) orig_params = {'name': 'test', 'memory': '1024', 'cpus': '1', @@ -914,7 +915,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_network(self): - inst = model.Model('qemu:///system', self.tmp_store) + inst = model.Model(LibvirtConnection.getSystemURI(), self.tmp_store) with RollbackContext() as rollback: @@ -1240,7 +1241,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_get_hostinfo(self): - inst = model.Model('qemu:///system', + inst = model.Model(LibvirtConnection.getSystemURI(), objstore_loc=self.tmp_store) info = inst.host_lookup() distro, version, codename = platform.linux_distribution() @@ -1279,7 +1280,7 @@ class ModelTests(unittest.TestCase): @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_deep_scan(self): - inst = model.Model('qemu:///system', + inst = model.Model(LibvirtConnection.getSystemURI(), objstore_loc=self.tmp_store) with RollbackContext() as rollback: path = '/tmp/kimchi-images/tmpdir' -- 1.9.3

3 2

Why do we use mockmodel?
by Crístian Viana 03 Oct '14

03 Oct '14

Hi! After creating a few patches for Kimchi, it occurred to me that the mockmodel design has more cons than pros. So I started wondering why we still use it. I understand - and totally agree - that we should have an extensive test infrastructure to make sure the code runs as designed and to make it very easy to find regression bugs on every new feature we implement. And as Kimchi works very integrated to its host system, it may not be easy to create expected/failed situations for things we don't always have control. But for every new feature we implement, we currently have to: 1) Implement the feature itself 2) Create tests for (1) 3) Implement the feature in a mock environment 4) Create tests for (3) And by looking at some existing code, many of the mock tests don't actually test anything. They're just there so we can say we have a mock implementation and a test for it. Why create a mock function and a test for the mock function if what we need is to test the real code? And a lot of times, the mock implementation (and the tests) are just copy/paste of the original feature. For me, that seems very tedious and useless. Why don't we get rid of the mockmodel and keep only the "real" model? I understand that it's not so simple to remove it right away, that's why I'm starting this discussion so we could see how to do it better - if we're actually going to do it. What would we miss if we didn't have the mockmodel anymore? I believe we'll need to be more careful when writing tests which run on a real environment (i.e. we can't "leak" VMs, networks, templates, or anything else) but at least we'll always test real code and we won't be writing code that won't be used. Please share your opinion with us. Best regards, Crístian.

2 2

[PATCH] Display "README" with markdown style on Github
by Crístian Viana 03 Oct '14

03 Oct '14

The file "README" is a markdown file but as it doesn't have the suffix ".md", Github doesn't render it with markdown style. Rename the symlink "README" in order to be displayed with markdown style on Github. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- README | 1 - README.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 README create mode 120000 README.md diff --git a/README b/README deleted file mode 120000 index 0e01b43..0000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/README.md \ No newline at end of file diff --git a/README.md b/README.md new file mode 120000 index 0000000..0e01b43 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +docs/README.md \ No newline at end of file -- 1.9.3

2 2

[PATCH] Backend support for templates with sockets, cores, and threads
by Christy Perez 03 Oct '14

03 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 7 +++++++ src/kimchi/API.json | 28 ++++++++++++++++++++++++++-- src/kimchi/control/templates.py | 11 ++++++++--- src/kimchi/osinfo.py | 2 +- src/kimchi/vmtemplate.py | 22 ++++++++++++++++++++++ 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/docs/API.md b/docs/API.md index d75c55f..cb4d541 100644 --- a/docs/API.md +++ b/docs/API.md @@ -200,6 +200,13 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c3fc5e3..d510634 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,28 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "number" + }, + "cores": { + "type": "number" + }, + "threads": { + "type": "number" + } + }, + "required": [ "sockets", "cores", "threads" ] + } + } } }, "properties": { @@ -438,7 +460,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -608,7 +631,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..5ef35ce 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,13 +38,14 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, + return_data = { + 'name': self.ident, 'icon': self.info['icon'], 'invalid': self.info['invalid'], 'os_distro': self.info['os_distro'], @@ -56,4 +57,8 @@ def data(self): 'storagepool': self.info['storagepool'], 'networks': self.info['networks'], 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + 'graphics': self.info['graphics'] + } + if (self.info.get('cpu_info')): + return_data['cpu_info'] = self.info['cpu_info'] + return return_data diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 1ad353c..8492bb7 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,7 +32,7 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, +common_spec = {'cpus': 1, 'cpu_sockets': '1', 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 761bac5..c64e61d 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -359,6 +359,22 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is not None: + cpu_topo = cpu_info.get('topology') + if cpu_topo is not None: + return """ + <cpu> + <topology sockets='%(sockets)s' + cores='%(cores)s' + threads='%(threads)s'/> + </cpu> + """ % cpu_topo + + return "" + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -371,6 +387,11 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + if params.get('cpu_info') is not None: + params['cpu_info'] = self._get_cpu_xml() + else: + params['cpu_info'] = '' + # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) storage_type = self._get_storage_type() @@ -401,6 +422,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

2 6

A question about iSCSI storage pool
by Yu Xin Huo 03 Oct '14

03 Oct '14

I got a iSCSI target to work on my redhat with a USB disk to test iSCSI storage pool and found below: 1. When create a iSCSI storage pool, I selected a target in dropdown list. 2. Once the pool is created, I see a volume named 'unit:0:0:1'. 3. When edit template, in the 'storage pool' dropdown, 'unit:0:0:1' is listed there. So 'unit:0:0:1' which indeed is a *volume* but listed as a *pool* in template? or something I am misunderstanding?

2 5

Kimchi UI design proposals
by Don S. Spangler 02 Oct '14

02 Oct '14

I recently created a page on the Kimchi wiki (UI Design Proposals <https://github.com/kimchi-project/kimchi/wiki/UI-Design-Proposals>) around developing a set of UI design proposals with the following goals: * Provide a complete user interface and visual style for all major tabs and tasks * Maintain clean design and interactions in keeping with Kimchi directions * Design flexible framework to allow for consistency when adding new capabilities * Enable design to support responsiveness and touch / mobile (tablet / phone) interactions We plan on making iterative updates to the screens and would like to open it up to feedback. The initial focus has been the major content areas (host, guest, template, storage, and networks) and will be working on details of the interactions, including page level blueprints. The layouts to support responsiveness are particularly important and would be part of the next updates. We look forward to your feedback, including areas that may need more clarification and issues around implementation. Thanks! Don Spangler

3 2

[PATCH] Addition of custom mac address field for interfaces v3
by bbaude＠redhat.com 01 Oct '14

01 Oct '14

From: Brent Baude <bbaude(a)redhat.com> Fixed json issue and included comments from pvital --- docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ src/kimchi/control/vms.py | 2 +- src/kimchi/exception.py | 1 - src/kimchi/i18n.py | 4 ++++ src/kimchi/model/vmifaces.py | 38 +++++++++++++++++++++++++++++-------- tests/test_model.py | 12 ++++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 10 files changed, 76 insertions(+), 21 deletions(-) diff --git a/docs/API.md b/docs/API.md index b679ce7..4f92eaa 100644 --- a/docs/API.md +++ b/docs/API.md @@ -221,6 +221,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom MAC address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b8604d2..e46aedc 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,12 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string", + "pattern": "^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$", + "error": "KCHVMIF0009E" } } }, diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 88d8a81..627f1cc 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -36,7 +36,7 @@ class VM(Resource): super(VM, self).__init__(model, ident) self.role_key = 'guests' self.update_params = ["name", "users", "groups", "cpus", "memory", - "graphics"] + "graphics", "custommac"] self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' for ident, node in sub_nodes.items(): diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 039152a..7ab1878 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -46,7 +46,6 @@ class KimchiException(Exception): msg = self._get_translation() else: msg = _messages.get(code, code) - msg = unicode(msg, 'utf-8') % args pattern = "%s: %s" % (code, msg) Exception.__init__(self, pattern) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..8690657 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,10 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("Invalid MAC address format. Expected a 12 character hexadecimal value separated by colons(:)"), + "KCHVMIF0010E": _("The custom MAC address %(value) is already in use on this guest"), + "KCHVMIF0011E": _("Libvirt requires a unicast MAC address which %(value) is not."), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..ef67d34 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,20 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def checkduplicatemacs(vm, custommac): + macs = self.get_list(vm) + if custommac in macs: + raise InvalidParameter("KCHVMIF0010E", {'custommac': mac}) + + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + raise InvalidParameter("KCHVMIF0009E", {'custommac': mac}) + else: + # Checking for multicast + if (int(mymac.split(":")[0], 16) & 0x1) == 1: + raise InvalidParameter("KCHVMIF0011E", {'custommac': mac}) + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -56,14 +71,22 @@ class VMIfacesModel(object): if DOM_STATE_MAP[dom.info()[0]] != "shutoff": raise InvalidOperation("KCHVMIF0003E") - macs = (iface.mac.get('address') - for iface in self.get_vmifaces(vm, self.conn)) - - mac = randomMAC() - while True: - if mac not in macs: - break + if 'custommac' not in params: + macs = (iface.mac.get('address') + for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + while True: + if mac not in macs: + break + mac = randomMAC() + + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + validMac(mac) + checkduplicatemacs(vm, mac) children = [E.mac(address=mac)] ("network" in params.keys() and @@ -75,7 +98,6 @@ class VMIfacesModel(object): xml = etree.tostring(E.interface(*children, **attrib)) dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - return mac @staticmethod diff --git a/tests/test_model.py b/tests/test_model.py index ceedc6f..59c3e50 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,18 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + self.assertRaises(InvalidParameter, inst.vmifaces_create, + 'kimchi-ifaces', iface_args) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c281289..7baf296 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -176,7 +176,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -215,20 +218,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

3 3

[PATCH] Addition of custom mac address field for interfaces v3
by bbaude＠redhat.com 01 Oct '14

01 Oct '14

From: Brent Baude <bbaude(a)redhat.com> Add tests and regex to json per peer review. Also changed the error type to InvalidParameter --- docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ src/kimchi/control/vms.py | 2 +- src/kimchi/exception.py | 3 ++- src/kimchi/i18n.py | 4 ++++ src/kimchi/model/vmifaces.py | 38 +++++++++++++++++++++++++++++-------- tests/test_model.py | 12 ++++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 10 files changed, 78 insertions(+), 21 deletions(-) diff --git a/docs/API.md b/docs/API.md index b679ce7..4f92eaa 100644 --- a/docs/API.md +++ b/docs/API.md @@ -221,6 +221,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom MAC address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b8604d2..e46aedc 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,12 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string", + "pattern": "^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$", + "error": "KCHVMIF0009E" } } }, diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 88d8a81..627f1cc 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -36,7 +36,7 @@ class VM(Resource): super(VM, self).__init__(model, ident) self.role_key = 'guests' self.update_params = ["name", "users", "groups", "cpus", "memory", - "graphics"] + "graphics", "custommac"] self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' for ident, node in sub_nodes.items(): diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index 039152a..ebe03ae 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -46,7 +46,8 @@ class KimchiException(Exception): msg = self._get_translation() else: msg = _messages.get(code, code) - + print msg + print args msg = unicode(msg, 'utf-8') % args pattern = "%s: %s" % (code, msg) Exception.__init__(self, pattern) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..86f4e50 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,10 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("The custom MAC address is not properly formatted as 12 character hexadecimal value separated by colons(:)"), + "KCHVMIF0010E": _("The custom MAC address is already in use on this guest"), + "KCHVMIF0011E": _("Libvirt requires you use a unicast MAC address."), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..ef67d34 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,20 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def checkduplicatemacs(vm, custommac): + macs = self.get_list(vm) + if custommac in macs: + raise InvalidParameter("KCHVMIF0010E", {'custommac': mac}) + + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + raise InvalidParameter("KCHVMIF0009E", {'custommac': mac}) + else: + # Checking for multicast + if (int(mymac.split(":")[0], 16) & 0x1) == 1: + raise InvalidParameter("KCHVMIF0011E", {'custommac': mac}) + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -56,14 +71,22 @@ class VMIfacesModel(object): if DOM_STATE_MAP[dom.info()[0]] != "shutoff": raise InvalidOperation("KCHVMIF0003E") - macs = (iface.mac.get('address') - for iface in self.get_vmifaces(vm, self.conn)) - - mac = randomMAC() - while True: - if mac not in macs: - break + if 'custommac' not in params: + macs = (iface.mac.get('address') + for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + while True: + if mac not in macs: + break + mac = randomMAC() + + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + validMac(mac) + checkduplicatemacs(vm, mac) children = [E.mac(address=mac)] ("network" in params.keys() and @@ -75,7 +98,6 @@ class VMIfacesModel(object): xml = etree.tostring(E.interface(*children, **attrib)) dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - return mac @staticmethod diff --git a/tests/test_model.py b/tests/test_model.py index ceedc6f..59c3e50 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,18 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + self.assertRaises(InvalidParameter, inst.vmifaces_create, + 'kimchi-ifaces', iface_args) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c281289..7baf296 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -176,7 +176,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -215,20 +218,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

2 1

Proposals for next release
by Aline Manera 01 Oct '14

01 Oct '14

Hi all, I'd like to share with you what I have in mind for the next release. Most of the items listed below have already come up on ML before. *A) Upload file to storage pool* In the current code, the upload function is disabled as it does not work well with files larger than 500MB. When trying to upload a file with 500MB the browser stops responding and after some time it crashes. From a quick investigation, I identified it happens prior to send the data to server: var uploadFile = function() { var blobFile = $(localFileBox)[0].files[0]; var fileName = blobFile.name; var fd = new FormData(); fd.append('name', fileName); *fd.append('file', blobFile)* .... } We need check if there is a way to solve it on UI by changing the data structure or how it is loaded or think about a solution involving backend. *B) Reduce imported code* Kimchi imports some code: python-websockets, novnc, spice and jquery libs Some of them (to don't say most of them) are already packaged in some Linux distributions (Fedora, Ubuntu, etc) We should check the availability of those packages in the all supported distros and when possible remove the imported code from git repository and add it as a dependency. *It is a requirement**to have Kimchi on Fedora.* *C) MockModel refactor* The mockmodel was designed to provide a way to user tests Kimchi without affecting the system (by "kimchid --test") and also to make the tests easier to do. But in fact, we have a bunch of code that completely differs from the real model, so the developer needs to do 2 kinds of implementations while developing a new feature. My proposal is simplify that by using Model() with "test:///default" URI. This configuration does not affect the system in real and also can provide us a way to test the new feature in a closer scenario to the real one: by connecting to libvirt and doing the operations. As you may know "test:///default" driver has some limitations that prevents some operations, for example, screenshots. To solve it we could only override what is not supported by this driver and create a simpler mockmodel. Example: class MockModel(Model): super(Model, self).__init__("test:///default") def vmscreenshot_lookup(): # do some mock code I think in this way we will have a significant reduction in our mockmodel code. *D) VM Template refactor* More and more the user will be able to change the VM configuration and it implies in generating a XML code related to the new item to be attached to the VM. But it is also done in the Template level. Because that we have a lot of duplicated code related to the XML generation on VM and Template. Some of them using etree.builder and others using pure strings. My idea is to create a xml python module to hold all the XML manipulation about to element type. Example: src/kimchi/xml/iface.py src/kimchi/xml/disk.py src/kimchi/xml/graphics.py src/kimchi/xml/domain.py Each of these files will be responsible to handle the XML generation and manipulation using *etree*. Then when needed, while changing VM configuration or Template, we use the same code from our xml module. *E) Allow user adds volumes from different pools to a Template* *(depends on D)* Today the user can only use one disk in a Template. We should provide a way to user select multiple volumes from different storage pools in a Template. The user should be able to specific a pool and a disk size to Kimchi automatically creates a volume according to those inputs. So user can specify a pool and a volume OR a pool and a disk size. From UI perspective, we will need a bigger refactor on it. Maybe displaying the Template information in tabs (the same way we did when editing a VM) *F) Guest disk hot plug* *(depends on D)* Allow attaching a disk to a running guest. *G) PCI passthrough* *H) SMT support* Kimchi should enable SMT on guests when it improves performance according to host architecture and choose the best configuration to user (SMT8, 4 or 2) This kind of information must not be prompted to user as it is only for expert users and can block entry level users (our main focus) So our algorithm must be good enough to do the right choice according to host and guest configuration. *I) Snapshot support* Allow users create, revert and delete a snapshot. *J) Guest cloning* *K) LDAP authentication support* We need to think also how to enable authorization on a LDAP authentication. In my first view, I think we need to provide a way to sysadmin lists the IDs to have admin role in the Kimchi config file. What about the groups? Should we use LDAP domains instead of groups? And we also need to change UI when setting users and groups, as there is no way to list all users in a LDAP server. On Kimchi configuration file we can have an authentication section like below: [authentication] method = pam | ldap ldap_server = ldap_search = ldap_domain = ldap_admin_users = *L) Allow user changes graphics type on guest* User should be able to change from VNC to Spice on a existing guest *M) Add support for serial console* *N) Live migration* Start some investigation on how to do that ---- Yeap! A lot of cool features and just a piece of our backlog... ;-) That is a brainstorm. So please, your comments/suggestions are more than welcome! Thanks, Aline Manera

1 0