December 2014 - Kimchi-devel - oVirt List Archives

RFC - Guest memory usage
by Daniel Henrique Barboza 27 Oct '15

27 Oct '15

I was looking at the following item in the backlog: Guests Stats: Display memory utilization (use virt-df or virt-top or ...) If I understood it right, the idea here is to show the -inner- memory allocation of the guest. If you have a VM with 4Gb of RAM running an Ubuntu, we want to know how much memory the Ubuntu OS and its processes are using. I've done an investigation and I haven't found any tool to accomplish this. "virt-top", "virsh dommemstat" and the libvirt API retrieves the information of the memory usage of the guest relative to the host. In the example mentioned before, supposing that the host has 64Gb of RAM, all these tools would show that the VM is using 12% of the host RAM. They do not dive in the VM and shows the actual mem usage of the Ubuntu and its processes running there. Haven't found anything useful in other MLs and forums. The common answer is 'run top in a terminal inside the VM', which of course does not suit us. My question is: any thoughts about how we can implement this feature? Because I am starting to think that, in the end, this kind of info is strict to the guest OS and can't be polled from the outside. Thanks!

5 5

[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

CPU discussion (RE: psutil.NUM_CPUS)
by Christy Perez 29 Jan '15

29 Jan '15

After my confusion on Paulo's patch a few weeks ago, I thought I had just gotten confused, and so I put psutil.NUM_CPUS in my SMT/HT patch. However, testing now on x86, I'm noticing a difference in the way Power and x86 report CPUS. On my laptop: <cpu> <arch>x86_64</arch> <model>SandyBridge</model> <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='2'/> psutil.NUM_CPUS returns 4 On a Power7 system with 16 cores, 4 threads/core (so 64 total threads), psutil.NUM_CPUS returns 16. And this is, it turns out, because (and this sounds odd) for *guests* to be able to do SMT on Power, SMT has to be disabled. So, psutil.NUM_CPUS will not report the number of vCPUs that are available to guests. The same change would happen on x86 if you disabled HT, I assume. So, revisiting this difference that I noticed but wasn't able to articulate very well last time, do we want to make a change to the host code to use ppc64_cpu if the arch is Power, instead of psutil.NUM_CPUS? SMT *is* off, so, technically this isn't correct, but I think we should provide this information with guests in mind since we are a virtualization platform. Regards, - Christy

2 1

[PATCH] Delete reference count when deleting storage volume
by lvroyce＠linux.vnet.ibm.com 13 Jan '15

13 Jan '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> If ref count remains in system after volume delete, it will cause side effect in creating a volume of same name. Fix this by deleting reference count when deleting storage volume. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/diskutils.py | 13 +++++++++++++ src/kimchi/model/storagevolumes.py | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/diskutils.py b/src/kimchi/model/diskutils.py index 1d575cb..7eb24d2 100644 --- a/src/kimchi/model/diskutils.py +++ b/src/kimchi/model/diskutils.py @@ -73,3 +73,16 @@ def set_disk_ref_cnt(objstore, path, new_count): session.store('storagevolume', path, {'ref_cnt': new_count}) except Exception as e: raise OperationFailed('KCHVOL0017E', {'err': e.message}) + + +def clean_disk_ref_cnt(objstore, path): + try: + with objstore as session: + session.delete('storagevolume', path) + except NotFoundError: + pass + except Exception as e: + kimchi_log.error('Unable to delete storage volume in' + ' objectstore due error: %s', + e.message) + raise OperationFailed('KCHVOL0017E', {'err': e.message}) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 406b38b..cf83b0e 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -30,7 +30,7 @@ from kimchi.config import READONLY_POOL_TYPE from kimchi.exception import InvalidOperation, InvalidParameter, IsoFormatError from kimchi.exception import MissingParameter, NotFoundError, OperationFailed from kimchi.isoinfo import IsoImage -from kimchi.model.diskutils import get_disk_ref_cnt +from kimchi.model.diskutils import get_disk_ref_cnt, clean_disk_ref_cnt from kimchi.model.storagepools import StoragePoolModel from kimchi.model.tasks import TaskModel from kimchi.utils import add_task, get_next_clone_name, kimchi_log @@ -306,6 +306,7 @@ class StorageVolumeModel(object): raise InvalidParameter("KCHVOL0012E", {'type': pool_info['type']}) volume = self._get_storagevolume(pool, name) + clean_disk_ref_cnt(self.objstore, volume.path()) try: volume.delete(0) except libvirt.libvirtError as e: -- 1.9.3

3 3

[PATCH 0/3] Issue #544
by Crístian Viana 08 Jan '15

08 Jan '15

This is the first patchset which fixes the issue #544. After applying these patches, the user can now download image files to a logical storage pool. However, they cannot create a template with it because (1) the UI filters the storage volumes and only displays the ones with format='iso' and storage volumes stored in a logical pool always have format='raw', and (2) the template classes fail to identify logical volumes as files because they're symlinks. Editing an existing VM's XML to use the storage volume downloaded to a logical pool works, though. Crístian Viana (3): Change "_get_storagevolume" to static Use 'bytes' as volume capacity and allocation unit issue #544: Refactor storage volume download docs/API.md | 4 +- src/kimchi/model/storagevolumes.py | 75 +++++++++++++++++++++++++++++++------- tests/test_model.py | 19 +++++----- tests/test_rest.py | 12 +++--- 4 files changed, 78 insertions(+), 32 deletions(-) -- 2.1.0

3 8

Kimchi UI Design Update
by Don S. Spangler 08 Jan '15

08 Jan '15

All -- I have updated the Kimchi UI design wiki page (UI Design <https://github.com/kimchi-project/kimchi/wiki/UI-Design-Proposals>) with the latest design covering blueprints (icons / graphics, font, color, layout) and interactions for all tabs. Included as well are specific task panels with the design style applied (more panels will be included as we go and can work on specific ones earlier on request). There is ongoing work which will cover responsiveness which will be posted separately when it is completed. Thanks again to everyone for their feedback on the initial version and we look forward to your thoughts on these updates. Don Spangler

5 7

[PATCH 0/5] Bug fixes and network tests
by Aline Manera 07 Jan '15

07 Jan '15

Aline Manera (5): Add message to KCHNET0010E code Bug fix: Allow deleting VLAN tagging bridged network Network API: Update docs/API.md Move rollback_wrapper function to a common place Reorganize the network tests docs/API.md | 11 ++-- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 6 +- tests/test_model.py | 86 ++----------------------- tests/test_network.py | 147 +++++++++++++++++++++++++++++++++++++++++++ tests/test_rest.py | 64 ------------------- tests/utils.py | 15 ++++- 7 files changed, 175 insertions(+), 155 deletions(-) create mode 100644 tests/test_network.py -- 2.1.0

3 15

[PATCH] <Fix problems of edit a guest contains snapshots>
by gouzongmei＠ourfuture.cn 06 Jan '15

06 Jan '15

From: Zongmei Gou <gouzongmei(a)ourfuture.cn> --- src/kimchi/control/base.py | 13 ++++++++++--- src/kimchi/model/vms.py | 24 ++++++++++++++++++------ src/kimchi/model/vmsnapshots.py | 8 ++++++-- src/kimchi/xmlutils/utils.py | 5 +++++ 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 60db1df..ff31d47 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -58,10 +58,17 @@ class Resource(object): self.role_key = None self.admin_methods = [] - def _redirect(self, ident, code=303): - if ident is not None and ident != self.ident: + def _redirect(self, action_result, code=303): + if isinstance(action_result, list): + uri_params = [] + for arg in action_result: + if arg is None: + arg = '' + uri_params.append(urllib2.quote(arg.encode('utf-8'),safe="")) + raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) + elif action_result is not None and action_result != self.ident: uri_params = list(self.model_args[:-1]) - uri_params += [urllib2.quote(ident.encode('utf-8'), safe="")] + uri_params += [urllib2.quote(action_result.encode('utf-8'), safe="")] raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) def generate_action_handler(self, action_name, action_args=None): diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3aa1145..0caa1fd 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -668,22 +668,34 @@ class VMModel(object): new_xml = self._update_graphics(dom, new_xml, params) conn = self.conn.get() + snapshot_xmls = [] try: if 'name' in params: - if state == 'running': - msg_args = {'name': dom.name(), 'new_name': params['name']} - raise InvalidParameter("KCHVM0003E", msg_args) - - # Undefine old vm, only if name is going to change - dom.undefine() + new_name = params['name'] + name = dom.name() + if new_name != name: + if state == 'running': + raise InvalidParameter("KCHVM0003E", {'name': name, 'new_name': new_name}) + + # get snapshots before vm undefine, original snapshots will be created in the new named vm + snapshot_names = dom.snapshotListNames(0) + for snapshot_name in snapshot_names: + vir_snap = self.vmsnapshot.get_vmsnapshot(name, snapshot_name) + snapshot_xmls.append(vir_snap.getXMLDesc(0)) + # Undefine old vm, only if name is going to change + dom.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA) root = ET.fromstring(new_xml) currentMem = root.find('.currentMemory') if currentMem is not None: root.remove(currentMem) dom = conn.defineXML(ET.tostring(root, encoding="utf-8")) + for snapshot_xml in snapshot_xmls: + dom.snapshotCreateXML(snapshot_xml, 1) except libvirt.libvirtError as e: dom = conn.defineXML(old_xml) + for snapshot_xml in snapshot_xmls: + dom.snapshotCreateXML(snapshot_xml, 1) raise OperationFailed("KCHVM0008E", {'name': dom.name(), 'err': e.get_error_message()}) return dom diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py index 725770d..569c7ad 100644 --- a/src/kimchi/model/vmsnapshots.py +++ b/src/kimchi/model/vmsnapshots.py @@ -29,7 +29,7 @@ from kimchi.model.tasks import TaskModel from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.vmstorages import VMStorageModel, VMStoragesModel from kimchi.utils import add_task - +from kimchi.xmlutils.utils import xml_item_get class VMSnapshotsModel(object): def __init__(self, **kargs): @@ -155,7 +155,11 @@ class VMSnapshotModel(object): try: vir_dom = VMModel.get_vm(vm_name, self.conn) vir_snap = self.get_vmsnapshot(vm_name, name) - vir_dom.revertToSnapshot(vir_snap, 0) + ret = vir_dom.revertToSnapshot(vir_snap, 0) + if ret == 0: + xmlObj = vir_snap.getXMLDesc(0) + new_vmname = xml_item_get(xmlObj, 'domain/name') + return [new_vmname, name] except libvirt.libvirtError, e: raise OperationFailed('KCHSNAP0009E', {'name': name, 'vm': vm_name, diff --git a/src/kimchi/xmlutils/utils.py b/src/kimchi/xmlutils/utils.py index be08a14..843a113 100644 --- a/src/kimchi/xmlutils/utils.py +++ b/src/kimchi/xmlutils/utils.py @@ -65,3 +65,8 @@ def _dictize(e): else: d[child.tag] = _dictize(child) return d + +def xml_item_get(xml, xpath): + root = ET.fromstring(xml) + item = root.find(xpath) + return item.text -- 1.7.1

2 1

[PATCH V2] Po support: translation for Chinese
by Wen Wang 03 Jan '15

03 Jan '15

V1 -> V2: Minor wording changes. Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..0766585 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-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-18 17:08+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机设备%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "不能访问文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "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?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 1.9.3

2 3

Re: [Kimchi-devel] [PATCH] <Fix problems of edit a guest contains snapshots>
by Aline Manera 29 Dec '14

29 Dec '14

The patch seems good for me. I will just wait for a reply from Cristian as he was working on it. On 20/12/2014 04:26, gouzongmei(a)ourfuture.cn wrote: > From: Zongmei Gou <gouzongmei(a)ourfuture.cn> > > --- > src/kimchi/control/base.py | 13 ++++++++++--- > src/kimchi/model/vms.py | 24 ++++++++++++++++++------ > src/kimchi/model/vmsnapshots.py | 8 ++++++-- > src/kimchi/xmlutils/utils.py | 5 +++++ > 4 files changed, 39 insertions(+), 11 deletions(-) > > diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py > index 60db1df..ff31d47 100644 > --- a/src/kimchi/control/base.py > +++ b/src/kimchi/control/base.py > @@ -58,10 +58,17 @@ class Resource(object): > self.role_key = None > self.admin_methods = [] > > - def _redirect(self, ident, code=303): > - if ident is not None and ident != self.ident: > + def _redirect(self, action_result, code=303): > + if isinstance(action_result, list): > + uri_params = [] > + for arg in action_result: > + if arg is None: > + arg = '' > + uri_params.append(urllib2.quote(arg.encode('utf-8'),safe="")) > + raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) > + elif action_result is not None and action_result != self.ident: > uri_params = list(self.model_args[:-1]) > - uri_params += [urllib2.quote(ident.encode('utf-8'), safe="")] > + uri_params += [urllib2.quote(action_result.encode('utf-8'), safe="")] > raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) > > def generate_action_handler(self, action_name, action_args=None): > diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py > index 3aa1145..0caa1fd 100644 > --- a/src/kimchi/model/vms.py > +++ b/src/kimchi/model/vms.py > @@ -668,22 +668,34 @@ class VMModel(object): > new_xml = self._update_graphics(dom, new_xml, params) > > conn = self.conn.get() > + snapshot_xmls = [] > try: > if 'name' in params: > - if state == 'running': > - msg_args = {'name': dom.name(), 'new_name': params['name']} > - raise InvalidParameter("KCHVM0003E", msg_args) > - > - # Undefine old vm, only if name is going to change > - dom.undefine() > + new_name = params['name'] > + name = dom.name() > + if new_name != name: > + if state == 'running': > + raise InvalidParameter("KCHVM0003E", {'name': name, 'new_name': new_name}) > + > + # get snapshots before vm undefine, original snapshots will be created in the new named vm > + snapshot_names = dom.snapshotListNames(0) > + for snapshot_name in snapshot_names: > + vir_snap = self.vmsnapshot.get_vmsnapshot(name, snapshot_name) > + snapshot_xmls.append(vir_snap.getXMLDesc(0)) > + # Undefine old vm, only if name is going to change > + dom.undefineFlags(libvirt.VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA) > > root = ET.fromstring(new_xml) > currentMem = root.find('.currentMemory') > if currentMem is not None: > root.remove(currentMem) > dom = conn.defineXML(ET.tostring(root, encoding="utf-8")) > + for snapshot_xml in snapshot_xmls: > + dom.snapshotCreateXML(snapshot_xml, 1) > except libvirt.libvirtError as e: > dom = conn.defineXML(old_xml) > + for snapshot_xml in snapshot_xmls: > + dom.snapshotCreateXML(snapshot_xml, 1) > raise OperationFailed("KCHVM0008E", {'name': dom.name(), > 'err': e.get_error_message()}) > return dom > diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py > index 725770d..569c7ad 100644 > --- a/src/kimchi/model/vmsnapshots.py > +++ b/src/kimchi/model/vmsnapshots.py > @@ -29,7 +29,7 @@ from kimchi.model.tasks import TaskModel > from kimchi.model.vms import DOM_STATE_MAP, VMModel > from kimchi.model.vmstorages import VMStorageModel, VMStoragesModel > from kimchi.utils import add_task > - > +from kimchi.xmlutils.utils import xml_item_get > > class VMSnapshotsModel(object): > def __init__(self, **kargs): > @@ -155,7 +155,11 @@ class VMSnapshotModel(object): > try: > vir_dom = VMModel.get_vm(vm_name, self.conn) > vir_snap = self.get_vmsnapshot(vm_name, name) > - vir_dom.revertToSnapshot(vir_snap, 0) > + ret = vir_dom.revertToSnapshot(vir_snap, 0) > + if ret == 0: > + xmlObj = vir_snap.getXMLDesc(0) > + new_vmname = xml_item_get(xmlObj, 'domain/name') > + return [new_vmname, name] > except libvirt.libvirtError, e: > raise OperationFailed('KCHSNAP0009E', {'name': name, > 'vm': vm_name, > diff --git a/src/kimchi/xmlutils/utils.py b/src/kimchi/xmlutils/utils.py > index be08a14..843a113 100644 > --- a/src/kimchi/xmlutils/utils.py > +++ b/src/kimchi/xmlutils/utils.py > @@ -65,3 +65,8 @@ def _dictize(e): > else: > d[child.tag] = _dictize(child) > return d > + > +def xml_item_get(xml, xpath): > + root = ET.fromstring(xml) > + item = root.find(xpath) > + return item.text

1 0

[PATCH 0/3] Bugfix #496 System leftovers after uninstalling Kimchi
by Ramon Medeiros 29 Dec '14

29 Dec '14

Ramon Medeiros (3): Remove empty directories after rpm -e kimchi on fedora Don't let empty directories left on suse Remove directories under /var/lib/kimchi if empty on ubuntu contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++- contrib/kimchi.spec.suse.in | 20 +++++++++++++++++++- contrib/make-deb.sh.in | 4 ++++ 3 files changed, 43 insertions(+), 2 deletions(-) -- 1.8.3.1

2 11

[PATCH 0/3] Bugfix #496 System leftovers after uninstalling Kimchi v3
by Ramon Medeiros 29 Dec '14

29 Dec '14

v2: Fix suse based on fedora v3: Put ubuntu changes on Makefile Use the variables instead path Ramon Medeiros (3): Remove empty directories after rpm -e kimchi on fedora Don't let empty directories left on suse Remove directories under /var/lib/kimchi if empty on ubuntu Makefile.am | 5 +++++ contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++- contrib/kimchi.spec.suse.in | 20 +++++++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) -- 1.8.3.1

2 4

[PATCH v3 0/2] Issue #543
by Crístian Viana 29 Dec '14

29 Dec '14

The differences between this and the previous patchset are: - Patch "Support different "tags" when generating a new name in "get_next_clone_name"" has been discarded. - Patch 2/2 has been updated to generate unique names in the form "index.html (1)". Crístian Viana (2): bugfix: Fix regexp in "kimchi.utils.get_next_clone_name" issue #543: Generate unique names when creating volumes without name src/kimchi/model/storagevolumes.py | 9 +++++++-- src/kimchi/utils.py | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) -- 1.9.3

2 3

[PATCHv2] Issue#536: raise proper error message when disk os info absent
by lvroyce＠linux.vnet.ibm.com 29 Dec '14

29 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When disk os cannot be decided by libguestfs, it will leave it to 'unknown' distro and version. But if no boot information available, ImageFormatError is left unhandled and this will introduce 500 error when disk os info is absent. Handle this error to fix this. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 6 +++++- tests/test_model.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 8582d48..3266e7b 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi import imageinfo from kimchi import osinfo from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter +from kimchi.exception import ImageFormatError, OperationFailed from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri from kimchi.xmlutils.disk import get_disk_xml @@ -51,7 +52,10 @@ class VMTemplate(object): self.fc_host_support = args.get('fc_host_support') # Fetch defaults based on the os distro and version - distro, version = self._get_os_info(args, scan) + try: + distro, version = self._get_os_info(args, scan) + except ImageFormatError as e: + raise OperationFailed('KCHTMPL0020E', {'err': e.message}) os_distro = args.get('os_distro', distro) os_version = args.get('os_version', version) entry = osinfo.lookup(os_distro, os_version) diff --git a/tests/test_model.py b/tests/test_model.py index aa2a1bb..2bcb075 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -196,7 +196,7 @@ class ModelTests(unittest.TestCase): vol_path = inst.storagevolume_lookup('default', vol)['path'] params = {'name': 'test', 'disks': [{'base': vol_path}]} - self.assertRaises(ImageFormatError, inst.templates_create, params) + self.assertRaises(OperationFailed, inst.templates_create, params) # Hack the model objstore to add a new template # It is needed as the image file must be a bootable image when -- 1.8.3.2

3 2

[PATCH] Po support: translation for Chinese
by Wen Wang 29 Dec '14

29 Dec '14

Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "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?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 1.9.3

3 3

[v7 1/1] Virtual machine migration
by simonjin＠linux.vnet.ibm.com 22 Dec '14

22 Dec '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> v7-v6: Add migrate check in API.json. Add abstract a helper function task_is_running. Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> Signed-off-by: yuntong <yuntongjin(a)gmail.com> --- docs/API.md | 5 ++ src/kimchi/API.json | 27 ++++++++ src/kimchi/control/vms.py | 3 + src/kimchi/i18n.py | 12 ++++ src/kimchi/model/utils.py | 18 ++++++ src/kimchi/model/vms.py | 159 +++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 222 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index 210a036..349c950 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,11 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: User of the remote server. + * passwd: Passwd of user on remote server. + * secure *(optional)*: Migrate in P2P secure tunel mode. * clone: Create a new VM identical to this VM. The new VM's name, UUID and network MAC addresses will be generated automatically. Each existing diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c5d7bdb..f6aff5e 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -305,6 +305,33 @@ } } }, + "vm_migrate": { + "type": "object", + "properties": { + "remoteHost": { + "description": "IP address or hostname of the remote server", + "type": "string", + "minLength": 1, + "error": "KCHVM0044E" + }, + "user": { + "description": "User of the remote server", + "type": "string", + "minLength": 1, + "error": "KCHVM0045E" + }, + "passwd": { + "description": "Passwd of user on remote server", + "type": "string", + "error": "KCHVM0046E" + }, + "secure": { + "description": "Migrate in P2P secure tunel mode(optional)", + "type": "boolean", + "error": "KCHVM0047E" + } + } + }, "networks_create": { "type": "object", "error": "KCHNET0016E", diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index a1589ef..3638b3a 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,9 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', + ['remoteHost', 'user', + 'passwd', 'secure']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e3a051c..90eae92 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -107,6 +107,18 @@ messages = { "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Migrate %(name)s to localhost %(remoteHost)s is not allowed."), + "KCHVM0037E": _("vm %(name)s is already in migrating, can not perform migrate on it again."), + "KCHVM0038E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0039E": _("Can't migrate %(name)s from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0040E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0041E": _("Can not migrate vm %(name)s when its in %(state)s state."), + "KCHVM0042E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0043E": _("Failed to destroy vm %(name)s from migration recover. Details: %(err)s"), + "KCHVM0044E": _("Migrate remoteHost must be a string"), + "KCHVM0045E": _("User name of the remote server must be a string"), + "KCHVM0046E": _("The passwd of remote server must be a string"), + "KCHVM0047E": _("Migrate secure must be a boolean value."), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index 9896289..8c67943 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -24,7 +24,9 @@ from lxml import etree, objectify from lxml.builder import E, ElementMaker from kimchi.exception import OperationFailed +from kimchi.exception import NotFoundError from kimchi.model.featuretests import FeatureTests +from kimchi.utils import kimchi_log KIMCHI_META_URL = "https://github.com/kimchi-project/kimchi" KIMCHI_NAMESPACE = "kimchi" @@ -161,3 +163,19 @@ def get_metadata_node(dom, tag, metadata_support, mode="current"): if node is not None: return etree.tostring(node) return "" + + +def task_is_running(tasks, task, target_uri): + try: + alltasks = tasks.get_list() + for taskid in alltasks: + taskobj = task.lookup(taskid) + if taskobj['target_uri'] == target_uri \ + and taskobj['status'] == "running": + kimchi_log.debug('task with target_uri %s is running.' + % target_uri) + return True + except NotFoundError: + kimchi_log.debug('task with target_uri %s is not running.' + % target_uri) + return False diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3aa1145..94412e8 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -33,13 +33,15 @@ from cherrypy.process.plugins import BackgroundTask 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.exception import NotFoundError, OperationFailed, KimchiException from kimchi.model.config import CapabilitiesModel -from kimchi.model.tasks import TaskModel +from kimchi.model.libvirtconnection import LibvirtConnection +from kimchi.model.tasks import TaskModel, TasksModel from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name from kimchi.model.utils import get_metadata_node from kimchi.model.utils import set_metadata_node +from kimchi.model.utils import task_is_running from kimchi.rollbackcontext import RollbackContext from kimchi.screenshot import VMScreenshot from kimchi.utils import add_task, get_next_clone_name, import_class @@ -268,6 +270,7 @@ class VMModel(object): self.groups = import_class('kimchi.model.groups.GroupsModel')(**kargs) self.vms = VMsModel(**kargs) self.task = TaskModel(**kargs) + self.tasks = TasksModel(**kargs) self.storagepool = model.storagepools.StoragePoolModel(**kargs) self.storagevolume = model.storagevolumes.StorageVolumeModel(**kargs) self.storagevolumes = model.storagevolumes.StorageVolumesModel(**kargs) @@ -850,6 +853,158 @@ class VMModel(object): raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + def _preCheck(self, name, destConn, remoteHost): + """Pre check before migration""" + + kimchi_log.debug('precheck migrate %s' % name) + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s Can not migrate to localhost.' % name) + raise OperationFailed("KCHVM0036E", {'name': name, + 'remoteHost': remoteHost}) + # check if the vm already in migration + if task_is_running(self.tasks, self.task, "/vms/%s/migrate" % name): + raise OperationFailed("KCHVM0037E", {'name': name}) + + srcarch = self.conn.get().getInfo()[0] + destarch = _destConn.getInfo()[0] + if srcarch != destarch: + kimchi_log.debug('vm %s can not migrate to different arch server.' + % (name, destarch)) + raise OperationFailed("KCHVM0038E", {'name': name, + 'srcarch': srcarch, + 'destarch': destarch}) + srchyp = self.conn.get().getType() + desthyp = _destConn.getType() + if srchyp != desthyp: + kimchi_log.debug('vm %s can not migrate to a different hypervisor' + % name) + raise OperationFailed("KCHVM0039E", {'name': name, + 'srchyp': srchyp, + 'desthyp': desthyp}) + + # model.host import DOM_STATE_MAP, vmhostdevs import host, + # to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + # check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn=self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM0040E", {'name': name, + 'hostdevs': hostdevs}) + + @staticmethod + def _getRemoteConn(remoteHost, user, passwd, transport='ssh'): + """open destination connect to migrate""" + + duri = 'qemu+%s://%s@%s/system' % (transport, user, remoteHost) + conn = LibvirtConnection(duri) + return conn + + def _do_migrate(self, cb, params): + """Asynchronous function which performs the migrate operation. + + Arguments: + cb -- A callback function to signal the Task's progress. + params -- A dict with the following values: + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + "remoteHost": The migration destination server. + "secure": Migrate in P2P secure tunel mode.(optional) + """ + + name = params['name'].decode('utf-8') + destConn = params['destConn'] + remoteHost = params['remoteHost'] + secure = params['secure'] + _destConn = destConn.get() + + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + dom = self.get_vm(name, self.conn) + flag = 0 + if secure: + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state in ['running', 'paused']: + flag |= libvirt.VIR_MIGRATE_LIVE + elif state == 'shutoff': + flag |= (libvirt.VIR_MIGRATE_OFFLINE | + libvirt.VIR_MIGRATE_PERSIST_DEST) + else: + kimchi_log.debug('Can not migrate vm %s when its in %s.' + % (name, state)) + raise OperationFailed("KCHVM0041E", {'name': name, + 'state': state}) + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, remoteHost)) + self._recover(name, destConn, cb) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', False) + raise OperationFailed('KCHVM0042E', {'err': e.message, + 'name': name}) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', True) + + def migrate(self, name, remoteHost, user, passwd=None, secure=False): + """Migrate a virtual machine to a remote server. + + Arguments: + name -- The name of the virtual machine to be migrated. + remoteHost -- Remote server that the VM will be migrated to. + user -- Login user on remote server,prefer root. + passwd -- The password of the user on remote server, + if the local server + has ssk key exchanged, then this param can be NULL. + secure -- Migrate in P2P secure tunel mode.(optional) + + Return: + A Task running the clone operation. + """ + name = name.decode('utf-8') + remoteHost = remoteHost.decode('utf-8') + user = user.decode('utf-8') + + destConn = self._getRemoteConn(remoteHost, user, passwd) + self._preCheck(name, destConn, remoteHost) + + params = {'name': name, + 'destConn': destConn, + 'remoteHost': remoteHost, + 'secure': secure} + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, + self.objstore, params) + + return self.task.lookup(task_id) + + def _recover(self, name, destconn, cb): + """Recover from a failed migration. + + Arguments: + "cb": A callback function to signal the Task's progress. + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + """ + try: + destvm = self.get_vm(name, destconn) + except KimchiException as e: + if type(e) == NotFoundError: + return + + cb('recover from a failed migration', False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("Failed to destory migrate vm %s on \ + destination server" % name) + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0043E', {'name': name, + 'err': e.message}) + def poweroff(self, name): dom = self.get_vm(name, self.conn) try: -- 1.8.3.1

1 0

[v6 1/1] Virtual machine migration
by simonjin＠linux.vnet.ibm.com 21 Dec '14

21 Dec '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> v6-v5:Fix pep8, delete migratation finish func. Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- docs/API.md | 5 ++ src/kimchi/control/vms.py | 3 + src/kimchi/i18n.py | 8 +++ src/kimchi/model/vms.py | 166 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 180 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index 210a036..4408764 100644 --- a/docs/API.md +++ b/docs/API.md @@ -132,6 +132,11 @@ the following general conventions: It emulates the power reset button on a machine. Note that there is a risk of data loss caused by reset without the guest OS shutdown. * connect: Prepare the connection for spice or vnc +* migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. + * remoteHost: IP address or hostname of the remote server. + * user: User of the remote server. + * passwd: Passwd of user on remote server. + * secure: Migrate in P2P secure tunel mode.(optional) * clone: Create a new VM identical to this VM. The new VM's name, UUID and network MAC addresses will be generated automatically. Each existing diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index a1589ef..3638b3a 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -42,6 +42,9 @@ class VM(Resource): for ident, node in sub_nodes.items(): setattr(self, ident, node(model, self.ident)) self.start = self.generate_action_handler('start') + self.migrate = self.generate_action_handler_task('migrate', + ['remoteHost', 'user', + 'passwd', 'secure']) self.poweroff = self.generate_action_handler('poweroff') self.shutdown = self.generate_action_handler('shutdown') self.reset = self.generate_action_handler('reset') diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e3a051c..81a6dbb 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -107,6 +107,14 @@ messages = { "KCHVM0033E": _("Virtual machine '%(name)s' must be stopped before cloning it."), "KCHVM0034E": _("Insufficient disk space to clone virtual machine '%(name)s'"), "KCHVM0035E": _("Unable to clone VM '%(name)s'. Details: %(err)s"), + "KCHVM0036E": _("Migrate %(name)s to localhost %(remoteHost)s is not allowed."), + "KCHVM0037E": _("vm %(name)s is already in migrating, can not perform migrate on it again."), + "KCHVM0038E": _("Can't migrate vm %(name)s on Hypervisor arch %(srcarch)s.to a different Hypervisor arch %(destarch)s."), + "KCHVM0039E": _("Can't migrate %(name)s from %(srchyp)s to a different Hypervisor type %(desthyp)s."), + "KCHVM0040E": _("Can't migrate vm %(name)s, vm has passthrough device %(hostdevs)s."), + "KCHVM0041E": _("Can not migrate vm %(name)s when its in %(state)s state."), + "KCHVM0042E": _("Failed Migrate vm %(name)s due error: %(err)s"), + "KCHVM0043E": _("Failed to destroy vm %(name)s from migration recover. Details: %(err)s"), "KCHVMHDEV0001E": _("VM %(vmid)s does not contain directly assigned host device %(dev_name)s."), "KCHVMHDEV0002E": _("The host device %(dev_name)s is not allowed to directly assign to VM."), diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 3aa1145..023bd10 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -33,9 +33,10 @@ from cherrypy.process.plugins import BackgroundTask 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.exception import NotFoundError, OperationFailed, KimchiException from kimchi.model.config import CapabilitiesModel -from kimchi.model.tasks import TaskModel +from kimchi.model.libvirtconnection import LibvirtConnection +from kimchi.model.tasks import TaskModel, TasksModel from kimchi.model.templates import TemplateModel from kimchi.model.utils import get_vm_name from kimchi.model.utils import get_metadata_node @@ -268,6 +269,7 @@ class VMModel(object): self.groups = import_class('kimchi.model.groups.GroupsModel')(**kargs) self.vms = VMsModel(**kargs) self.task = TaskModel(**kargs) + self.tasks = TasksModel(**kargs) self.storagepool = model.storagepools.StoragePoolModel(**kargs) self.storagevolume = model.storagevolumes.StorageVolumeModel(**kargs) self.storagevolumes = model.storagevolumes.StorageVolumesModel(**kargs) @@ -850,6 +852,166 @@ class VMModel(object): raise OperationFailed("KCHVM0019E", {'name': name, 'err': e.get_error_message()}) + def _preCheck(self, name, destConn, remoteHost): + """Pre check before migration""" + + kimchi_log.debug('precheck migrate %s' % name) + _destConn = destConn.get() + if remoteHost in ['localhost', '127.0.0.1']: + kimchi_log.debug('vm %s Can not migrate to localhost.' % name) + raise OperationFailed("KCHVM0036E", {'name': name, + 'remoteHost': remoteHost}) + # check if the vm already in migration + try: + alltasks = self.tasks.get_list() + for taskid in alltasks: + taskobj = self.task.lookup(taskid) + if taskobj['target_uri'] == "/vms/%s/migrate" % name \ + and taskobj['status'] == "running": + kimchi_log.debug('vm %s is already in migrating.' % name) + raise OperationFailed("KCHVM0037E", {'name': name}) + except NotFoundError: + kimchi_log.debug('No previous migrate on vm %s.' % name) + + srcarch = self.conn.get().getInfo()[0] + destarch = _destConn.getInfo()[0] + if srcarch != destarch: + kimchi_log.debug('vm %s can not migrate to different arch server.' + % (name, destarch)) + raise OperationFailed("KCHVM0038E", {'name': name, + 'srcarch': srcarch, + 'destarch': destarch}) + srchyp = self.conn.get().getType() + desthyp = _destConn.getType() + if srchyp != desthyp: + kimchi_log.debug('vm %s can not migrate to a different hypervisor' + % name) + raise OperationFailed("KCHVM0039E", {'name': name, + 'srchyp': srchyp, + 'desthyp': desthyp}) + + # model.host import DOM_STATE_MAP, vmhostdevs import host, + # to void loop import DOM_STATE_MAP, move import VMHostDevsModel here + from kimchi.model.vmhostdevs import VMHostDevsModel + # check if there is any passthrough devices belong to this vm + vmhostdevs = VMHostDevsModel(conn=self.conn) + hostdevs = vmhostdevs.get_list(name) + if hostdevs: + raise OperationFailed("KCHVM0040E", {'name': name, + 'hostdevs': hostdevs}) + + @staticmethod + def _getRemoteConn(remoteHost, user, passwd, transport='ssh'): + """open destination connect to migrate""" + + duri = 'qemu+%s://%s@%s/system' % (transport, user, remoteHost) + conn = LibvirtConnection(duri) + return conn + + def _do_migrate(self, cb, params): + """Asynchronous function which performs the migrate operation. + + Arguments: + cb -- A callback function to signal the Task's progress. + params -- A dict with the following values: + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + "remoteHost": The migration destination server. + "secure": Migrate in P2P secure tunel mode.(optional) + """ + + name = params['name'].decode('utf-8') + destConn = params['destConn'] + remoteHost = params['remoteHost'] + secure = params['secure'] + _destConn = destConn.get() + + cb('starting a migration') + kimchi_log.debug('migrate %s start' % name) + dom = self.get_vm(name, self.conn) + flag = 0 + if secure: + flag |= (libvirt.VIR_MIGRATE_PEER2PEER | + libvirt.VIR_MIGRATE_TUNNELLED) + + state = DOM_STATE_MAP[dom.info()[0]] + if state in ['running', 'paused']: + flag |= libvirt.VIR_MIGRATE_LIVE + elif state == 'shutoff': + flag |= (libvirt.VIR_MIGRATE_OFFLINE | + libvirt.VIR_MIGRATE_PERSIST_DEST) + else: + kimchi_log.debug('Can not migrate vm %s when its in %s.' + % (name, state)) + raise OperationFailed("KCHVM0041E", {'name': name, + 'state': state}) + try: + dom.migrate(_destConn, flag, None, None, 0) + except libvirt.libvirtError as e: + kimchi_log.error('migrate %s to %s failed' % (name, remoteHost)) + self._recover(name, destConn, cb) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', False) + raise OperationFailed('KCHVM0042E', {'err': e.message, + 'name': name}) + kimchi_log.debug('finish migrate %s' % name) + cb('Migrate finished', True) + + def migrate(self, name, remoteHost, user, passwd=None, secure=False): + """Migrate a virtual machine to a remote server. + + Arguments: + name -- The name of the virtual machine to be migrated. + remoteHost -- Remote server that the VM will be migrated to. + user -- Login user on remote server,prefer root. + passwd -- The password of the user on remote server, + if the local server + has ssk key exchanged, then this param can be NULL. + secure -- Migrate in P2P secure tunel mode.(optional) + + Return: + A Task running the clone operation. + """ + name = name.decode('utf-8') + remoteHost = remoteHost.decode('utf-8') + user = user.decode('utf-8') + + destConn = self._getRemoteConn(remoteHost, user, passwd) + self._preCheck(name, destConn, remoteHost) + + params = {'name': name, + 'destConn': destConn, + 'remoteHost': remoteHost, + 'secure': secure} + task_id = add_task('/vms/%s/migrate' % name, self._do_migrate, + self.objstore, params) + + return self.task.lookup(task_id) + + def _recover(self, name, destconn, cb): + """Recover from a failed migration. + + Arguments: + "cb": A callback function to signal the Task's progress. + "name": Name of the virtual machine to be migrated. + "destConn": A LibvirtConnection to destination server. + """ + try: + destvm = self.get_vm(name, destconn) + except KimchiException as e: + if type(e) == NotFoundError: + return + + cb('recover from a failed migration', False) + kimchi_log.debug('recover from a failed migrate %s' % name) + try: + destvm.destroy() + kimchi_log.error("Failed to destory migrate vm %s on \ + destination server" % name) + except libvirt.libvirtError as e: + raise OperationFailed('KCHVM0043E', {'name': name, + 'err': e.message}) + def poweroff(self, name): dom = self.get_vm(name, self.conn) try: -- 1.8.3.1

3 2

Scrum meetings during the holidays
by Aline Manera 21 Dec '14

21 Dec '14

Hi all, Specially in the next two weeks, the scrum meeting will be on Tuesdays at the usual time (11AM BRST) due the holidays. So instead of Dec 24th, the scrum meeting will be on Dec 23th; and instead of Dec 31st, it will be on Dec 30th. See you there. Regards, Aline Manera

1 0

Kimchi 1.4 is released!
by Aline Manera 19 Dec '14

19 Dec '14

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Kimchi 1.4*! This release adds many new features including: ✔ Guest PCI passthrough devices ✔ Guest disk hot plug ✔ Guest cloning ✔ Snapshot support ✔ SMT support on Templates ✔ LDAP authentication We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 20, Ubuntu 14.10, openSUSE 13.2, and RHEL7. Kimchi uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: ✔ https://github.com/kimchi-project/kimchi/archive/1.4.0.tar.gz ✔ git clone https://github.com/kimchi-project/kimchi.git There are also some packages available at: ✔ http://kimchi-project.github.io/kimchi/downloads/ Go ahead! Give it a try and let us know what you think! Regards, Aline Manera

1 0

Re: [Kimchi-devel] Problem of edit a guest while the guest has asnapshot
by Zongmei Gou 18 Dec '14

18 Dec '14

1 0

Problem of edit a guest while the guest has a snapshot
by 苟宗梅 17 Dec '14

17 Dec '14

2 1

[PATCH] Po support: translation for Chinese
by Aline Manera 17 Dec '14

17 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "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?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 2.1.0

1 0

[PATCH] Po support: translation for Chinese
by Aline Manera 17 Dec '14

17 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "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?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 2.1.0

1 0

[PATCH] Po support: translation for Chinese
by Aline Manera 17 Dec '14

17 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Added Chinese translation in po file. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 118 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 53 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9bf50b8..7a9a33f 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-12-15 11:01-0200\n" +"POT-Creation-Date: 2014-12-17 13:57+0800\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" @@ -75,7 +75,7 @@ msgstr "由于错误%(err)s任务启动失败" #, python-format msgid "Timeout of %(seconds)s seconds expired while running task '%(task)s." -msgstr "" +msgstr "任务'%(task)s超时%(seconds)s秒。" #, python-format msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" @@ -90,20 +90,20 @@ msgstr "指定登录Kimchi的%(item)s" #, python-format msgid "User %(user_id)s not found with given LDAP settings." -msgstr "" +msgstr "使用指定的LDAP配置未找到%(user_id)s用户" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" -msgstr "" +msgstr "无效的LDAP配置：%(item)s : %(value)s" msgid "Unknown \"_cap\" specified" -msgstr "" +msgstr "未识别的\"_cap\"" msgid "\"_passthrough\" should be \"true\" or \"false\"" -msgstr "" +msgstr "\"_passthrough\"值应为\"true\"或者\"false\"" msgid "\"_passthrough_affected_by\" should be a device name string" -msgstr "" +msgstr "\"_passthrough_affected_by\"应为一个字符串型设备名" #, python-format msgid "Error while getting block devices. Details: %(err)s" @@ -302,24 +302,24 @@ msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Virtual machine '%(name)s' must be stopped before cloning it." -msgstr "" +msgstr "虚拟机'%(name)s'在制作副本前必须关机。" #, python-format msgid "Insufficient disk space to clone virtual machine '%(name)s'" -msgstr "" +msgstr "制作虚拟机'%(name)s'副本所需的磁盘空间不足" #, python-format msgid "Unable to clone VM '%(name)s'. Details: %(err)s" -msgstr "" +msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." -msgstr "" +msgstr "虚拟机%(vmid)s未指明被分配的主机%(dev_name)s。" #, python-format msgid "The host device %(dev_name)s is not allowed to directly assign to VM." -msgstr "" +msgstr "主机%(dev_name)s不允许直接分配给虚拟机。" msgid "" "No IOMMU groups found. Host PCI pass through needs IOMMU group to function " @@ -328,9 +328,13 @@ msgid "" "to your Kernel parameter in /boot/grub2/grub.conf. For AMD CPU, add iommu=pt " "iommu=1." msgstr "" +"未找到IOMMU groups。主机PCI pass through需要IOMMU group才可以正确工作。请在" +"BIOS设置里将Intel VT-d 或者 AMD IOMMU 设为使能，而后确认内核支持IOMMU。对于" +"Intel CPU，在路径/boot/grub2/grub.conf中添加内核变量intel_iommu=on。对于AMD " +"CPU，则添加iommu=pt iommu=1。" msgid "\"name\" should be a device name string" -msgstr "" +msgstr "\"name\"应该为一个字符串型的设备名" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -444,17 +448,19 @@ msgstr "未能识别基础镜像%(path)s格式" msgid "" "When specifying CPU topology, VCPUs must be a product of sockets, cores, and " "threads." -msgstr "" +msgstr "CPU拓扑中，VCPUs必须包括sockets, cores 以及threads。" msgid "" "When specifying CPU topology, each element must be an integer greater than " "zero." -msgstr "" +msgstr "CPU拓扑中，每一个参数必须为大于零的整数。" msgid "" "Invalid disk image format. Valid formats: bochs, cloop, cow, dmg, qcow, " "qcow2, qed, raw, vmdk, vpc." msgstr "" +"无效的磁盘镜像格式。有效的格式为：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" #, python-format msgid "Storage pool %(name)s already exists" @@ -660,6 +666,8 @@ msgid "" "Storage volume format not supported. Valid formats: bochs, cloop, cow, dmg, " "qcow, qcow2, qed, raw, vmdk, vpc." msgstr "" +"不支持该存储卷格式，支持的格式：bochs, cloop, cow, dmg, qcow, qcow2, qed, " +"raw, vmdk, vpc。" msgid "Storage volume requires a volume name" msgstr "存储卷需要名字" @@ -685,13 +693,13 @@ msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Unable to access file %(url)s. Please, check it." -msgstr "" +msgstr "未能连接文件%(url)s，请检查该文件是否存在。" #, python-format msgid "" "Unable to clone storage volume '%(name)s' in pool '%(pool)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能于存储池'%(pool)s'制作存储卷'%(name)s'的副本，详情：%(err)s" #, python-format msgid "Interface %(name)s does not exist" @@ -778,7 +786,7 @@ msgstr "网络接口%(iface)s启动失败，请检查网络连接情况。" #, python-format msgid "Failed to start network %(name)s. Details: %(err)s" -msgstr "" +msgstr "启动网络%(name)s失败，详情：%(err)s" #, python-format msgid "Debug report %(name)s does not exist" @@ -838,7 +846,7 @@ msgid "Node device '%(name)s' not found" msgstr "没有找到节点设备'%(name)s'" msgid "Conflicting flag filters specified." -msgstr "" +msgstr "flag filters冲突。" msgid "No packages marked for update" msgstr "没有软件包标识要升级" @@ -1035,60 +1043,62 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" "Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." -msgstr "" +msgstr "虚拟机'%(vm)s'在制作快照前必须关机。" #, python-format msgid "" "Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能为虚拟机'%(vm)s'制作快照'%(name)s'。详情：%(err)s" #, python-format msgid "Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'." -msgstr "" +msgstr "快照'%(name)s'不存在虚拟机'%(vm)s'上。" #, python-format msgid "" "Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能在虚拟机'%(vm)s'找到快照'%(name)s'。详情：%(err)s" #, python-format msgid "Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s" -msgstr "" +msgstr "未能列出虚拟机'%(vm)s'的快照。详情：%(err)s" #, python-format msgid "" "Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能删除虚拟机'%(vm)s'快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能找到虚拟机'%(vm)s'当前快照。详情：%(err)s" #, python-format msgid "" "Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: " "%(err)s" -msgstr "" +msgstr "未能恢复虚拟机'%(vm)s'到快照'%(name)s'。详情：%(err)s" #, python-format msgid "" "Unable to create snapshot of virtual machine '%(vm)s' because it contains a " "disk with format '%(format)s'; only 'qcow2' is supported." msgstr "" +"未能为虚拟机'%(vm)s'创建快照因为其使用了格式为'%(format)s'的磁盘；当前仅支" +"持'qcow2'格式。" msgid "The number of vCPUs is too large for this system." -msgstr "" +msgstr "vCPUs的数量对该系统而言太大。" msgid "Invalid vCPU/topology combination." -msgstr "" +msgstr "无效的vCPU/topology组合。" msgid "This host (or current configuration) does not allow CPU topology." -msgstr "" +msgstr "当前主机（或当前配置）不允许CPU拓扑。" msgid "ERROR CODE" msgstr "错误码" @@ -1159,10 +1169,10 @@ msgid "Permission" msgstr "权限" msgid "Host PCI Device" -msgstr "" +msgstr "主机PCI设备" msgid "Snapshot" -msgstr "" +msgstr "快照" msgid "Name" msgstr "名称" @@ -1195,28 +1205,28 @@ msgid "Selected system users and groups" msgstr "已选的系统用户及用户组" msgid "User" -msgstr "" +msgstr "用户" msgid "All" msgstr "所有" msgid "To Add" -msgstr "" +msgstr "待添加" msgid "Added" -msgstr "" +msgstr "已添加" msgid "filter" -msgstr "" +msgstr "过滤器" msgid "Product" -msgstr "" +msgstr "产品" msgid "Vendor" msgstr "厂商" msgid "Created" -msgstr "" +msgstr "创建于" msgid "Save" msgstr "保存" @@ -1231,10 +1241,10 @@ msgid "Cancel" msgstr "取消" msgid "revert" -msgstr "" +msgstr "恢复" msgid "Cloning" -msgstr "" +msgstr "正在制作副本" msgid "Start" msgstr "启用" @@ -1538,6 +1548,8 @@ msgid "" "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?" msgstr "" +"当目标客户机使用SCSI或者iSCSI存储卷时，这些存储卷的副本将被放置于默认存储池" +"中。在目标存储池没有足够空间放置其他存储卷的时候也会如此。确认继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1565,25 +1577,25 @@ msgid "" msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "interface:" -msgstr "" +msgstr "接口：" msgid "address:" -msgstr "" +msgstr "地址：" msgid "link_type:" -msgstr "" +msgstr "连接类型：" msgid "block:" -msgstr "" +msgstr "块：" msgid "drive_type:" -msgstr "" +msgstr "设备类型：" msgid "model:" -msgstr "" +msgstr "模型：" msgid "Affected devices:" -msgstr "" +msgstr "被影响的设备：" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1872,7 +1884,7 @@ msgid "Upload a file" msgstr "上传一个文件" msgid "Choose the file you want to upload." -msgstr "" +msgstr "选择需要上传的文件。" msgid "Add Template" msgstr "创建模板" @@ -1938,19 +1950,19 @@ msgid "Graphics" msgstr "图形" msgid "Disk(GB)" -msgstr "" +msgstr "磁盘(GB)" msgid "CPU Number" msgstr "CPU个数" msgid "Manually set CPU topology" -msgstr "" +msgstr "手动配置CPU拓扑" msgid "Cores" -msgstr "" +msgstr "内核数" msgid "Threads" -msgstr "" +msgstr "线程" msgid "CPU" msgstr "处理器" @@ -1983,7 +1995,7 @@ msgid "OS Code Name" msgstr "操作系统代号" msgid "CPU(s)" -msgstr "" +msgstr "CPU(s)" msgid "System Statistics" msgstr "系统统计信息" -- 2.1.0

1 0

kimchi sos plugin accepted upstream
by Christy Perez 16 Dec '14

16 Dec '14

Hi team, FYI: There's now a small plugin for kimchi upstream: https://github.com/sosreport/sos/commit/3aabd18b2666dbbeb86871ac4b9f025e468… If you want to read the discussion, it's under https://www.redhat.com/archives/sos-devel/2014-December/thread.html I also spoke with Bryn offline about pulling in the nginx config, but he said that that should be in a separate nginx plugin. Thanks, - Christy

2 2

[PATCH 0/2] Update po files for 1.4 release
by Aline Manera 16 Dec '14

16 Dec '14

2 4

[PATCH V3] Bugfix#527 Reverting a snapshot doesn't change initial state of "Edit Guest"
by Wen Wang 16 Dec '14

16 Dec '14

V2 -> V3: List VMs before closing the dialogue so that VM current status match the reverted status. Close dialogue when reverting a VM finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..9c088aa 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -564,6 +564,8 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.listVmsAuto(); + kimchi.window.close(); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

3 2

[PATCH] Bugfix#527 Refresh "Edit Guest" after reverting a snapshot
by Wen Wang 15 Dec '14

15 Dec '14

Fix the issue that reverting a snapshot doesn't change the initial state of the dialog "Edit Guest" by refeshing the dialogue when finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..aa953dc 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -30,9 +30,10 @@ kimchi.guest_edit_main = function() { if(display_list.indexOf($(deactivated).attr('id')) >= 0) { $(buttonContainer).removeClass('hidden'); } - } + }, + active: kimchi.snapshotIndex === "undefined" ? 0 : kimchi.snapshotIndex }); - + kimchi.snapshotIndex = "undefined"; var guestEditForm = $('#form-guest-edit-general'); var saveButton = $('#guest-edit-button-save'); var authType; @@ -564,6 +565,14 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.snapshotIndex = $('#guest-edit-tabs').tabs("option", "active"); + kimchi.window.close(); + kimchi.window.open({ + url: 'guest-edit.html', + close: function() { + kimchi.clearGuestEdit(); + } + }); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

2 2

[PATCH V2] Bugfix#527 Reverting a snapshot doesn't change initial state of "Edit Guest"
by Wen Wang 15 Dec '14

15 Dec '14

Close dialogue when reverting a VM finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..5c2def6 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -564,6 +564,7 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.window.close(); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

2 2

[PATCH] issue #553: Use required parameter in "snapshotLookupByName"
by Crístian Viana 15 Dec '14

15 Dec '14

The function "snapshotLookupByName" has a required parameter in older versions of libvirt. On newer versions, however, this parameter is optional and it was causing an error on RHEL because it uses an old version of libvirt. Always use the parameter in function "snapshotLookupByName" with its default value (0). Fix issue #553 ("Get snapshots of vm raise 500 error"). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/vmsnapshots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vmsnapshots.py b/src/kimchi/model/vmsnapshots.py index bb9bfaa..725770d 100644 --- a/src/kimchi/model/vmsnapshots.py +++ b/src/kimchi/model/vmsnapshots.py @@ -165,7 +165,7 @@ class VMSnapshotModel(object): vir_dom = VMModel.get_vm(vm_name, self.conn) try: - return vir_dom.snapshotLookupByName(name) + return vir_dom.snapshotLookupByName(name, 0) except libvirt.libvirtError, e: code = e.get_error_code() if code == libvirt.VIR_ERR_NO_DOMAIN_SNAPSHOT: -- 1.9.3

3 2

[PATCH] Bug 461 Fix: (UI)Support Repository Meta Link
by huoyuxin＠linux.vnet.ibm.com 14 Dec '14

14 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.repository_add_main.js | 10 +++------- ui/pages/repository-add.html.tmpl | 6 +++++- ui/pages/repository-edit.html.tmpl | 8 ++++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ui/js/src/kimchi.repository_add_main.js b/ui/js/src/kimchi.repository_add_main.js index 2a277fd..d572c69 100644 --- a/ui/js/src/kimchi.repository_add_main.js +++ b/ui/js/src/kimchi.repository_add_main.js @@ -57,17 +57,13 @@ kimchi.repository_add_main = function() { } var formData = $(addForm).serializeObject(); - - if (formData && formData.isMirror!=undefined) { - formData.isMirror=(String(formData.isMirror).toLowerCase() === 'true'); - } - if(formData.isMirror) { + if(formData.linkType) { if(formData.config==undefined) { formData.config=new Object(); } - formData.config.mirrorlist=formData.baseurl; + formData.config[formData.linkType]=formData.baseurl; delete formData.baseurl; - delete formData.isMirror; + delete formData.linkType; } weedObject(formData); if(formData.config && formData.config.comps) { diff --git a/ui/pages/repository-add.html.tmpl b/ui/pages/repository-add.html.tmpl index 6de4f76..96cf6f6 100644 --- a/ui/pages/repository-add.html.tmpl +++ b/ui/pages/repository-add.html.tmpl @@ -63,9 +63,13 @@ </div> <div class="field yum"> <p class="yum"> - <input type="checkbox" name="isMirror" value="true" id="isMirror" /> + <input type="radio" name="linkType" value="mirrorlist" id="isMirror" /> <label for="isMirror">$_("Repository is a mirror")</label> </p> + <p class="yum"> + <input type="radio" name="linkType" value="metalink" id="isMeta" /> + <label for="isMeta">$_("Repository is a meta link")</label> + </p> </div> </section> <section class="form-section repository-dist deb"> diff --git a/ui/pages/repository-edit.html.tmpl b/ui/pages/repository-edit.html.tmpl index f13cb90..4467ca8 100644 --- a/ui/pages/repository-edit.html.tmpl +++ b/ui/pages/repository-edit.html.tmpl @@ -71,6 +71,14 @@ <input id="repository-edit-urlargs-textbox" class="yum" name="config[mirrorlist]" type="text" /> </div> </div> + <div class="yum"> + <div class="repository-edit-wrapper-label"> + <label for="repository-edit-urlargs-textbox">$_("Meta Link URL")</label> + </div> + <div class="repository-edit-wrapper-controls"> + <input id="repository-edit-urlargs-textbox" class="yum" name="config[metalink]" type="text" /> + </div> + </div> <div class="repository-comps deb"> <div class="repository-edit-wrapper-label"> <label for="repository-edit-urlargs-textbox">$_("Components")</label> -- 1.7.1

1 0

[PATCH] Bugfix#527 Reverting a snapshot doesn't change initial state of "Edit Guest"
by wenwang＠linux.vnet.ibm.com 14 Dec '14

14 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Close diaguage when reverting a VM finished. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4f497e5..5c2def6 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -564,6 +564,7 @@ kimchi.guest_edit_main = function() { $(".icon", item).addClass("hide"); $("button", "#form-guest-edit-snapshot").button("enable"); setCurrentSnapshot(item.prop("id")); + kimchi.window.close(); }, function(data){ kimchi.message.error(data.responseJSON.reason); $(".icon", item).addClass("hide"); -- 1.9.3

3 2

[PATCH] Bugfix#428: Host stats graphics are not aligned in Italian
by Wen Wang 12 Dec '14

12 Dec '14

Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 9e9cb01..93ae524 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -117,7 +117,7 @@ .host-panel .info-container { padding-top: 16px; - width: 890px; + width: 892px; } .host-panel .section-header { -- 1.9.3

1 0

[PATCH 0/3] Issue #543
by Crístian Viana 11 Dec '14

11 Dec '14

Crístian Viana (3): bugfix: Fix regexp in "kimchi.utils.get_next_clone_name" Support different "tags" when generating a new name in "get_next_clone_name" issue #543: Generate unique vol names when downloading files with same name src/kimchi/model/storagevolumes.py | 12 ++++++++++-- src/kimchi/utils.py | 17 ++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) -- 1.9.3

3 14

[PATCH] Bug fix #463: Allow add networks with non-ASCII characters to template and guest
by Aline Manera 11 Dec '14

11 Dec '14

Kimchi uses unicode internally but libvirt stores its data encoded with utf-8. So we also need to encode the given value to utf-8 to compare it properly to libvirt results. Also add test cases to cover this scenario. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/networks.py | 4 ++-- src/kimchi/model/templates.py | 6 +++--- src/kimchi/model/vmifaces.py | 1 + src/kimchi/vmtemplate.py | 4 ++-- src/kimchi/xmlutils/utils.py | 9 ++++++++- tests/test_model.py | 21 ++++++++++++++++++++- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index f3ea099..1e94fd2 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -293,8 +293,8 @@ class NetworkModel(object): conn = self.conn.get() for dom in conn.listAllDomains(0): networks = self._vm_get_networks(dom) - if network in networks and (state is None or - state == dom.state(0)[0]): + if network.encode('utf-8') in networks and \ + (state is None or state == dom.state(0)[0]): vms.append(dom.name()) return vms diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 2ca80ba..85f0839 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -83,7 +83,7 @@ class TemplatesModel(object): for net_name in params.get(u'networks', []): try: - conn.networkLookupByName(net_name) + conn.networkLookupByName(net_name.encode('utf-8')) except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) @@ -200,7 +200,7 @@ class TemplateModel(object): for net_name in params.get(u'networks', []): try: - conn.networkLookupByName(net_name) + conn.networkLookupByName(net_name.encode('utf-8')) except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) @@ -260,7 +260,7 @@ class LibvirtVMTemplate(VMTemplate): for name in names: try: conn = self.conn.get() - network = conn.networkLookupByName(name) + network = conn.networkLookupByName(name.encode('utf-8')) except libvirt.libvirtError: raise InvalidParameter("KCHTMPL0003E", {'network': name, 'template': self.name}) diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 1206cde..0c10fa9 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -42,6 +42,7 @@ class VMIfacesModel(object): def create(self, vm, params): conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() + networks = map(lambda x: x.decode('utf-8'), networks) if params["type"] == "network" and params["network"] not in networks: raise InvalidParameter("KCHVMIF0002E", diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 8582d48..5e4a6a8 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -184,7 +184,7 @@ class VMTemplate(object): disks_xml += get_disk_xml(params)[1] - return disks_xml + return unicode(disks_xml, 'utf-8') def to_volume_list(self, vm_uuid): storage_path = self._get_storage_path() @@ -232,7 +232,7 @@ class VMTemplate(object): networks += get_iface_xml(params, self.info['arch'], self.info['os_distro'], self.info['os_version']) - return networks + return unicode(networks, 'utf-8') def _get_input_output_xml(self): sound = """ diff --git a/src/kimchi/xmlutils/utils.py b/src/kimchi/xmlutils/utils.py index 4863bb5..be08a14 100644 --- a/src/kimchi/xmlutils/utils.py +++ b/src/kimchi/xmlutils/utils.py @@ -23,7 +23,14 @@ from lxml import objectify def xpath_get_text(xml, expr): doc = ET.fromstring(xml) - res = [x.text if not isinstance(x, str) else x for x in doc.xpath(expr)] + + res = [] + for x in doc.xpath(expr): + if isinstance(x, unicode): + x = x.encode('utf-8') + elif not isinstance(x, str): + x = x.text + res.append(x) return res diff --git a/tests/test_model.py b/tests/test_model.py index aa2a1bb..acaa711 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -889,6 +889,17 @@ class ModelTests(unittest.TestCase): 'subnet': '127.0.100.0/24'} inst.networks_create(net_args) rollback.prependDefer(inst.network_delete, net_name) + inst.network_activate(net_name) + rollback.prependDefer(inst.network_deactivate, net_name) + + net_name = u'kīмсhī-пet' + net_args = {'name': net_name, + 'connection': 'nat', + 'subnet': '127.0.20.0/24'} + inst.networks_create(net_args) + rollback.prependDefer(inst.network_delete, net_name) + inst.network_activate(net_name) + rollback.prependDefer(inst.network_deactivate, net_name) orig_params = {'name': 'test', 'memory': 1024, 'cpus': 1, 'cdrom': self.kimchi_iso} @@ -908,7 +919,7 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", info["networks"][0]) params = {'name': 'new-test', 'memory': 1024, 'cpus': 1, - 'networks': ['default', 'test-network']} + 'networks': ['default', 'test-network', u'kīмсhī-пet']} inst.template_update('new-test', params) info = inst.template_lookup('new-test') for key in params.keys(): @@ -932,6 +943,14 @@ class ModelTests(unittest.TestCase): self.assertRaises(InvalidParameter, inst.template_update, 'new-test', params) + params = {'name': 'some-vm', 'template': '/templates/new-test'} + self.assertEquals('some-vm', inst.vms_create(params)) + rollback.prependDefer(inst.vm_delete, 'some-vm') + + iface_args = {'type': 'network', 'network': u'kīмсhī-пet'} + mac = inst.vmifaces_create('some-vm', iface_args) + self.assertEquals(17, len(mac)) + def test_vm_edit(self): config.set("authentication", "method", "pam") inst = model.Model(None, -- 1.9.3

2 3

[PATCH] Issue#536: raise proper error message when disk os info absent
by lvroyce0210＠gmail.com 11 Dec '14

11 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When disk os cannot be decided by libguestfs, it will leave it to 'unknown' distro and version. But if no boot information available, ImageFormatError is left unhandled and this will introduce 500 error when disk os info is absent. Handle this error to fix this. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 8582d48..3266e7b 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi import imageinfo from kimchi import osinfo from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter +from kimchi.exception import ImageFormatError, OperationFailed from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri from kimchi.xmlutils.disk import get_disk_xml @@ -51,7 +52,10 @@ class VMTemplate(object): self.fc_host_support = args.get('fc_host_support') # Fetch defaults based on the os distro and version - distro, version = self._get_os_info(args, scan) + try: + distro, version = self._get_os_info(args, scan) + except ImageFormatError as e: + raise OperationFailed('KCHTMPL0020E', {'err': e.message}) os_distro = args.get('os_distro', distro) os_version = args.get('os_version', version) entry = osinfo.lookup(os_distro, os_version) -- 1.8.3.2

3 3

[PATCH v2 0/3] Issue #543
by Crístian Viana 11 Dec '14

11 Dec '14

The differences between this and the previous patchset (v1) are: - Patch 3/3 has been updated: generate unique name for all types of storage volumes (not just 'url'); rebased to the latest commit (a378799); reworded commit message. Crístian Viana (3): bugfix: Fix regexp in "kimchi.utils.get_next_clone_name" Support different "tags" when generating a new name in "get_next_clone_name" issue #543: Generate unique names when creating volumes without name src/kimchi/model/storagevolumes.py | 9 ++++++++- src/kimchi/utils.py | 17 ++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) -- 1.9.3

2 4

[PATCH] Bug 539 Partial Fix: Enhance Error Handling
by huoyuxin＠linux.vnet.ibm.com 11 Dec '14

11 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 21caf1b..611d8c7 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -211,6 +211,7 @@ kimchi.listVmsAuto = function() { if(kimchi.trackingTasks.indexOf(tasks[i].id)==-1) kimchi.trackTask(tasks[i].id, null, function(err){ kimchi.message.error(err.message); + kimchi.listVmsAuto(); }, null); } }, null, true); @@ -345,7 +346,12 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }, function() { - kimchi.cloneGuest(guest, function(data){ + kimchi.cloneGuest(guest, function(task){ + if(kimchi.trackingTasks.indexOf(task.id)==-1) + kimchi.trackTask(task.id, null, function(err){ + kimchi.message.error(err.message); + kimchi.listVmsAuto(); + }, null); kimchi.listVmsAuto(); }); }, null); -- 1.7.1

1 0

Bug list updated for hard code freeze week
by Aline Manera 10 Dec '14

10 Dec '14

Hi all, You can check the bug list at: https://github.com/kimchi-project/kimchi/milestones/1.4%20GA Hopefully we can close all or almost all those bugs in this final week before Kimchi 1.4 GA I'd also want to ask your help to update the translations files. Regards, Aline Manera

1 0

[PATCH 0/2] Bugfix #496 System leftovers after uninstalling Kimchi
by Ramon Medeiros 10 Dec '14

10 Dec '14

Remove directories and some files on kimchi package removal Ramon Medeiros (2): Remove empty directories after rpm -e kimchi on fedora Remove empty directories on dpkg -e contrib/kimchi.spec.fedora.in | 21 ++++++++++++++++++++- contrib/make-deb.sh.in | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) -- 1.8.3.1

2 4

[PATCH] Bug 482 Fix: Interfaces stacked in template edit
by huoyuxin＠linux.vnet.ibm.com 10 Dec '14

10 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/pages/template-edit.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index 7177bf0..499d45d 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -151,7 +151,7 @@ </div> </script> <script id="template-interface-tmpl" type="text/html"> - <div class="item" id={networkID}> + <div id={networkID}> <span class="template-interface-cell"> <select></select> </span> -- 1.7.1

2 2

[PATCH] Bug 485 Fix: Label alignement in guest edit
by huoyuxin＠linux.vnet.ibm.com 10 Dec '14

10 Dec '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/guest-edit.css | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 6815ecf..9eadc6a 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -34,6 +34,7 @@ #form-guest-edit-general .edit-general-inline { display: inline-block; + vertical-align: top; } #form-guest-edit-storage input[readonly] { @@ -47,10 +48,8 @@ } .guest-edit-wrapper-label { - height: 38px; - line-height: 38px; - margin-top: 5px; - vertical-align: top; + line-height: 42px; + margin-bottom: 1px; min-width: 100px; } @@ -60,6 +59,7 @@ .guest-edit-wrapper-controls { width: 470px; + margin-bottom: 1px; } #form-guest-edit-storage .guest-edit-wrapper-controls { @@ -73,9 +73,8 @@ -webkit-border-radius: 5px; border-radius: 5px; box-shadow: 2px 2px 2px #eee inset; - border-top: 1px solid #bbb; - border-left: 1px solid #bbb; - padding-left: 10px; + border: 1px solid #bbb; + padding: 1px 1px 1px 10px; width: 450px; } -- 1.7.1

2 1

[PATCH] Bug 487 Fix: Dropdown & Filter not aligned(mobile)
by huoyuxin＠linux.vnet.ibm.com 10 Dec '14

10 Dec '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/guest-edit.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index cd8ac89..6815ecf 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -360,6 +360,7 @@ border-radius: 7px 0px 0px 7px; padding: 2px 2px 2px 7px; width: 100px; + height: 24px; } .guest-edit-pci .filter select option { @@ -370,6 +371,7 @@ border-radius: 0px 7px 7px 0px; padding: 3px 3px 3px 10px; width: 200px; + height: 16px; font-style: italic; } -- 1.7.1

2 1

[PATCH] Bug fix #529: Kill all Kimchi process when stopping kimchid service
by Aline Manera 10 Dec '14

10 Dec '14

When using "tree.mount(); engine.start(); engine.block()" to start cherrypy server, we need to manually subscribe to the signal handlers plugin. For reference: https://cherrypy.readthedocs.org/en/3.2.6/refman/process/plugins/signalhand… Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/server.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index ec78b6c..eb58465 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -172,6 +172,10 @@ class Server(object): cherrypy.tree.mount(plugin_app, script_name, plugin_config) def start(self): + # Subscribe to SignalHandler plugin + if hasattr(cherrypy.engine, 'signal_handler'): + cherrypy.engine.signal_handler.subscribe() + cherrypy.engine.start() cherrypy.engine.block() -- 1.9.3

2 2

[PATCHv2] issue#474: Add default value for ldap_admin_id
by lvroyce＠linux.vnet.ibm.com 10 Dec '14

10 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Add default value for ldap_admin_id so that kimchi will not raise error for ldap log in. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/config.py.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index 88de1aa..83a5dd0 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -290,6 +290,7 @@ def _get_config(): config.set("authentication", "ldap_server", "") config.set("authentication", "ldap_search_base", "") config.set("authentication", "ldap_search_filter", "") + config.set("authentication", "ldap_admin_id", "") config.add_section("logging") config.set("logging", "log_dir", paths.log_dir) config.set("logging", "log_level", DEFAULT_LOG_LEVEL) -- 1.8.3.2

2 1

[PATCH] issue#474: Add check for ldap configuration
by lvroyce＠linux.vnet.ibm.com 09 Dec '14

09 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Check ldap server and filter when start up. Ignore admin id if it does not specified in config. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 14 +++++++++----- src/kimchid.in | 9 +++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index 22c5c81..23bc5ec 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -19,6 +19,7 @@ import base64 import cherrypy +from ConfigParser import NoOptionError import fcntl import ldap import multiprocessing @@ -222,11 +223,14 @@ class LDAPUser(User): return self.user[USER_GROUPS] def get_roles(self): - admin_ids = config.get( - "authentication", "ldap_admin_id").strip('"').split(',') - for admin_id in admin_ids: - if self.user[USER_NAME] == admin_id.strip(): - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') + try: + admin_ids = config.get( + "authentication", "ldap_admin_id").strip('"').split(',') + for admin_id in admin_ids: + if self.user[USER_NAME] == admin_id.strip(): + self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') + except NoOptionError: + pass return self.user[USER_ROLES] def get_user(self): diff --git a/src/kimchid.in b/src/kimchid.in index 0746ba6..0121f97 100644 --- a/src/kimchid.in +++ b/src/kimchid.in @@ -49,6 +49,15 @@ def main(options): federation = config.config.get("server", "federation") logDir = config.config.get("logging", "log_dir") logLevel = config.config.get("logging", "log_level") + auth = config.config.get("authentication", "method") + ldap_server = config.config.get("authentication", "ldap_server") + search_base = config.config.get("authentication", "ldap_search_base") + search_filter = config.config.get("authentication", "ldap_search_filter", + vars={"username": "fake"}) + + if auth == "ldap" and \ + (not all([auth, ldap_server, search_base, search_filter])): + sys.exit("LDAP server is not setup properly.Exiting ...") parser = OptionParser() parser.add_option('--host', type="string", default=host, -- 1.8.3.2

4 4

[PATCH] Remove empty directories after rpm -e kimchi on fedora
by Ramon Medeiros 09 Dec '14

09 Dec '14

Some directories were not removed on rpm -e due no declaration on %files section. Also, the directory was being created in runtime. Now, it is being created on rpm build. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- contrib/kimchi.spec.fedora.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index c1929f8..99dc153 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -83,6 +83,11 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install %if 0%{?with_systemd} + +# create directory +mkdir -p %{buildroot}/var/lib/kimchi/{isos,vnc-tokens} + + # Install the systemd scripts install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml @@ -148,7 +153,6 @@ exit 0 # Rollback SELinux rules semanage permissive -d httpd_t - %clean rm -rf $RPM_BUILD_ROOT @@ -162,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/xmlutils/*.py* %{python_sitelib}/kimchi/API.json %{python_sitelib}/kimchi/plugins/*.py* +%{python_sitelib}/kimchi/ %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md %{_datadir}/kimchi/doc/README-federation.md @@ -170,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo %{_datadir}/kimchi/config/ui/*.xml %{_datadir}/kimchi/ui/ +%{_datadir}/kimchi %{_sysconfdir}/kimchi/kimchi.conf %{_sysconfdir}/kimchi/nginx.conf.in %{_sysconfdir}/kimchi/distros.d/debian.json @@ -177,6 +183,8 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/kimchi/distros.d/opensuse.json %{_sysconfdir}/kimchi/distros.d/ubuntu.json %{_sysconfdir}/kimchi/distros.d/gentoo.json +%{_sysconfdir}/kimchi/ +%{_sharedstatedir}/kimchi/* %if 0%{?with_systemd} %{_unitdir}/kimchid.service -- 1.8.3.1

3 6

[PATCH v2] List as many pools' info as possible
by Christy Perez 09 Dec '14

09 Dec '14

If a pool happens to be busy at the time the pool.refresh() is called, then libvirt will throw an error: "internal error: pool 'default' has asynchronous jobs running." Currently, kimchi rasise an exception and no pools' storage volumes are listed. This patch returns a 0 for that particular pool, and allows the user to continue to request information for other pools. Without this patch, nothing is shown at all on the Storage tab if one pool is busy. In the future, we can check for VIR_ERR_RESOURCE_BUSY and come up with a plan that works with the UI to display "Busy" for a pool. But for now, this works around the issue. v1 -> v2: - Log exception message and error code Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/storagepools.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 20c9e5a..e03c6bb 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -202,6 +202,15 @@ def _get_storagepool_vols_num(self, pool): else: return 0 except libvirt.libvirtError as e: + # If something (say a busy pool) prevents the refresh, + # throwing an Exception here would prevent all pools from + # displaying information -- so return None for busy + kimchi_log.error("ERROR: Storage Pool get vol count: %s " + % e.get_error_message()) + kimchi_log.error("ERROR: Storage Pool get vol count error no: %s " + % e.get_error_code()) + return 0 + except Exception as e: raise OperationFailed("KCHPOOL0008E", {'name': pool.name(), 'err': e.get_error_message()}) -- 1.9.3

3 5

[PATCH] Bugfix#549 VM button icons unaligned
by wenwang＠linux.vnet.ibm.com 09 Dec '14

09 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Fix the issue that chrome and IE won't align the VM action buttons Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index 52cccc4..7b32ea6 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -234,9 +234,11 @@ height: 42px; } -.guest-actions .top button span { - margin-left: -3px; - margin-top: -1px; +@-moz-document url-prefix() { + .guest-actions .top button span { + margin-left: -3px; + margin-top: -1px; + } } .guest-actions .bottom { -- 1.9.3

2 1

[PATCH v3] Add details on how to install test dependencies
by Crístian Viana 09 Dec '14

09 Dec '14

The difference between this and the previous patchset (v2) is: - Remove "python-requests" from the RPM/DEB configuration files. Crístian Viana (1): issue #504: Add details on how to install test dependencies contrib/DEBIAN/control.in | 3 +-- contrib/kimchi.spec.fedora.in | 1 - contrib/kimchi.spec.suse.in | 1 - docs/README.md | 29 +++++++++++++++++++++++------ 4 files changed, 24 insertions(+), 10 deletions(-) -- 1.9.3

3 3