- Kimchi-devel - oVirt List Archives

[PATCH] ISO Scan: Use volume set id instead of volume id for some wrong images.
by Mark Wu 12 Mar '14

12 Mar '14

Some RHEL ISO images store the infomation of volume id in the location of volume set id mistakenly. But it's better to support those ISO images since they're already public available. For details, please see: isoinfo -d -i rhel-server-6.5-ppc64-dvd.iso CD-ROM is in ISO 9660 format System id: PPC Volume id: RED_HAT Volume set id: RHEL_6.5 ppc64 Publisher id: Data preparer id: Application id: RHEL_6.5 ppc64 Copyright File id: Abstract File id: Bibliographic File id: Volume set size is: 1 Volume set sequence number is: 1 Logical block size is: 2048 Volume size is: 1634718 Joliet with UCS level 3 found Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 8d423ad..b7315e0 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -235,7 +235,16 @@ class IsoImage(object): raise IsoFormatError("KCHISO0006E", {'filename': self.path}) if vd_ident != 'CD001' or vd_ver != 1: raise IsoFormatError("KCHISO0007E", {'filename': self.path}) - self.volume_id = vol_id + if vol_id.strip() == 'RED_HAT': + # Some RHEL ISO images store the infomation of volume id in the + # location of volume set id mistakenly. + self.volume_id = self._get_volume_set_id(data) + else: + self.volume_id = vol_id + + def _get_volume_set_id(self, data): + # The index is picked from ISO-9660 specification. + return data[190: 318] def _get_iso_data(self, offset, size): if self.remote: -- 1.8.4.2

4 3

[PATCH V3 0/3] Issue #302
by shaohef＠linux.vnet.ibm.com 12 Mar '14

12 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3: use lower() to avoid errors with upper/lower case V1 -> V2 re-create the default network if ip conflict let 'create' attr of networks model to create the default network ShaoHe Feng (3): move _default_network_check from top model to networks model add a new function to get an available network address Issue #302: let 'create' attr of networks model to create default network src/kimchi/model/model.py | 35 -------------------------- src/kimchi/model/networks.py | 59 ++++++++++++++++++++++++++++++++++++++------ src/kimchi/network.py | 7 ++++-- 3 files changed, 57 insertions(+), 44 deletions(-) -- 1.8.4.2

3 6

[PATCH] Update guest action menu
by Adam King 11 Mar '14

11 Mar '14

Add menu choices equivalent to the button operations. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/pages/guest.html.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index a9737a5..252a303 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -55,9 +55,12 @@ <div name="actionmenu" class="btn dropdown popable vm-action" style="width: 70px"> <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">$_("Console")</span></button> + <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> <button class="button-big shutoff-disabled" name="vm-media"><span class="text">$_("Manage Media")</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-edit"><span class="text">$_("Edit Guest")</span></button> + <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> + <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> + <button class="button-big shutoff-hidden" name="vm-stop"><span class="text">$_("Stop")</span></button> <a class="button-big red " name="vm-delete">$_("Delete")</a> </div> </div> -- 1.8.1.4

4 4

[PATCH V2 0/3] Issue #302
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 re-create the default network if ip conflict let 'create' attr of networks model to create the default network ShaoHe Feng (3): move _default_network_check from top model to networks model add a new function to get an available network address Issue #302: let 'create' attr of networks model to create default network src/kimchi/model/model.py | 35 -------------------------- src/kimchi/model/networks.py | 58 ++++++++++++++++++++++++++++++++++++++------ src/kimchi/network.py | 7 ++++-- 3 files changed, 56 insertions(+), 44 deletions(-) -- 1.8.4.2

2 4

[PATCH] Pass ajaxError information on to original requester on ajaxError event
by Adam King 11 Mar '14

11 Mar '14

The previous implementation of the ajaxError event did not pass along all the available information to the original caller. Corrected with this patch. Display a message if the error is requestRejected. Updated guest vms processing to use the additional information. Corrected the error handler to show the JSON response reason when available. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 6 ++++-- ui/js/src/kimchi.main.js | 8 ++++++-- ui/pages/i18n.html.tmpl | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index bbd8d3d..bdd5a69 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -165,8 +165,10 @@ kimchi.listVmsAuto = function() { } kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); - }, function(err) { - kimchi.message.error(err.responseJSON.reason); + }, function(errorResponse, textStatus, errorThrown) { + if(errorResponse.responseJSON && errorResponse.responseJSON.reason) { + kimchi.message.error(errorResponse.responseJSON.reason); + } kimchi.vmTimeout = window.setTimeout("kimchi.listVmsAuto();", 5000); }); }; diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 8d12525..aac7e28 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -164,8 +164,12 @@ kimchi.main = function() { }); return; } - - ajaxSettings['originalError'] && ajaxSettings['originalError'](jqXHR); + else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText)) { + kimchi.message.error(i18n['KCHAPI6007E'].replace("%1", jqXHR.state())); + } + if(ajaxSettings['originalError']) { + ajaxSettings['originalError'](jqXHR, jqXHR.statusText, errorThrown); + } }); kimchi.user.showUser(true); diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index bf8a0d7..ba3a407 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -50,6 +50,7 @@ var i18n = { 'KCHAPI6004E': "$_("This is not a valid URL.")", 'KCHAPI6005E': "$_("No such data available.")", 'KCHAPI6006E': "$_("options needed.")", + 'KCHAPI6007E': "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")", 'KCHAPI6001M': "$_("Delete Confirmation")", 'KCHAPI6002M': "$_("OK")", -- 1.8.1.4

2 2

[PATCH] Issue 292 Logical Storage Pool Returning "extended" Partitions as Possible Pool
by zhshzhou＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> Extended partition is a container of logical partitions. Kimchi should skip extended partition regardless of it contains logical partitions or not. This patch uses pyparted to check if a partition is a extended partition and skip if it is. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/README.md | 6 +++--- src/kimchi/disks.py | 19 +++++++++++++++++-- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 1b03fc7..c2b2a40 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -15,6 +15,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-libxml2, qemu-kvm, python-pam, + python-parted, python-psutil (>= 0.6.0), python-ethtool, sosreport, diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 149c3a7..bf80104 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -20,6 +20,7 @@ Requires: m2crypto Requires: python-imaging Requires: libxml2-python Requires: PyPAM +Requires: pyparted Requires: python-psutil >= 0.6.0 Requires: python-jsonschema >= 1.3.0 Requires: python-ethtool diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index beddada..cba0899 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -16,6 +16,7 @@ Requires: python-imaging Requires: python-M2Crypto Requires: python-libxml2 Requires: python-pam +Requires: python-parted Requires: python-psutil >= 0.6.0 Requires: python-jsonschema >= 1.3.0 Requires: python-ethtool diff --git a/docs/README.md b/docs/README.md index 5721878..4be0e53 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,7 +53,7 @@ Install Dependencies PyPAM m2crypto python-jsonschema rpm-build \ qemu-kvm python-psutil python-ethtool sos \ python-ipaddr python-lxml nfs-utils \ - iscsi-initiator-utils libxslt + iscsi-initiator-utils libxslt pyparted # If using RHEL6, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict # Restart libvirt to allow configuration changes to take effect @@ -75,7 +75,7 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc + open-iscsi lvm2 xsltproc python-parted Packages version requirement: python-jsonschema >= 1.3.0 @@ -89,7 +89,7 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml + libxslt-tools python-xml python-parted Packages version requirement: python-psutil >= 0.6.0 diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 8389922..cada869 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -20,6 +20,9 @@ import re import subprocess +from parted import Device as PDevice +from parted import Disk as PDisk + from kimchi.exception import OperationFailed from kimchi.utils import kimchi_log @@ -78,6 +81,17 @@ def _is_dev_leaf(devNodePath): return childrenCount == 0 +def _is_dev_extended_partition(devType, devNodePath): + if devType != 'part': + return False + diskPath = devNodePath.rstrip('0123456789') + device = PDevice(diskPath) + disk = PDisk(device) + if disk.getExtendedPartition().path == devNodePath: + return True + return False + + def _parse_lsblk_output(output, keys): # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, SIZE, MOUNTPOINT, etc @@ -122,12 +136,13 @@ def get_partitions_names(): # Only list unmounted and unformated and leaf and (partition or disk) # leaf means a partition, a disk has no partition, or a disk not held # by any multipath device. Physical volume belongs to no volume group - # is also listed. + # is also listed. Extended partitions should not be listed. if not (dev['type'] in ['part', 'disk'] and dev['fstype'] in ['', 'LVM2_member'] and dev['mountpoint'] == "" and _get_vgname(devNodePath) == "" and - _is_dev_leaf(devNodePath)): + _is_dev_leaf(devNodePath) and + not _is_dev_extended_partition(dev['type'], devNodePath)): continue names.add(name) -- 1.8.5.3

6 6

[PATCH] bug fix: remove the hard code of disk_path
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Usually the path of default pool is under /var/lib/libvirt/images/ But that not means it always is. So remove this hard code. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- tests/test_model.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_model.py b/tests/test_model.py index d661247..75cfc45 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -241,7 +241,8 @@ class ModelTests(unittest.TestCase): rollback.prependDefer(inst.vm_delete, 'test-vm-1') vm_info = inst.vm_lookup(params['name']) - disk_path = '/var/lib/libvirt/images/%s-0.img' % vm_info['uuid'] + disk_path = '%s/%s-0.img' % ( + inst.storagepool_lookup('default')['path'], vm_info['uuid']) self.assertTrue(os.access(disk_path, os.F_OK)) self.assertFalse(os.access(disk_path, os.F_OK)) -- 1.8.4.2

5 4

[PATCH] add a method to probe the permission as qemu user
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> now I want to improve the template integrity verification. I need to check the 'qemu' user can open an iso files. This patch is used to 'qemu' user has permission to open a file. Test this patch: $ mkdir -p a/b/c $ touch a/b/c/f $ chmod o-x a/b/c $ sudo PYTHONPATH=src python -c ' from kimchi.utils import probe_file_permission_as_user print probe_file_permission_as_user("a/b/c/f", "qemu")' It will return False change another user, it may return True Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/utils.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index d4ab1a1..baee936 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -22,8 +22,11 @@ # import cherrypy +import grp +from multiprocessing import Process, Queue import os import psutil +import pwd import re import subprocess import urllib2 @@ -234,3 +237,24 @@ def run_setfacl_set_attr(path, attr="r", user=""): set_user = ["setfacl", "--modify", "user:%s:%s" % (user, attr), path] out, error, ret = run_command(set_user) return ret == 0 + + +def probe_file_permission_as_user(file, user): + def probe_permission(q, file, user): + uid = pwd.getpwnam(user).pw_uid + gid = pwd.getpwnam(user).pw_gid + gids = [g.gr_gid for g in grp.getgrall() if user in g.gr_mem] + os.setgid(gid) + os.setgroups(gids) + os.setuid(uid) + try: + with open(file) as f: + q.put(True) + except Exception as e: + q.put(False) + + queue = Queue() + p = Process(target=probe_permission, args=(queue, file, user)) + p.start() + p.join() + return queue.get() -- 1.8.4.2

3 5

[RFC][PATCH V4 0/4] Issue #322
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4 update test case V2 -> V3 sort the import. V1 -> V2 use debug to log the open exception trace stack. It is complex to check the permission for qemu user. There are too many access controlling mechanisms in Linux, such as ACL, traditional ugo+-rwx, SELinux and AppArmor. It's not possible to enumerate and check every access mechanisms if it allows QEMU to access a file. So now I'm simply trying to access the file with qemu user and see if it's OK It is simple and avoid handling corner case. Also I can try to start a simple guest with the given iso. ShaoHe Feng (4): add a method to probe the permission as qemu user qemu user tests: probe the username of qemu process started by libvirt Don't allow templates to be created with ISOs that won't be usable. probe iso permission: update test case Makefile.am | 1 + src/kimchi/i18n.py | 5 ++++ src/kimchi/kvmusertests.py | 64 +++++++++++++++++++++++++++++++++++++++++++ src/kimchi/model/templates.py | 13 ++++++++- src/kimchi/utils.py | 26 ++++++++++++++++++ tests/test_model.py | 38 ++++++++++++++++--------- 6 files changed, 133 insertions(+), 14 deletions(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

3 7

[PATCH 0/3] Issue #302
by shaohef＠linux.vnet.ibm.com 11 Mar '14

11 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> let 'create' attr of networks model to create the default network ShaoHe Feng (3): move _default_network_check from top model to networks model add a new function to get an available network address Issue #302: let 'create' attr of networks model to create default network src/kimchi/model/model.py | 35 --------------------------------- src/kimchi/model/networks.py | 46 +++++++++++++++++++++++++++++++++++++------- src/kimchi/network.py | 7 +++++-- 3 files changed, 44 insertions(+), 44 deletions(-) -- 1.8.4.2

3 12