- Kimchi-devel - oVirt List Archives

[PATCH 0/2] Support ppc64 isos in Templates
by Rodrigo Trujillo 06 Mar '14

06 Mar '14

If Kimchi server is running in a PPC machine, the guests should be PPC. Currently, when user tries to create a template, only x86 isos are showed to user. This patch filters the ISOs, and also, adds ARCH to UI. Rodrigo Trujillo (2): Support ppc64 isos in Templates: Add arch and urls to distro jsons Support ppc64 isos in Templates: Filter remote isos and change UI src/distros.d/debian.json | 1 + src/distros.d/fedora.json | 24 ++++++++++++++++++++++++ src/distros.d/gentoo.json | 1 + src/distros.d/opensuse.json | 1 + src/distros.d/ubuntu.json | 2 ++ src/kimchi/distroloader.py | 3 ++- ui/pages/template-add.html.tmpl | 3 +++ 7 files changed, 34 insertions(+), 1 deletion(-) -- 1.8.5.3

4 7

[PATCH] Issue #337: add CentOS support to yum repositories list
by shaohef＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> CentOS use yum to manage repositories Issue: https://github.com/kimchi-project/kimchi/issues/337 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 2e70008..bb6ca1a 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -24,7 +24,7 @@ from kimchi.basemodel import Singleton from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter -YUM_DISTROS = ['fedora', 'opensuse ', 'suse linux enterprise server '] +YUM_DISTROS = ['fedora', 'opensuse ', 'suse linux enterprise server ', 'centos'] APT_DISTROS = ['debian', 'ubuntu'] -- 1.8.4.2

1 0

[PATCH] storage volume: fix xml parsing of logical volume format type
by zhshzhou＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Not all types of libvirt storage volume provide format information. Particularly, the volume in logical pool doesn't have format information in the dumped XML description. StorageVolumeModel.lookup assumes there is a format tag, but for logical pool volumes it does not exist. So an exception is raised when it lookup a logical volume. To trigger this problem, firstly create a guest using a logical pool. Then click the logical pool from the "storage" tab, and it would fail to list the volumes. This patch catches the exception when parsing the format tag, and returns an empty string for the format attribute if there is no available format information in the XML. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 442ff89..6d0e884 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -113,7 +113,13 @@ class StorageVolumeModel(object): path = vol.path() info = vol.info() xml = vol.XMLDesc(0) - fmt = xmlutils.xpath_get_text(xml, "/volume/target/format/@type")[0] + try: + fmt = xmlutils.xpath_get_text( + xml, "/volume/target/format/@type")[0] + except IndexError: + # Not all types of libvirt storage can provide volume format + # infomation. + fmt = '' res = dict(type=VOLUME_TYPE_MAP[info[0]], capacity=info[1], allocation=info[2], -- 1.8.5.3

4 4

[PATCHv5 0/6] Add volume reference count
by lvroyce＠linux.vnet.ibm.com 06 Mar '14

06 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: 1. sudo make check 2. from UI: list storage volumes and unrefered volume ref_cnt is 0, ref_cnt for refered ones are 1. Available volumes will be tracked by volume reference count. Add this field to storage volume, so that storage volume/pool action validation can rely on it. Royce Lv (6): Fix vm disk path when it does not have source element Add volume ref_cnt: update api.md Add volume ref_cnt: Update controller and json schema Add volume ref_cnt: Add model and mockmodel implementation Add volume ref_cnt: Update test Multiple pep8 fixes docs/API.md | 3 +++ src/kimchi/API.json | 25 +++++++++++++++++++++++++ src/kimchi/control/storagevolumes.py | 1 + src/kimchi/i18n.py | 4 ++++ src/kimchi/mockmodel.py | 10 +++++++--- src/kimchi/model/debugreports.py | 2 +- src/kimchi/model/storagevolumes.py | 30 ++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 2 +- src/kimchi/model/vmstorages.py | 23 +++++++++++++---------- tests/test_model.py | 4 ++++ tests/test_rest.py | 2 ++ 11 files changed, 91 insertions(+), 15 deletions(-) -- 1.8.1.2

3 8

[PATCH] issue #312: Rename LVM while deleting logical storage pool
by Aline Manera 06 Mar '14

06 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> When creating a Logical storage pool, a LVM is created with the same name. And when deleting the storage pool the LVM keeps on the system. Which is the correct behavior as the storage pool is only a concept and deleting it should not affect the file system. But it prevents the user to create a new logical pool with a name used before which is odd. So when deleting a logical pool, rename the LVM to a single name to allow user create a logical pool with any name. Also convert an error message parameter to string instead of virStoragePool instance. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/storagepools.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 76ab2d6..dd3c9a2 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.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 time + import libvirt from kimchi import xmlutils @@ -172,7 +174,8 @@ class StoragePoolModel(object): return 0 except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0008E", - {'name': pool, 'err': e.get_error_message()}) + {'name': pool.name(), + 'err': e.get_error_message()}) def _get_storage_source(self, pool_type, pool_xml): source = {} @@ -348,7 +351,17 @@ class StoragePoolModel(object): if pool.isActive(): raise InvalidOperation("KCHPOOL0005E", {'name': name}) try: + xml = pool.XMLDesc(0) + pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] pool.undefine() + # The user may want to create a logical pool with the same name + # used before but a LVM will already exist with this name + # So rename the former LVM to avoid future conflicts + if pool_type == 'logical': + lvm_name = "%s-%s" % (name, str(int(time.time()*1000))) + vgrename_cmd = ["vgrename", name, lvm_name] + run_command(vgrename_cmd) + except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0011E", {'name': name, 'err': e.get_error_message()}) -- 1.7.10.4

3 5

[PATCH V2] Issue #333
by shaohef＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 improve commit message. ShaoHe Feng (1): Issue #333: do not encode error.html when the cherrpy version less than '3.2.5' src/kimchi/root.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 1.8.4.2

4 4

[RFC] upgrade CherryPy version.
by Sheldon 05 Mar '14

05 Mar '14

Now there's a issue: https://github.com/kimchi-project/kimchi/issues/333 The reason of this issue is because high level cherrpy version make some change about set_response. The high level cherrpy encode the unicode error message by itself. So the kimchi do not encode the unicode error message any more. It is right, the cherrpy should encode the unicode error message. Now we can require the cherrypy version to solve this problem. we can also check the cherrypy version in kimchi code as follow in order to avoid to require the cherrypy version. like: if cherrypy.__version__ << 3.2.5: return res else: return res.encode("utf-8") -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

4 7

[PATCH 0/2] Make vms model singleton
by lvroyce＠linux.vnet.ibm.com 05 Mar '14

05 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When using get_list function of vms model, Background Task will run multiple times because of started in vm init function. Fix this by making vms model singleton. Royce Lv (2): Make vm model to be a singleton Hack test_model to support vm model singleton src/kimchi/model/vms.py | 3 +++ tests/test_model.py | 2 ++ 2 files changed, 5 insertions(+) -- 1.8.1.2

5 8

[PATCH] bug fix: Allow extend a logical pool
by Aline Manera 05 Mar '14

05 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> While trying to extend a logical pool I got the following error message: "/dev/vdb is not a valid disk/partition. Could not add it to the pool my-logical-pool" But the same partition "/dev/vdb" is listed on GET /host/partitions. Then I realized the "blkid" is not the correct command to check a partition exists for raw disks. >From blkid man page: It can determine the type of content (e.g. filesystem or swap) that a block device holds, and also attributes (tokens, NAME=value pairs) from the content metadata (e.g. LABEL or UUID fields). Which is not useful for a raw disk. >From lsblk man page: lsblk lists information about all or the specified block devices. So use "lsblk" command instead of "blkid" to verify the disk exists in the system. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/storagepools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 76ab2d6..d012ca9 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -254,7 +254,7 @@ class StoragePoolModel(object): def _update_lvm_disks(self, pool_name, disks): # check if all the disks/partitions exists in the host for disk in disks: - blkid_cmd = ['blkid', disk] + blkid_cmd = ['lsblk', disk] output, error, returncode = run_command(blkid_cmd) if returncode != 0: kimchi_log.error('%s is not a valid disk/partition. Could not ' @@ -281,6 +281,7 @@ class StoragePoolModel(object): pool.setAutostart(1) else: pool.setAutostart(0) + if 'disks' in params: # check if pool is type 'logical' xml = pool.XMLDesc(0) -- 1.7.10.4

2 3

[PATCH v2 0/4] [UI] CDROM Management in a VM
by Hongliang Wang 05 Mar '14

05 Mar '14

Allow user to manipulate CDROM(s) in a VM: 1) Attach one or more CDROM(s); 2) Replace a CDROM with another ISO file path; 3) Detach a CDROM from a VM. Tested on Chrome. Please apply the following patch first: * [UI] Window - Correct Footer Height v1 -> v2: 2a) Separate one patch into 4 small ones to make it easier to review (Thanks to Ramon Medeiros's comment) 2b) Updated API calling to list CDROM (Thanks to Aline's comment) 2c) Separated VM updating window into 2 parts: general and storage (Thanks to Aline's comment) 2d) Enhanced UI to allow user trigger replace CDROM window by clicking ISO file path text box 2e) Changed uneditable fields from readonly to disabled 2f) Removed authors infomation (Thanks to Aline's comment) Hongliang Wang (4): [UI] Add CDROM-related APIs [UI] Add i18n Variables for CDROM-related Function [UI] Add/Edit CDROM Support [UI] Attach/Replace/Detach a CDROM to/in/from a VM ui/css/theme-default/guest-cdrom-add.css | 62 +++++++++++ ui/css/theme-default/guest-cdrom-edit.css | 62 +++++++++++ ui/css/theme-default/guest-edit.css | 108 +++++++++++++++--- ui/images/theme-default/guest-icon-sprite.png | Bin 0 -> 6748 bytes ui/js/src/kimchi.api.js | 74 +++++++++++++ ui/js/src/kimchi.guest_cdrom_add_main.js | 79 +++++++++++++ ui/js/src/kimchi.guest_cdrom_edit_main.js | 87 +++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 75 ++++++++++++- ui/pages/guest-cdrom-add.html.tmpl | 73 ++++++++++++ ui/pages/guest-cdrom-edit.html.tmpl | 73 ++++++++++++ ui/pages/guest-edit.html.tmpl | 153 +++++++++++++++++--------- ui/pages/i18n.html.tmpl | 5 + 12 files changed, 778 insertions(+), 73 deletions(-) create mode 100644 ui/css/theme-default/guest-cdrom-add.css create mode 100644 ui/css/theme-default/guest-cdrom-edit.css create mode 100644 ui/images/theme-default/guest-icon-sprite.png create mode 100644 ui/js/src/kimchi.guest_cdrom_add_main.js create mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js create mode 100644 ui/pages/guest-cdrom-add.html.tmpl create mode 100644 ui/pages/guest-cdrom-edit.html.tmpl -- 1.8.1.4

4 17