- Kimchi-devel - oVirt List Archives

[PATCH v2 0/4] Github #329: "YOU SHALL NOT ... run as root!"
by Daniel Barboza 11 Apr '14

11 Apr '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Changes: *v2: - adressed Ramon's comment about the python path in kimchid.in This patch series revamps the launch architecture to allow kimchi to not run as root while being exposed at an open http/https port. The solution adopted is using a reverse http proxy (nginx) to make the 'bridge' between two distinct cherrypy processes, one running as frontend as a regular user and another running as backend, as root. The communication with the outside will be done through nginx, running as a regular user too. The changes were heavy in the kimchid script, but the startup and usage options still the same. User-wise, there shouldn't be any functional change in the way kimchi works after applying this change. Refer to https://github.com/kimchi-project/kimchi/issues/329 for further information in all the other approaches considered and why they didn't work out. Daniel Henrique Barboza (4): Github #329: kimchid script changes Github #329: new launch script and proxy template Github #329: server, root and utils changes Github #329: config.py.in, spec, readme and makefile changes .gitignore | 2 + contrib/kimchi.spec.fedora.in | 5 +- contrib/kimchi.spec.suse.in | 3 + docs/README.md | 4 +- src/Makefile.am | 9 +- src/kimchi/config.py.in | 9 +- src/kimchi/root.py | 6 +- src/kimchi/server.py | 100 ++++++++++++--------- src/kimchi/utils.py | 42 ++++++++- src/kimchid.in | 202 ++++++++++++++++++++++++++++++++++++------ src/kimchid_server.in | 45 ++++++++++ src/nginx.conf.in | 69 +++++++++++++++ 12 files changed, 418 insertions(+), 78 deletions(-) create mode 100644 src/kimchid_server.in create mode 100644 src/nginx.conf.in -- 1.8.3.1

4 8

[PATCH] Issue#366: Guest Name Can't be Changed
by Hongliang Wang 11 Apr '14

11 Apr '14

When changing a guest name in Guest Tab, the change takes no effect because of a UI bug. Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9375c51..b771263 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -119,7 +119,7 @@ kimchi.guest_edit_main = function() { var editableFields = [ 'name' ]; var data = {}; $.each(editableFields, function(i, field) { - data[field] = $('#form-guest-edit [name="' + field + '"]').val(); + data[field] = $('input[name="' + field + '"]', guestEditForm).val(); }); kimchi.updateVM(kimchi.selectedGuest, data, function() { kimchi.listVmsAuto(); -- 1.8.1.4

5 6

[PATCH] Bug fix #347 / Support i686 architecture
by Ramon Medeiros 11 Apr '14

11 Apr '14

Bug fix #347 - Errors when retrieving network information Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index c5f889b..bb86672 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -28,7 +28,7 @@ from distutils.version import LooseVersion from kimchi.config import paths -SUPPORTED_ARCHS = {'x86': ('i386', 'x86_64'), 'power': ('ppc', 'ppc64')} +SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'), 'power': ('ppc', 'ppc64')} common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, -- 1.8.3.1

3 3

[PATCH] Fix volume not found error message
by Rodrigo Trujillo 11 Apr '14

11 Apr '14

The message 'KCHVOL0002E' expects the storage pool name, however the backend was passing the libvirt pool object, this makes the user see the python object string (useless information). This patch corrects this problem, fixing the duplicated variable name in the source code. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index c524ca3..8a568eb 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -108,8 +108,8 @@ class StorageVolumeModel(object): self.conn = kargs['conn'] self.objstore = kargs['objstore'] - def _get_storagevolume(self, pool, name): - pool = StoragePoolModel.get_storagepool(pool, self.conn) + def _get_storagevolume(self, poolname, name): + pool = StoragePoolModel.get_storagepool(poolname, self.conn) if not pool.isActive(): raise InvalidOperation("KCHVOL0006E", {'name': pool}) try: @@ -117,7 +117,7 @@ class StorageVolumeModel(object): except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_NO_STORAGE_VOL: raise NotFoundError("KCHVOL0002E", {'name': name, - 'pool': pool}) + 'pool': poolname}) else: raise -- 1.8.5.3

4 3

[PATCH] Fix debugreports download issue
by Mark Wu 11 Apr '14

11 Apr '14

Commit be5c57 renamed the debugreport uri field name from 'file' to 'uri' and updated the internal redireciton uri, but the UI side doesn't use internal redirect. So it still needs to update the corresponding UI code. --- ui/js/src/kimchi.host.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index d389702..ad62a55 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -347,7 +347,7 @@ kimchi.host_main = function() { } kimchi.downloadReport({ - file: report['file'] + file: report['uri'] }); } }], -- 1.8.4.2

3 2

[PATCH] objectstore: support sorting by a key in get_list()
by zhshzhou＠linux.vnet.ibm.com 11 Apr '14

11 Apr '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> ObjectStoreSession.get_list() just returns an unsorted id list. When the caller wants to sort the list according to a key, it has to implement the sorting code each time. This patch implement the sorting in objectstore to make the code re-usable. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/objectstore.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/kimchi/objectstore.py b/src/kimchi/objectstore.py index 153b548..d355c58 100644 --- a/src/kimchi/objectstore.py +++ b/src/kimchi/objectstore.py @@ -38,11 +38,19 @@ class ObjectStoreSession(object): self.conn = conn self.conn.text_factory = lambda x: unicode(x, "utf-8", "ignore") - def get_list(self, obj_type): + def _get_list(self, obj_type): c = self.conn.cursor() res = c.execute('SELECT id FROM objects WHERE type=?', (obj_type,)) return [x[0] for x in res] + def get_list(self, obj_type, sort_key=None): + ids = self._get_list(obj_type) + if sort_key is None: + return ids + objects = [(ident, self.get(obj_type, ident)) for ident in ids] + objects.sort(key=lambda (_, obj): obj[sort_key]) + return [ident for ident, _ in objects] + def get(self, obj_type, ident): c = self.conn.cursor() res = c.execute('SELECT json FROM objects WHERE type=? AND id=?', -- 1.8.5.3

4 3

[PATCH] Try to activate physical interface when create a network on it
by Mark Wu 11 Apr '14

11 Apr '14

Currently, the backend network interfaces API doesn't filter out the down interfaces. So the user could create network on top of a down interface. Kimchi should try to activate the interface if it's down and report failure if the cable is not plugged. In future, we could report the link status to front end and give a prompt to user that it need takes several seconds to activate the interface. --- src/kimchi/i18n.py | 2 ++ src/kimchi/model/networks.py | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 86ab5d6..3db2d4c 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -188,6 +188,8 @@ messages = { "KCHNET0017E": _("Unable to delete network %(name)s. There are some virtual machines and/or templates linked to this network."), "KCHNET0018E": _("Unable to deactivate network %(name)s. There are some virtual machines and/or templates linked to this network."), "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), + "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), + "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 8f77c12..c5fec87 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import sys +import time import ipaddr import libvirt @@ -29,7 +30,7 @@ from kimchi import xmlutils from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import MissingParameter, NotFoundError, OperationFailed from kimchi.rollbackcontext import RollbackContext -from kimchi.utils import kimchi_log +from kimchi.utils import kimchi_log, run_command class NetworksModel(object): @@ -141,6 +142,20 @@ class NetworksModel(object): 'dhcp': {'range': {'start': dhcp_start, 'end': dhcp_end}}}) + def _ensure_iface_up(self, iface): + if netinfo.operstate(iface) != 'up': + _, err, rc = run_command(['ip', 'link', 'set', 'dev', iface, 'up']) + if rc != 0: + raise OperationFailed("KCHNET0020E", + {'iface': iface, 'err': err}) + # Add a delay to wait for the link change takes into effect. + for i in range(10): + time.sleep(1) + if netinfo.operstate(iface) == 'up': + break + else: + raise OperationFailed("KCHNET0021E", {'iface': iface}) + def _set_network_bridge(self, params): try: iface = params['interface'] @@ -150,6 +165,7 @@ class NetworksModel(object): except KeyError: raise MissingParameter("KCHNET0004E", {'name': params['name']}) + self._ensure_iface_up(iface) if netinfo.is_bridge(iface): if 'vlan_id' in params: raise InvalidParameter('KCHNET0019E', {'name': iface}) -- 1.8.4.2

3 4

[PATCH 0/3] bug fix: change power off to stop for VM and add a power off confirmation.
by shaohef＠linux.vnet.ibm.com 11 Apr '14

11 Apr '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> We will add a shutdown graceful API later. "Stop" is obscure for user. Currently, stopping guests in Kimchi is not graceful in the sense that the guest becomes 'shut down' immediately. This could be be problematic because guest file systems could become corrupted. Perhaps a warning should be added before a guest is immediately stopped or reset. So "power off" is more exact than "stop" in literal meaning. The aciton power off a VM forcefully is same that we cut the physical machine power. This action may produce undesirable results, for example unflushed disk cache in the guest. We should also add a confirmation to user. ShaoHe Feng (3): change the stop to power off for VM in backend change the stop to power off for VM in UI add confirmation for power off a VM docs/API.md | 3 ++- src/kimchi/control/vms.py | 2 +- src/kimchi/i18n.py | 2 +- src/kimchi/mockmodel.py | 2 +- src/kimchi/model/vms.py | 4 ++-- tests/test_model.py | 12 ++++++------ tests/test_rest.py | 12 ++++++------ ui/js/src/kimchi.api.js | 6 +++--- ui/js/src/kimchi.guest_main.js | 23 ++++++++++++++++------- ui/pages/guest.html.tmpl | 4 ++-- ui/pages/help/guests.dita | 2 +- ui/pages/i18n.html.tmpl | 4 ++++ 12 files changed, 45 insertions(+), 31 deletions(-) -- 1.8.5.3

3 7

[PATCH] Choose available address for ide disk
by lvroyce＠linux.vnet.ibm.com 11 Apr '14

11 Apr '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Tested: 1.make check 2.adding more than 4 cdroms report error 3.less than 4 cdroms successful boot and see all cdroms. 4.When a vm does not have cdrom, adding succeed. Now when just pass source and target type, bus information, libvirt may generate another controller for ide disk appending, this will be conflict with libvirt's limitation of 1 ide controller. This patch choose available bus_id and unit_id for ide disk to make sure we can reach the limit of 4 cdroms per vm. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/vmstorages.py | 56 +++++++++++++++++++++++++++++++----------- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 86ab5d6..4ca83d9 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -230,6 +230,7 @@ messages = { "KCHCDROM0011E": _("Do not support guest CDROM hot plug attachment"), "KCHCDROM0012E": _("Specify type and path to add a new virtual machine disk"), "KCHCDROM0013E": _("Specify path to update virtual machine disk"), + "KCHCDROM0014E": _("Controller type %(type)s limitation %(limit)s reached"), "KCHREPOS0001E": _("YUM Repository ID must be one word only string."), "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."), diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 3b5f99e..b3f22db 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -37,6 +37,16 @@ DEV_TYPE_SRC_ATTR_MAP = {'file': 'file', 'block': 'dev'} +def _get_device_xml(dom, dev_name): + # Get VM xml and then devices xml + xml = dom.XMLDesc(0) + devices = objectify.fromstring(xml).devices + disk = devices.xpath("./disk/target[@dev='%s']/.." % dev_name) + if not disk: + return None + return disk[0] + + def _get_storage_xml(params): src_type = params.get('src_type') disk = E.disk(type=src_type, device=params.get('type')) @@ -56,6 +66,12 @@ def _get_storage_xml(params): disk.append(source) disk.append(E.target(dev=params.get('dev'), bus=params.get('bus', 'ide'))) + if params.get('address'): + print params['address'] + disk.append(E.address( + type='drive', controller=params['address']['controller'], + bus=params['address']['bus'], target='0', + unit=params['address']['unit'])) return ET.tostring(disk) @@ -89,6 +105,27 @@ class VMStoragesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] + def _get_available_ide_address(self, vm_name): + dom = VMModel.get_vm(vm_name, self.conn) + disks = self.get_list(vm_name) + valid_id = [('0', '0'), ('0', '1'), ('1', '0'), ('1', '1')] + controller_id = '0' + for dev_name in disks: + disk = _get_device_xml(dom, dev_name) + if disk.target.attrib['bus'] == 'ide': + controller_id = disk.address.attrib['controller'] + bus_id = disk.address.attrib['bus'] + unit_id = disk.address.attrib['unit'] + if (bus_id, unit_id) in valid_id: + valid_id.remove((bus_id, unit_id)) + continue + if not valid_id: + raise OperationFailed('KCHCDROM0014E', {'type': 'ide', 'limit': 4}) + else: + address = {'controller': controller_id, + 'bus': valid_id[0][0], 'unit': valid_id[0][1]} + return dict(address=address) + def create(self, vm_name, params): dom = VMModel.get_vm(vm_name, self.conn) if DOM_STATE_MAP[dom.info()[0]] != 'shutoff': @@ -109,8 +146,7 @@ class VMStoragesModel(object): path = params['path'] params['src_type'] = _check_cdrom_path(path) - # Check if path is an url - + params.update(self._get_available_ide_address(vm_name)) # Add device to VM dev_xml = _get_storage_xml(params) try: @@ -147,19 +183,10 @@ class VMStorageModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] - def _get_device_xml(self, vm_name, dev_name): - # Get VM xml and then devices xml - dom = VMModel.get_vm(vm_name, self.conn) - xml = dom.XMLDesc(0) - devices = objectify.fromstring(xml).devices - disk = devices.xpath("./disk/target[@dev='%s']/.." % dev_name) - if not disk: - return None - return disk[0] - def lookup(self, vm_name, dev_name): # Retrieve disk xml and format return dict - disk = self._get_device_xml(vm_name, dev_name) + dom = VMModel.get_vm(vm_name, self.conn) + disk = _get_device_xml(dom, dev_name) if disk is None: raise NotFoundError("KCHCDROM0007E", {'dev_name': dev_name, 'vm_name': vm_name}) @@ -188,7 +215,8 @@ class VMStorageModel(object): def delete(self, vm_name, dev_name): # Get storage device xml - disk = self._get_device_xml(vm_name, dev_name) + dom = VMModel.get_vm(vm_name, self.conn) + disk = _get_device_xml(dom, dev_name) if disk is None: raise NotFoundError("KCHCDROM0007E", {'dev_name': dev_name, -- 1.8.3.2

3 2

[PATCH] Fix pyparted dependency problem
by lvroyce＠linux.vnet.ibm.com 11 Apr '14

11 Apr '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> On opensuse, libvirt and python-parted depend on same lib of different versions, working this problem around by using parted command instead of python-parted library. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/README.md | 6 +++--- src/kimchi/disks.py | 49 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/docs/README.md b/docs/README.md index 8b8b181..a3e1403 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 pyparted + iscsi-initiator-utils libxslt # 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 python-parted + open-iscsi lvm2 xsltproc 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 python-parted + libxslt-tools python-xml Packages version requirement: python-psutil >= 0.6.0 diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 5f004b3..1611459 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -20,11 +20,8 @@ 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 +from kimchi.utils import kimchi_log, run_command, parse_cmd_output def _get_friendly_dm_path(maj_min): @@ -92,15 +89,19 @@ 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) - extended_part = PDisk(device).getExtendedPartition() - if extended_part and extended_part.path == devNodePath: - return True - return False +def _get_disks(): + disks = list() + output, error, returncode = run_command(['lsblk', '--nodeps']) + if returncode != 0: + raise OperationFailed('Cannot retrieve block info') + + targets = parse_cmd_output(output, + output_items=['name', 'magic', 'rm', 'size', 'ro', 'type']) + for target in targets: + if target['type'] == 'disk': + disks.append('/dev/%s' % target['name']) + + return disks def _parse_lsblk_output(output, keys): @@ -134,11 +135,31 @@ def _get_vgname(devNodePath): return re.findall(r"LVM2_VG_NAME='([^\']*)'", out)[0] +def _get_extended_partitions(): + disks = _get_disks() + extended_parts = list() + + for disk in disks: + output, error, returncode = run_command(['parted', disk, 'print']) + if returncode != 0: + kimchi_log.error('Cannot get partition info of %s', disk) + + outs = output.partition('File system Flags') + partitions = parse_cmd_output(outs[2], + output_items=['number', 'start', 'end', 'size', 'type', 'fs', 'flags']) + for partition in partitions: + if partition['type'] == 'extended': + extended_parts.append('%s%s' % (disk.lstrip('/dev/'), partition['number'])) + + return extended_parts + + def get_partitions_names(): names = set() keys = ["NAME", "TYPE", "FSTYPE", "MOUNTPOINT", "MAJ:MIN"] # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, MOUNTPOINT + extended_parts = _get_extended_partitions() for dev in _get_lsblk_devs(keys): # split()[0] to avoid the second part of the name, after the # whiteline @@ -153,7 +174,7 @@ def get_partitions_names(): dev['mountpoint'] == "" and _get_vgname(devNodePath) == "" and _is_dev_leaf(devNodePath) and - not _is_dev_extended_partition(dev['type'], devNodePath)): + name not in extended_parts): continue names.add(name) -- 1.8.3.2

4 3