March 2015 - Kimchi-devel - oVirt List Archives

[PATCH] Update host number of cpus and total physical memory information
by Jose Ricardo Ziviani 23 Mar '15

23 Mar '15

- The number of cpus and the total physical memory information displayed in the host section can change, so them cannot be static. This commit updates those values whenever a GET request hits the backend looking for host information. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 4419bb3..db14a28 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -87,8 +87,9 @@ class HostModel(object): res['cpu_model'] = line.split(':')[1].strip() break - res['cpus'] = psutil.NUM_CPUS - res['memory'] = psutil.TOTAL_PHYMEM + res['cpus'] = 0 + res['memory'] = 0L + self._update_host_info(res) # Include IBM PowerKVM name to supported distro names _sup_distros = platform._supported_dists + ('ibm_powerkvm',) @@ -101,7 +102,15 @@ class HostModel(object): return res + def _update_host_info(self, host_info): + if not isinstance(host_info, dict): + return + + host_info['cpus'] = psutil._psplatform.get_num_cpus() + host_info['memory'] = psutil.phymem_usage().total + def lookup(self, *name): + self._update_host_info(self.host_info) return self.host_info def swupdate(self, *name): -- 1.9.1

3 5

Entering hard code freeze for 1.4.1 release
by Aline Manera 23 Mar '15

23 Mar '15

Hi all, We are entering the hard code freeze phase for 1.4.1 release. Which means only critical bug fixes will be merged in the next days. Please, check which issues are still targeted for this release at: https://github.com/kimchi-project/kimchi/milestones/Kimchi%201.4.1 I'd also want to ask your help to update the translations files. Thanks, Aline Manera

2 3

[PATCH 0/3 v2] unit tests - Power arch fixes
by Daniel Henrique Barboza 20 Mar '15

20 Mar '15

v2: - make the import change in test_osinfo.py - changed self.kimchi_iso path in test_model.py This patch set contains fixes to several unit tests that had somewhat the same root cause - the differences between x86 and power/ppc64le in osinfo.py template configurations. Daniel Henrique Barboza (3): tests/test_osinfo.py: fixes for Power architecture Kimchi tests: Power system fixes - removing hardcoded values test/test_model: Power architecture fixes src/kimchi/osinfo.py | 9 +++++++++ tests/iso_gen.py | 3 ++- tests/test_mockmodel.py | 4 +++- tests/test_model.py | 12 +++++++----- tests/test_osinfo.py | 36 ++++++++++++++++++++++++++---------- tests/test_rest.py | 6 ++++-- tests/test_vmtemplate.py | 8 ++++++-- 7 files changed, 57 insertions(+), 21 deletions(-) -- 1.9.3

2 5

[PATCH] Specify user when changing VM disks permission
by Crístian Viana 20 Mar '15

20 Mar '15

Before starting a virtual machine, Kimchi updates the VM disks permissions so libvirt can read them appropriately. However, the correct user isn't being passed as a parameter, and the function never actually changes the file's ACL to something useful. Set the correct user when changing disk files' permissions. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 4c5f443..86c173f 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -33,6 +33,7 @@ from kimchi import model, vnc from kimchi.config import READONLY_POOL_TYPE, config from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed +from kimchi.kvmusertests import UserTests from kimchi.model.config import CapabilitiesModel from kimchi.model.tasks import TaskModel from kimchi.model.templates import TemplateModel @@ -946,8 +947,10 @@ class VMModel(object): xml = dom.XMLDesc(0) xpath = "/domain/devices/disk[@device='cdrom']/source/@file" isofiles = xpath_get_text(xml, xpath) + + user = UserTests.probe_user() for iso in isofiles: - run_setfacl_set_attr(iso) + run_setfacl_set_attr(iso, user=user) dom = self.get_vm(name, self.conn) try: -- 2.1.0

2 1

[PATCH] issue #518: Simplify template URL verification
by Crístian Viana 20 Mar '15

20 Mar '15

When using Kimchi via the UI, the browser checks whether the template URL is valid using a regular expression. However, that regexp doesn't match every valid URL out there and it causes problems on some browsers (e.g. the latest Firefox ESR). Use a simpler URL validation when creating new templates (i.e. only validate the possible web protocols). Even if a non-existing/invalid URL passes this validation, it will still be checked in the backend. Fix issue #518 (Unable to download ISO to storage pool on Firefox 31.3.0 ESR). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 6223c96..46c4f84 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -425,19 +425,9 @@ kimchi.template_add_main = function() { }; kimchi.template_check_url = function(url) { - var protocols = "((https|http|ftp|ftps|tftp)?://)?", - userinfo = "(([0-9a-z_!~*'().&=+$%-]+:)?[0-9a-z_!~*'().&=+$%-]+@)?", - ip = "(\\d{1,3}\.){3}\\d{1,3}", - domain = "([0-9a-z_!~*'()-]+\.)*([0-9a-z][0-9a-z-]{0,61})?[0-9a-z]\.[a-z]{2,6}", - port = "(:\\d{1,5})?", - address = "(/[\\w!~*'().;?:@&=+$,%#-]+)+", - domaintype = [ protocols, userinfo, domain, port, address ], - ipType = [ protocols, userinfo, ip, port, address ], - validate = function(type) { - return new RegExp('^' + type.join('') + '$'); - }; + var reg = /(https|http|ftp|ftps|tftp):\/\//; if (url.constructor === String) { - return validate(domaintype).test(url) || validate(ipType).test(url); + return reg.test(url); } return false; }; -- 2.1.0

2 1

[PATCH v2 0/3] Fix storage volume issues
by Crístian Viana 20 Mar '15

20 Mar '15

This is the changelog between this and the previous patchset: - Instead of removing the ISO permission check at all, update it so the file's ACL is correctly updated before checking its permission; Crístian Viana (3): issue #565: Allow a template's ISO to be a block device issue #564: Parse logical volumes to find out their actual formats Update ISO file's ACL before checking its permission src/kimchi/isoinfo.py | 7 +++++-- src/kimchi/model/storagevolumes.py | 19 ++++++++++++++++++- src/kimchi/model/templates.py | 20 ++++++++++++-------- src/kimchi/vmtemplate.py | 10 ++++++++-- 4 files changed, 43 insertions(+), 13 deletions(-) -- 2.1.0

2 4

[PATCH 0/2] Fix ISO streaming and tests cases
by Aline Manera 20 Mar '15

20 Mar '15

Depends on [Kimchi-devel] [PATCH] Fix issue #597: Get the right arch when using libvirt Test driver Aline Manera (2): Bug fix: Consider server is being started up on servermethod function Fix test_model.py to reset Singleton classes when initializing the tests src/kimchi/utils.py | 3 ++- tests/test_model.py | 51 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 36 insertions(+), 18 deletions(-) -- 2.1.0

3 5

[PATCH] Use the right firewall-cmd command to open Kimchi ports
by Aline Manera 20 Mar '15

20 Mar '15

When trying to open Kimchi ports following the instructions on README on RHEL 7.1 I got the following error: [root@rhel7-vm ~]# sudo firewall-cmd --add-port=8000 --permanent bad port (most likely missing protocol), correct syntax is portid[-portid]/protocol The same behavior was identified on Fedora 21. So update the firewall-cmd commands to properly guide user on opening Kimchi ports. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index 4b14814..5407264 100644 --- a/docs/README.md +++ b/docs/README.md @@ -145,9 +145,9 @@ If you cannot access Kimchi, take a look at these 2 points: Kimchi uses by default the ports 8000, 8001 and 64667. To allow incoming connections: For system using firewalld, do: - sudo firewall-cmd --add-port 8000 --permanent - sudo firewall-cmd --add-port 8001 --permanent - sudo firewall-cmd --add-port 64667 --permanent + sudo firewall-cmd --add-port=8000/tcp --permanent + sudo firewall-cmd --add-port=8001/tcp --permanent + sudo firewall-cmd --add-port=64667/tcp --permanent sudo firewall-cmd --reload For openSUSE systems, do: -- 2.1.0

2 2

[PATCH] Fix issue #597: Get the right arch when using libvirt Test driver
by Aline Manera 20 Mar '15

20 Mar '15

libvirt Test driver only supports i686 arch. So fix feature tests to get the right arch according to libvirt driver. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/featuretests.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index f22fada..4aac8ed 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -20,13 +20,13 @@ import cherrypy import libvirt import lxml.etree as ET +import platform import socket import subprocess import threading from lxml.builder import E -from kimchi import osinfo from kimchi.rollbackcontext import RollbackContext from kimchi.utils import kimchi_log, run_command, servermethod @@ -102,8 +102,9 @@ class FeatureTests(object): @staticmethod def libvirt_supports_iso_stream(conn, protocol): - domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - arch = osinfo.defaults['arch'] + conn_type = conn.getType().lower() + domain_type = 'test' if conn_type == 'test' else 'kvm' + arch = 'i686' if conn_type == 'test' else platform.machine() arch = 'ppc64' if arch == 'ppc64le' else arch xml = ISO_STREAM_XML % {'name': FEATURETEST_VM_NAME, 'domain': domain_type, 'protocol': protocol, @@ -198,8 +199,9 @@ class FeatureTests(object): with RollbackContext() as rollback: FeatureTests.disable_libvirt_error_logging() rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) - domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - arch = osinfo.defaults['arch'] + conn_type = conn.getType().lower() + domain_type = 'test' if conn_type == 'test' else 'kvm' + arch = 'i686' if conn_type == 'test' else platform.machine() arch = 'ppc64' if arch == 'ppc64le' else arch dom = conn.defineXML(SIMPLE_VM_XML % {'name': FEATURETEST_VM_NAME, 'domain': domain_type, -- 2.1.0

3 3

[PATCH] Fix issue #617: Base URL may be an empty string when updating YUM repo
by Aline Manera 20 Mar '15

20 Mar '15

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 +- src/kimchi/repositories.py | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index df5422f..e4e1a89 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -298,7 +298,7 @@ messages = { "KCHREPOS0010E": _("GPG key must be a URL pointing to the ASCII-armored file."), "KCHREPOS0011E": _("Could not update repository %(repo_id)s."), "KCHREPOS0012E": _("Repository %(repo_id)s does not exist."), - "KCHREPOS0013E": _("Specify repository base URL or mirror list in order to create a YUM repository."), + "KCHREPOS0013E": _("Specify repository base URL or mirror list in order to create or update a YUM repository."), "KCHREPOS0014E": _("Repository management tool was not recognized for your system."), "KCHREPOS0015E": _("Repository %(repo_id)s is already enabled."), "KCHREPOS0016E": _("Repository %(repo_id)s is already disabled."), diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index f826ac9..f1e1eb3 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -269,19 +269,25 @@ class YumRepo(object): if repo_id not in repos.repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) - config = params.get('config', {}) entry = repos.getRepo(repo_id) baseurl = params.get('baseurl', None) + config = params.get('config', {}) mirrorlist = config.get('mirrorlist', None) + if len(baseurl.strip()) == 0: + baseurl = None + + if len(mirrorlist.strip()) == 0: + mirrorlist = None + + if baseurl is None and mirrorlist is None: + raise MissingParameter("KCHREPOS0013E") + if baseurl is not None: validate_repo_url(baseurl) entry.baseurl = baseurl - if mirrorlist == '': - mirrorlist = None - if mirrorlist is not None: validate_repo_url(mirrorlist) entry.mirrorlist = mirrorlist -- 2.1.0

3 3

[PATCH] Fix issue #621: Catch libvirt exception when network does not have bridge name
by Aline Manera 20 Mar '15

20 Mar '15

The bridged network does not have a bridge name (<bridge> on XML) <network> <name>bridged</name> <uuid>70441e61-2f87-44c4-836b-5cc817fcf025</uuid> <forward dev='eth0' mode='bridge'> <interface dev='eth0'/> </forward> </network> and then libvirt raises an exception when we try to get the bridge name. File "/usr/lib64/python2.7/site-packages/libvirt.py", line 2780, in bridgeName if ret is None: raise libvirtError ('virNetworkGetBridgeName() failed', net=self) libvirtError: internal error: network 'bridged-eth0' does not have a bridge name. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/networks.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 7265c64..92aed92 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -210,7 +210,17 @@ class NetworksModel(object): br_xml = create_vlan_tagged_bridge_xml(br_name, interface, vlan_id) conn = self.conn.get() - if br_name in [net.bridgeName() for net in conn.listAllNetworks()]: + bridges = [] + for net in conn.listAllNetworks(): + # Bridged networks do not have a bridge name + # So in those cases, libvirt raises an error when trying to get + # the bridge name + try: + bridges.append(net.bridgeName()) + except libvirt.libvirtError, e: + kimchi_log.error(e.message) + + if br_name in bridges: raise InvalidOperation("KCHNET0010E", {'iface': br_name}) with RollbackContext() as rollback: -- 2.1.0

3 3

[PATCH] Fix issue #620: Allow use iSCSI/SCSI volume on Template
by Aline Manera 20 Mar '15

20 Mar '15

When selecting an iSCSI/SCSI volume to create a Template, the disk size is calculated according to the selected volume. In that case only the volume information should be used: { ... "disks":[ { "volume":"unit:0:0:2", "index":0 } ] } Also to get and display the disk size for user we should query the selected volume. This patch also created function to call GET /storagepools/<pool> API. That way we can easily get the pool type without the need to query the information on all pools returned by GET /storagepools API Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 15 +++++- ui/js/src/kimchi.template_edit_main.js | 86 ++++++++++++++++++---------------- 2 files changed, 59 insertions(+), 42 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 2abe8f5..838b8d3 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1,7 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -806,6 +806,19 @@ var kimchi = { }); }, + getStoragePool: function(poolName, suc, err) { + var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName); + kimchi.requestJSON({ + url : url, + type : 'GET', + contentType : 'application/json', + timeout: 2000, + dataType : 'json', + success : suc, + error : err + }); + }, + getStoragePoolVolume: function(poolName, volumeName, suc, err) { var url = kimchi.url + 'storagepools/' + encodeURIComponent(poolName) + '/storagevolumes/' + encodeURIComponent(volumeName); kimchi.requestJSON({ diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index a557ca5..85f76cd 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -89,51 +89,54 @@ kimchi.template_edit_main = function() { $('select', '#form-template-storage').change(function() { var selectedItem = $(this).parent().parent(); var tempStorageNameFull = $(this).val(); - var tempType; - var tempStorageName =tempStorageNameFull.split('/')[0]; - var scsiCap; - $.each(result, function(index, storageEntities) { - if (tempStorageName === storageEntities.name) { - selectedItem.find('.template-storage-type').val(storageEntities.type); - scsiCap = storageEntities.capacity / Math.pow(1024, 3); - tempType = storageEntities.type; + var tempName = tempStorageNameFull.split('/'); + var tempStorageName = tempName[0]; + $('.template-storage-name').val(tempStorageNameFull); + kimchi.getStoragePool(tempStorageName, function(info) { + tempType = info.type; + selectedItem.find('.template-storage-type').val(tempType); + if (tempType === 'iscsi' || tempType === 'scsi') { + kimchi.getStoragePoolVolume(tempStorageName, tempName[tempName.length-1], function(info) { + volSize = info.capacity / Math.pow(1024, 3); + $('.template-storage-disk', selectedItem).attr('readonly', true).val(volSize); + }); + } else { + $('.template-storage-disk', selectedItem).attr('readonly', false); } }); - if (tempType === 'iscsi' || tempType === 'scsi') { - $('.template-storage-disk', selectedItem).attr('readonly', true).val(scsiCap); - } else { - $('.template-storage-disk', selectedItem).attr('readonly', false); - } - $('.template-storage-name').val(tempStorageNameFull); }); }; if ((origDisks && origDisks.length) && (origPool && origPool.length)) { splitPool = origPool.split('/'); - var defaultPool; + var defaultPool = splitPool[splitPool.length-1]; var defaultType; - $.each(result, function(index, poolEntities) { - if (poolEntities.name === splitPool[splitPool.length-1]) { - defaultType = poolEntities.type; - defaultPool = splitPool[splitPool.length-1] - } - }); - if (origDisks[0]['volume']) { - defaultPool = defaultPool + '/' + origDisks[0]['volume']; - } - $.each(origDisks, function(index, diskEntities) { - var storageNodeData = { - viewMode : '', - editMode : 'hide', - storageName : defaultPool, - storageType : defaultType, - storageDisk : diskEntities.size - } - addStorageItem(storageNodeData); + + kimchi.getStoragePool(defaultPool, function(info) { + defaultType = info.type; + $.each(origDisks, function(index, diskEntities) { + var storageNodeData = { + viewMode : '', + editMode : 'hide', + storageName : defaultPool, + storageType : defaultType, + storageDisk : diskEntities.size + } + + if (diskEntities.volume) { + kimchi.getStoragePoolVolume(defaultPool, diskEntities.volume, function(info) { + var volSize = info.capacity / Math.pow(1024, 3); + var nodeData = storageNodeData + nodeData.storageName = defaultPool + '/' + diskEntities.volume; + nodeData.storageDisk = volSize; + addStorageItem(nodeData); + $('.template-storage-disk').attr('readonly', true); + }); + } else { + addStorageItem(storageNodeData); + } + }); }); - if(defaultType === 'iscsi' || defaultType === 'scsi') { - $('.template-storage-disk').attr('readonly', true); - } } $('#template-edit-storage-add-button').button({ @@ -249,10 +252,11 @@ kimchi.template_edit_main = function() { //Fix me: Only support one storage pool now var storages = $('.template-tab-body .item', '#form-template-storage'); var tempName = $('.template-storage-name', storages).val(); + var tmpItem = $('#form-template-storage .item'); tempName = tempName.split('/'); - var tempNameHead =tempName[0]; + var tempNameHead = tempName[0]; var tempNameTail = tempNameHead; - if(tempNameHead === 'iscsi' || tempNameHead =='scsi') { + if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() == 'scsi') { tempNameTail = tempName[tempName.length-1]; } tempName = '/storagepools/' + tempNameHead; @@ -260,12 +264,12 @@ kimchi.template_edit_main = function() { $.each(editableFields, function(i, field) { /* Support only 1 disk at this moment */ if (field == 'disks') { - var tmpItem = $('#form-template-storage .item'); - origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); - if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() =='scsi') { + if($('.template-storage-type', tmpItem).val() === 'iscsi' || $('.template-storage-type', tmpItem).val() == 'scsi') { + origDisks[0]['size'] && delete origDisks[0]['size']; origDisks[0]['volume'] = tempNameTail; } else { origDisks[0]['volume'] && delete origDisks[0]['volume']; + origDisks[0].size = Number($('.template-storage-disk', tmpItem).val()); } data[field] = origDisks; } -- 2.1.0

2 2

[PATCH] Add support to recognize RHEL-LE distro and version
by Jose Ricardo Ziviani 20 Mar '15

20 Mar '15

- When creating a new template, RHEL little-endian was not being reconized. This commit fixes the regex to support such distro. --- src/kimchi/isoinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index b5a1769..818ffe3 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -110,7 +110,7 @@ iso_dir = [ ('opensuse', '12.2', 'openSUSE-DVD-i586-Build0167|openSUSE-DVD-x86_640167'), ('rhel', '4.8', 'RHEL/4-U8'), - ('rhel', lambda m: m.group(1), 'RHEL[_/-](\d+\.\d+)'), + ('rhel', lambda m: m.group(2), 'RHEL(-LE)?[_/-](\d+\.\d+)'), ('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'), ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), -- 1.9.1

2 2

[kimchi-devel][PATCH 0/2] Peer discovery fixes
by lvroyce＠linux.vnet.ibm.com 20 Mar '15

20 Mar '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (2): Update doc for federation Deregister peer information when kimchid exit docs/README-federation.md | 4 +++- src/kimchi/model/peers.py | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) -- 1.9.1

2 4

[PATCH] Assign HTML labels to their corresponding elements
by Crístian Viana 20 Mar '15

20 Mar '15

Somea UI form fields have labels which aren't assigned to those fields, which makes it more difficult to click and interact with them. Assign the labels to their corresponding elements, so when the user clicks on a label, the element also receives the click event. Also, some indentation levels have been changed. The elements which have their labels assigned to are: - The text box where the user types the file path in "New Template" > "Local image file"; - All form elements in "Templates" > "Actions" > "Edit", tab "Processor"; - The checkbox used to select a device in "Storage pools" > "Actions" > "Extend"; Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/pages/tabs/storage.html.tmpl | 2 +- ui/pages/template-add.html.tmpl | 4 +++- ui/pages/template-edit.html.tmpl | 20 ++++++++++++++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index dbbaef9..6af7327 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -128,7 +128,7 @@ </script> <script id="logicalPoolExtendTmpl" type="html/text"> <div> - <input type="checkbox" value="{path}" name="devices"> + <input type="checkbox" value="{path}" name="devices" id="{name}"> <label for="{name}">{path}</label> </div> </script> diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index eaafaa7..3b82c6c 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -130,7 +130,9 @@ <h2 class="step-title">$_("Local Image File")</h2> </header> <div class="body"> - <span>File Path:</span><input type="text"><button class="ui-button-primary">$_("Create")</button> + <label for="vm-image-local-text">File Path:</label> + <input type="text" id="vm-image-local-text" /> + <button class="ui-button-primary">$_("Create")</button> </div> </div> diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 7177bf0..3a84870 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -118,11 +118,23 @@ <div class="template-tab-body"></div> </form> <form id="form-template-processor"> - <div>$_("CPU Number"):<input type="text" value="1" id="cpus"></div> - <div class="manual"><input type="checkbox">$_("Manually set CPU topology")</div> + <div> + <label for="cpus">$_("CPU Number"):</label> + <input type="text" value="1" id="cpus" /> + </div> + <div class="manual"> + <input type="checkbox" id="cpus-check" /> + <label for="cpus-check">$_("Manually set CPU topology")</label> + </div> <div class="topology hide"> - <div>$_("Cores"):<input type="text" value="1" id="cores"></div> - <div>$_("Threads"):<select id="threads"></select></div> + <div> + <label for="cores">$_("Cores"):</label> + <input type="text" value="1" id="cores" /> + </div> + <div> + <label for="threads">$_("Threads"):</label> + <select id="threads"></select> + </div> </div> </form> </div> -- 2.1.0

2 2

[PATCH 0/3] unit tests - Power arch fixes
by Daniel Henrique Barboza 20 Mar '15

20 Mar '15

This patch set contains fixes to several unit tests that had somewhat the same root cause - the differences between x86 and power/ppc64le in osinfo.py template configurations. Daniel Henrique Barboza (3): tests/test_osinfo.py: fixes for Power architecture Kimchi tests: Power system fixes - removing hardcoded values test/test_model: Power architecture fixes src/kimchi/osinfo.py | 9 +++++++++ tests/iso_gen.py | 3 ++- tests/test_mockmodel.py | 4 +++- tests/test_model.py | 10 ++++++---- tests/test_osinfo.py | 36 ++++++++++++++++++++++++++---------- tests/test_rest.py | 6 ++++-- tests/test_vmtemplate.py | 8 ++++++-- 7 files changed, 56 insertions(+), 20 deletions(-) -- 1.9.3

2 8

[PATCH 0/3] Fix storage volume issues
by Crístian Viana 20 Mar '15

20 Mar '15

Crístian Viana (3): Remove ISO permission check when creating a template issue #565: Allow a template's ISO to be a block device issue #564: Parse logical volumes to find out their actual formats src/kimchi/i18n.py | 5 --- src/kimchi/isoinfo.py | 7 +++- src/kimchi/kvmusertests.py | 75 -------------------------------------- src/kimchi/model/storagevolumes.py | 19 +++++++++- src/kimchi/model/templates.py | 12 ------ src/kimchi/vmtemplate.py | 10 ++++- 6 files changed, 31 insertions(+), 97 deletions(-) delete mode 100644 src/kimchi/kvmusertests.py -- 2.1.0

2 6

[PATCH] tests/test_osinfo.py: fixes for Power architecture
by Daniel Henrique Barboza 20 Mar '15

20 Mar '15

- osinfo tests weren't considering config differences between x86 and Power archs, resulting in errors. - a new test was added to explictly test the case where an unknown distro/version should return the configuration of an old distro/version after the lookup. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- tests/test_osinfo.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py index d5e90b4..f2837f0 100644 --- a/tests/test_osinfo.py +++ b/tests/test_osinfo.py @@ -30,13 +30,23 @@ class OSInfoTests(unittest.TestCase): self.assertEquals('unknown', entry['os_version']) self.assertEquals(['default'], entry['networks']) + def _check_old_distro_diskbus_nic_multi_arch(self, disk_bus, nic_model): + if _get_arch() == 'x86': + self.assertEquals(disk_bus, 'ide') + self.assertEquals(nic_model, 'e1000') + else: + self.assertEquals(disk_bus, 'scsi') + self.assertEquals(nic_model, 'spapr-vlan') + def test_old_distros(self): old_versions = {'debian': '5.0', 'ubuntu': '7.04', 'opensuse': '10.1', 'centos': '5.1', 'rhel': '5.1', 'fedora': '15'} for distro, version in old_versions.iteritems(): entry = lookup(distro, version) - self.assertEquals(entry['disk_bus'], 'ide') - self.assertEquals(entry['nic_model'], 'e1000') + self._check_old_distro_diskbus_nic_multi_arch( + entry['disk_bus'], + entry['nic_model'] + ) def test_modern_bases(self): for distro, version in modern_version_bases[_get_arch()].iteritems(): @@ -45,10 +55,19 @@ class OSInfoTests(unittest.TestCase): self.assertEquals(entry['nic_model'], 'virtio') def test_modern_distros(self): - modern_versions = {'debian': '7.0', 'ubuntu': '12.04', - 'opensuse': '12.3', 'centos': '6.4', 'rhel': '6.3', - 'fedora': '18', 'gentoo': '12.1'} + # versions based on ppc64 modern distros + modern_versions = {'ubuntu': '14.04', 'opensuse': '13.1', + 'rhel': '6.5', 'fedora': '19', 'sles': '11sp3'} for distro, version in modern_versions.iteritems(): entry = lookup(distro, version) self.assertEquals(entry['disk_bus'], 'virtio') self.assertEquals(entry['nic_model'], 'virtio') + + def test_lookup_unknown_distro_version_returns_old_distro(self): + distro = 'unknown_distro' + version = 'unknwon_version' + entry = lookup(distro, version) + self._check_old_distro_diskbus_nic_multi_arch( + entry['disk_bus'], + entry['nic_model'] + ) -- 1.9.3

2 1

[PATCH] test/vmtemplate.py: fixes for Power architecture
by Daniel Henrique Barboza 16 Mar '15

16 Mar '15

- changing 'fields' variable to a dict instead of an array to manipulate specific fields easier - changing 'memory', 'disk_bus' and 'nic_model' fields when running the tests in a Power host Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- tests/test_vmtemplate.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 550bb2a..372f54a 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -22,6 +22,7 @@ import unittest import uuid +from kimchi.osinfo import _get_arch from kimchi.vmtemplate import VMTemplate from kimchi.xmlutils.utils import xpath_get_text @@ -35,16 +36,21 @@ class VMTemplateTests(unittest.TestCase): os.unlink(self.iso) def test_minimal_construct(self): - fields = (('name', 'test'), ('os_distro', 'unknown'), - ('os_version', 'unknown'), ('cpus', 1), - ('memory', 1024), ('networks', ['default']), - ('disk_bus', 'ide'), ('nic_model', 'e1000'), - ('graphics', {'type': 'vnc', 'listen': '127.0.0.1'}), - ('cdrom', self.iso)) + fields = {'name': 'test', 'os_distro': 'unknown', + 'os_version': 'unknown', 'cpus': 1, + 'memory': 1024, 'networks': ['default'], + 'disk_bus': 'ide', 'nic_model': 'e1000', + 'graphics': {'type': 'vnc', 'listen': '127.0.0.1'}, + 'cdrom': self.iso} + + if _get_arch() in ('power', 'ppc64le'): + fields['memory'] = 1280 + fields['disk_bus'] = 'scsi' + fields['nic_model'] = 'spapr-vlan' args = {'name': 'test', 'cdrom': self.iso} t = VMTemplate(args) - for name, val in fields: + for name, val in fields.iteritems(): self.assertEquals(val, t.info.get(name)) def test_construct_overrides(self): -- 1.9.3

1 1

[PATCH] tests/test_mockmodel.py: fixes for Power architecture
by Daniel Henrique Barboza 16 Mar '15

16 Mar '15

Testing for the right amount of default memory when running the test in a Power system. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- tests/test_mockmodel.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index 542f845..ed3a0f9 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -28,6 +28,7 @@ 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 +from kimchi.osinfo import _get_arch test_server = None @@ -155,10 +156,13 @@ class MockModelTests(unittest.TestCase): 'io_throughput', 'io_throughput_peak')) info = model.vm_lookup(u'test-vm') + mem_expected = 1024 + if _get_arch() in ('power', 'ppc64le'): + mem_expected = 1280 self.assertEquals(keys, set(info.keys())) self.assertEquals('shutoff', info['state']) self.assertEquals('test-vm', info['name']) - self.assertEquals(1024, info['memory']) + self.assertEquals(mem_expected, info['memory']) self.assertEquals(1, info['cpus']) self.assertEquals('images/icon-vm.png', info['icon']) self.assertEquals(stats_keys, set(info['stats'].keys())) -- 1.9.3

1 1

[PATCH v3 0/5] Create VMs Asynchronously
by Christy Perez 13 Mar '15

13 Mar '15

v3 Changes: Instead of adding a description key to the task, just append the action desciptor to the target_uri. If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (5): Granular Task Queries: Backend Granular task query test updates Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates docs/API.md | 16 ++++++++ src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 ++-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 12 +++--- src/kimchi/model/vms.py | 33 +++++++++++++--- src/kimchi/model/vmsnapshots.py | 5 ++- tests/test_authorization.py | 23 +++++++----- tests/test_mockmodel.py | 12 ++++-- tests/test_model.py | 60 +++++++++++++++++++---------- tests/test_model_storagevolume.py | 2 +- tests/test_rest.py | 77 ++++++++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 4 +- 15 files changed, 188 insertions(+), 77 deletions(-) -- 2.1.0

1 6

[kimchi-devel][PATCH 0/2] Fix error usage of feature tests
by lvroyce＠linux.vnet.ibm.com 13 Mar '15

13 Mar '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Feature tests depend on running kimchi server should not be used in model tests, while coincidently, command "qemu-io -r http://localhost:8080/images/icon-fedora.png -c 'read -v 0 512'" return code is 0 so we cannot count on the return code. This patch forces module usage without running kimchi server to return false, and fixes testcase accordingly. REF: https://github.com/kimchi-project/kimchi/issues/579 https://github.com/kimchi-project/kimchi/issues/580 Royce Lv (2): Avoid using server dependent feature tests when server not running Fix wrong usage of feature tests src/kimchi/model/featuretests.py | 5 ++++- src/kimchi/utils.py | 8 ++++++++ tests/test_model.py | 16 +++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) -- 1.9.3

3 6

[PATCH] Remove slash "/" filter in template name when create VM
by Rodrigo Trujillo 13 Mar '15

13 Mar '15

Users are allowed to create or update template names with "slash", this generates an error when he tries to create a guest with that template because the guest paramters validation prohibits slashes in templates names. This patch fixes this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 0cfa20c..f507251 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -233,7 +233,7 @@ "template": { "description": "The URI of a template to use when building a VM", "type": "string", - "pattern": "^/templates/[^/]+/?$", + "pattern": "^/templates/(.*?)/?$", "required": true, "error": "KCHVM0012E" }, -- 2.1.0

3 2

[PATCH v3] Issue #587: Man page submission for kimchid
by Frédéric Bonnard 13 Mar '15

13 Mar '15

From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com> Hi, I added the federation information into a section within the manpage with a bit of cosmetic. F. Frederic Bonnard (1): Issue #587: Man page submission for kimchid COPYING | 5 +- Makefile.am | 2 + contrib/kimchi.spec.fedora.in | 4 ++ contrib/kimchi.spec.suse.in | 4 ++ docs/Makefile.am | 1 + docs/kimchid.8 | 156 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 docs/kimchid.8 -- 1.9.1

2 3

[PATCH V2] Remove slash "/" filter in template name when create VM
by Rodrigo Trujillo 13 Mar '15

13 Mar '15

Users are allowed to create or update template names with "slash", this generates an error when he tries to create a guest with that template because the guest paramters validation prohibits slashes in templates names. This patch fixes this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 +- src/kimchi/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 0cfa20c..f507251 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -233,7 +233,7 @@ "template": { "description": "The URI of a template to use when building a VM", "type": "string", - "pattern": "^/templates/[^/]+/?$", + "pattern": "^/templates/(.*?)/?$", "required": true, "error": "KCHVM0012E" }, diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index f1ef12c..0d5f988 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -45,7 +45,7 @@ task_id = 0 def _uri_to_name(collection, uri): - expr = '/%s/(.*?)/?$' % collection + expr = '/%s/(.*?)$' % collection m = re.match(expr, uri) if not m: raise InvalidParameter("KCHUTILS0001E", {'uri': uri}) -- 2.1.0

3 2