September 2014 - Kimchi-devel - oVirt List Archives

[PATCH 0/2 V3] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 24 Oct '14

24 Oct '14

This patch set changes the way Kimchi loads Help pages of the tabs of the plugins. It also changes the Sample plugin, in order to demonstrate and show properly how to configure the a Help page Rodrigo Trujillo (2): Fix problems to open plugin's help pages Changes in sample plugin to fix and improve help configure.ac | 1 - plugins/sample/Makefile.am | 12 +++++ plugins/sample/sample.conf.in | 5 ++ plugins/sample/ui/config/tab-ext.xml | 11 ++++- plugins/sample/ui/pages/Makefile.am | 2 +- .../sample/ui/pages/help/en_US/sample-tab1.html | 1 + .../sample/ui/pages/help/en_US/sample-tab2.html | 1 + plugins/sample/ui/pages/sample-tab1.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/sample-tab2.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/tab.html.tmpl | 30 ------------ ui/js/src/kimchi.main.js | 55 +++++++++++++++++----- 11 files changed, 133 insertions(+), 45 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab1.html create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab2.html create mode 100644 plugins/sample/ui/pages/sample-tab1.html.tmpl create mode 100644 plugins/sample/ui/pages/sample-tab2.html.tmpl delete mode 100644 plugins/sample/ui/pages/tab.html.tmpl -- 1.9.3

2 3

[PATCH 0/5] Power (ppc) support patches
by Paulo Vital 23 Oct '14

23 Oct '14

This patch set enables Power(ppc) support by default on Kimchi. Whithout them, the upstream code of Kimchi is not fully compatible with the Power architecture. Eli Qiao (2): Add tablet to vmtemplate,to provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC. Fix Bug 110927 - Sosreport throwing kimchi error Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> Mark Wu (1): Add sos plugin for kimchi Paulo Vital (2): PowerKVM: Workaround of numpy byte order bug on PowerPC Add PowerKVM information as ISO otpion to installation. contrib/kimchi.spec.fedora.in | 3 +++ src/kimchi/Makefile.am | 4 +++- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 5 +++-- src/kimchi/sos.py | 37 +++++++++++++++++++++++++++++++++++++ src/kimchi/vmtemplate.py | 5 +++++ src/kimchi/websocket.py | 7 +++++-- 7 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/kimchi/sos.py -- 1.9.3

5 13

[RFC: PATCH v1] Prevent disks from being added more than once
by Christy Perez 22 Oct '14

22 Oct '14

The concept of a ref count for disks had been added, but this count was dependant upon the pool name for a disk. However, the pool name wasn't being stored in the VM XML so it wasn't possible to retreive the pool for the disk in order to update the ref count. To fix this, this patch changes the way that disks are added when created in libvirt storage pools. Instead of files, they are treated as volumes in pools. Note: Because of this modification, a small inconsistency in the API, which states that the pool for a vm's "storages" is returned, is corrected. The pool is returned as an empty string if the disk or volume was not create from a pool (e.g. a remote ISO). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 13 ++++++-- src/kimchi/model/vmstorages.py | 68 +++++++++++++++++++++++++++++++++++--- src/kimchi/vmdisks.py | 33 ++++++++++++++---- src/kimchi/vmtemplate.py | 41 ++++++++++++++++------- 4 files changed, 129 insertions(+), 26 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index f9f226f..af97748 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -249,19 +249,26 @@ def _get_ref_cnt(self, pool, name, path): try: ref_cnt = session.get('storagevolume', vol_id)['ref_cnt'] except NotFoundError: + kimchi_log.info('Volume %s not found in obj store.' % vol_id) # Fix storage volume created outside kimchi scope ref_cnt = 0 - # try to find this volume in exsisted vm + # try to find this volume in exsisting vm vms = VMsModel.get_vms(self.conn) for vm in vms: dom = VMModel.get_vm(vm, self.conn) storages = get_vm_disk_list(dom) for disk in storages: - d_info = get_vm_disk(dom, disk) + d_info = get_vm_disk(dom, disk, self.conn) if path == d_info['path']: ref_cnt = ref_cnt + 1 - session.store('storagevolume', vol_id, + try: + session.store('storagevolume', vol_id, {'ref_cnt': ref_cnt}) + except Exception as e: + # Just log an error if the obj store fails: + kimchi_log.warning('Unable to store storage volume id in ' + 'objectstore due error: %s', e.message) + except Exception as e: # This exception is going to catch errors returned by 'with', # specially ones generated by 'session.store'. It is outside diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 4d6c0b2..1b2c0fe 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -32,7 +32,7 @@ from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.storagevolumes import StorageVolumeModel from kimchi.model.utils import get_vm_config_flag -from kimchi.utils import check_url_path +from kimchi.utils import check_url_path, kimchi_log from kimchi.osinfo import lookup from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP @@ -73,6 +73,11 @@ def _get_storage_xml(params, ignore_source=False): source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) + elif src_type == 'volume': + source = E.source() + source.set('pool', params.get('pool')) + source.set('volume', params.get('vol')) + disk.append(source) else: # Fixing source attribute source = E.source() @@ -138,6 +143,8 @@ def create(self, vm_name, params): # Path will never be blank due to API.json verification. # There is no need to cover this case here. params['format'] = 'raw' + vol_info = None + vol_store_name = None if not ('vol' in params) ^ ('path' in params): raise InvalidParameter("KCHVMSTOR0017E") if params.get('vol'): @@ -146,6 +153,7 @@ def create(self, vm_name, params): vol_info = StorageVolumeModel( conn=self.conn, objstore=self.objstore).lookup(pool, params['vol']) + vol_store_name = '%s:%s' % (pool, params['vol']) except KeyError: raise InvalidParameter("KCHVMSTOR0012E") except Exception as e: @@ -158,6 +166,10 @@ def create(self, vm_name, params): params['format'] = vol_info['format'] params['path'] = vol_info['path'] params['src_type'] = _check_path(params['path']) + if params['src_type'] is 'file' and params.get('pool') and \ + params.get('vol'): + params['src_type'] = 'volume' + # change from 'file' to volume if in a pool ^^ if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -171,6 +183,16 @@ def create(self, vm_name, params): dom.attachDeviceFlags(dev_xml, get_vm_config_flag(dom, 'all')) except Exception as e: raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) + + try: + new_ref_cnt = vol_info['ref_cnt'] + 1 + with self.objstore as session: + session.store('storagevolume', vol_store_name, {'ref_cnt': new_ref_cnt}) + except Exception as e: + # Just log an error if the obj store fails: + kimchi_log.warning('Unable to store storage volume id in ' + 'objectstore due error: %s', e.message) + return params['dev'] def _get_storage_device_name(self, vm_name, params): @@ -192,25 +214,41 @@ def get_list(self, vm_name): dom = VMModel.get_vm(vm_name, self.conn) return get_vm_disk_list(dom) - class VMStorageModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] + self.objstore = kargs['objstore'] def lookup(self, vm_name, dev_name): # Retrieve disk xml and format return dict dom = VMModel.get_vm(vm_name, self.conn) - return get_vm_disk(dom, dev_name) + disk = get_vm_disk(dom, dev_name, self.conn) + # Also include the pool and volume + pool_name = '' + vol_name = '' + try: + pool_name = disk.get('pool') + vol_name = disk.get('volume') + except Exception as e: + kimchi_log.warning('VMDisk lookup error: %s' % e.message) + + disk['pool'] = pool_name + disk['volume'] = vol_name + return disk def delete(self, vm_name, dev_name): # Get storage device xml dom = VMModel.get_vm(vm_name, self.conn) + disk_info = None + disk_xml = None + pool_name = '' + vol_name = '' try: - bus_type = self.lookup(vm_name, dev_name)['bus'] + disk_info = self.lookup(vm_name, dev_name) + bus_type = disk_info['bus'] except NotFoundError: raise - dom = VMModel.get_vm(vm_name, self.conn) if (bus_type not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -224,10 +262,30 @@ def delete(self, vm_name, dev_name): except Exception as e: raise OperationFailed("KCHVMSTOR0010E", {'error': e.message}) + # Get the pool and vol of a disk so we can + # decrement its ref_cnt in the obj store + pool_name = disk_info.get('pool') + vol_name = disk_info.get('volume') + + if(pool_name and vol_name): + try: + vol_id = '%s:%s' % (pool_name, vol_name) + with self.objstore as session: + vol = session.get('storagevolume', vol_id) + if vol: + ref_cnt = vol['ref_cnt'] + if ref_cnt > 0: + ref_cnt = ref_cnt - 1 + session.store('storagevolume', vol_id, {'ref_cnt': ref_cnt}) + except Exception as e: + kimchi_log.warning('Unable to decrement volume ref count due to %s.' + % e.message) + def update(self, vm_name, dev_name, params): path = params.get('path') if path and len(path) != 0: params['src_type'] = _check_path(path) + # change from 'file' to 'volume' if pool ^^ ignore_source = False else: params['src_type'] = 'file' diff --git a/src/kimchi/vmdisks.py b/src/kimchi/vmdisks.py index 6012ada..185a499 100644 --- a/src/kimchi/vmdisks.py +++ b/src/kimchi/vmdisks.py @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import libvirt +import os from lxml import objectify from kimchi.exception import NotFoundError @@ -34,37 +36,56 @@ def get_device_xml(dom, dev_name): return None return disk[0] +def get_pool_xml(conn, pool_name): + conn = conn.get() + return objectify.fromstring(conn.\ + storagePoolLookupByName(pool_name).XMLDesc(0)) -def get_vm_disk(dom, dev_name): +def get_vm_disk(dom, dev_name, conn): # Retrieve disk xml and format return dict disk = get_device_xml(dom, dev_name) if disk is None: raise NotFoundError( "KCHVMSTOR0007E", {'dev_name': dev_name, 'vm_name': dom.name()}) - path = "" + path = '' dev_bus = 'ide' + pool_name = '' + vol_name = '' try: source = disk.source if source is not None: - src_type = disk.attrib['type'] + src_type = disk.get('type') if src_type == 'network': host = source.host path = (source.attrib['protocol'] + '://' + host.attrib['name'] + ':' + host.attrib['port'] + source.attrib['name']) + elif src_type == 'volume': + pool_name = disk.source.get('pool') + pool = get_pool_xml(conn, pool_name) + pool_path = str(pool.target.path) + vol_name = disk.source.attrib['volume'] + path = os.path.join(pool_path, vol_name) else: path = source.attrib[DEV_TYPE_SRC_ATTR_MAP[src_type]] # Retrieve storage bus type dev_bus = disk.target.attrib['bus'] - except: - pass + except Exception as e: + kimchi_log.warning("get_vm_disk exception: %s " % e.message) + dev_type = disk.attrib['device'] + + # Pool and volume may be empty strings, if the user passed a disk name. + # If the disk was from a storage pool, let's use that so we can keep track + # of its ref_cnt in the objects store. return {'dev': dev_name, 'type': dev_type, 'path': path, 'format': disk.driver.attrib['type'], - 'bus': dev_bus} + 'bus': dev_bus, + 'pool': pool_name, + 'volume': vol_name} def get_vm_disk_list(dom): diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 5f22db9..1940911 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -187,24 +187,41 @@ def _get_cdrom_xml(self, libvirt_stream_protocols, qemu_stream_dns): return network_file % (params) def _get_disks_xml(self, vm_uuid): - storage_path = self._get_storage_path() + def TYPE(v): + return {'type': v} + + #storage_path = self._get_storage_path() + _pool = pool_name_from_uri(self.info['storagepool']) ret = "" for i, disk in enumerate(self.info['disks']): index = disk.get('index', i) - volume = "%s-%s.img" % (vm_uuid, index) - src = os.path.join(storage_path, volume) + _volume = "%s-%s.img" % (vm_uuid, index) + #src = os.path.join(storage_path, volume) dev = "%s%s" % (self._bus_to_dev[self.info['disk_bus']], string.lowercase[index]) fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' - params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], - 'type': fmt} - ret += """ - <disk type='file' device='disk'> - <driver name='qemu' type='%(type)s' cache='none'/> - <source file='%(src)s' /> - <target dev='%(dev)s' bus='%(bus)s' /> - </disk> - """ % params + #params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], + # 'type': fmt} + #ret += """ + #<disk type='file' device='disk'> + # <driver name='qemu' type='%(type)s' cache='none'/> + # <source file='%(src)s' /> + # <target dev='%(dev)s' bus='%(bus)s' /> + #</disk> + #""" % params + + # Instead do: + #<disk type='volume'> + # <driver name='qemu' type='%(type)s' cache='none'/> + # <source pool='%(pool)s' volume='%(volume)s' /> + # <target dev='%(dev)s' bus='%(bus)s /> + #</disk> + disk = E.disk( + E.driver(TYPE(fmt), name='qemu', cache='none'), + E.source(pool=_pool, volume=_volume), + E.target(dev=dev, bus=self.info['disk_bus']), + TYPE('volume')) + ret += etree.tostring(disk) return ret def _get_graphics_xml(self, params): -- 1.9.3

3 9

[PATCH 0/2 V4] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 20 Oct '14

20 Oct '14

This patch set changes the way Kimchi loads Help pages of the tabs of the plugins. It also changes the Sample plugin, in order to demonstrate and show properly how to configure the a Help page Rodrigo Trujillo (2): Fix problems to open plugin's help pages Changes in sample plugin to fix and improve help configure.ac | 1 - plugins/sample/Makefile.am | 12 +++++ plugins/sample/sample.conf.in | 5 ++ plugins/sample/ui/config/tab-ext.xml | 11 ++++- plugins/sample/ui/pages/Makefile.am | 2 +- .../sample/ui/pages/help/en_US/sample-tab1.html | 1 + .../sample/ui/pages/help/en_US/sample-tab2.html | 1 + plugins/sample/ui/pages/sample-tab1.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/sample-tab2.html.tmpl | 30 ++++++++++++ plugins/sample/ui/pages/tab.html.tmpl | 30 ------------ ui/js/src/kimchi.main.js | 53 ++++++++++++++++------ 11 files changed, 129 insertions(+), 47 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab1.html create mode 100644 plugins/sample/ui/pages/help/en_US/sample-tab2.html create mode 100644 plugins/sample/ui/pages/sample-tab1.html.tmpl create mode 100644 plugins/sample/ui/pages/sample-tab2.html.tmpl delete mode 100644 plugins/sample/ui/pages/tab.html.tmpl -- 1.9.3

4 10

[PATCH 0/2] PCI Passthrough: Add device to VM
by huoyuxin＠linux.vnet.ibm.com 09 Oct '14

09 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): Passthrough: Add PCI Devices to VM update po files po/en_US.po | 15 ++++++ po/kimchi.pot | 15 ++++++ po/pt_BR.po | 15 ++++++ po/zh_CN.po | 15 ++++++ ui/css/theme-default/guest-edit.css | 86 ++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 55 ++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 66 +++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 28 +++++++++++ 8 files changed, 293 insertions(+), 2 deletions(-)

3 4

Error in the log when using VMs not created by kimchi
by Wen Wang 08 Oct '14

08 Oct '14

Hi all, When kimchi deal with VMs that are not created by kimchi or build before we introducing "metadata", an error "metadata not found: Requested metadata element is not present" will continuously appear in the log, I have one suggestion from the feedback that is it possible to have this part removed? I mean the error message. One proper suggestion is :"Whichever function is causing that can be redirected to device called /dev/null so that it won't come to /var/log/messages". Best Regards Wang Wen

2 2

[PATCH v11 0/6] Host Device Passthrough
by Zhou Zheng Sheng 08 Oct '14

08 Oct '14

Hi all, Host device passthrough is to directly assign host device to guest exclusively, so there is no virtualization overhead, and it improves guest performance greatly. It's useful if you have a server with lots of PCIe slots and cards. This v11 patch series improve disto compatibility and device filtering. Firstly, the patches adapt to Ubuntu 14.04, RHEL 6.5, RHEL 7, Fedora 20 and Fedora 19. It just relies on libvirt node-device API, kernel vfio framework and /sys/kernel/iommu_group. So any distribution providing these features should work. On old distributions like RHEL 6.5, they are shipped with 2.6.X kernel which do not support vfio and sysfs iommu group. We also try to be compatible, but as far as we tested, the PCI passthrough feature using the traditional pci-stub + kvm approach is buggy and not mature. So in this patch series, the back-end provides a capability in /config/capabilities for the front-end to check, and then freezes PCI passthrough web UI in this case. Didn't test on SuSe, just because the author could not find a physical SuSe server. The patches should work on SuSe as long as it provides the dependencies. Secondly, there is 2 changes in PCI device filtering. Previously, we only allowed to assign the "leaf" devices to guest. For example, instead of assigning a USB controller, we assign the connected USB device. We also made a PCI device whitelist according to the class code. After some tests, we find that it's hardly useful if we only allow "leaf" device, because in many cases the user wants to assign a parent device. For example, the user may want to assign an HBA card to guest, while there are many children LUNs under this card. The PCI device code is also not a good way for checking if a device is suitable to be passed through. There are too many vendors and devices, you'll always find some "good" devices are out of the whitelist, and if we grant the relared class code, it'll introduce "bad" devices. So in this patch we just filter out video cards and PCI bridges. They are not for passthrough absolutely. We also allow to passthrough a parent device. The back-end provides API to check the affected devices if you passthrough a particular one. The affected devices are the devices in the same iommu group and their children devices. As regard to the front-end, we only implemented PCI device passthrough, PCI devices are the mostly useful and interesting devices to passthrough. The back-end actually supports passing through LUNs and USB devices. To test the patches, firstly reboot your host os, enable vt-d in BIOS. Before loading Linux kernel, append "intel_iommu=on" to kernel arguments. If you want to make it persistent, edit "grub.conf" and append it. Then just apply the patch, start Kimchi daemon, edit a shutdown guest, you'll see "Host PCI Device" tab. In the listing, select "To Add", then click "+" besides one of the device. You'll find PCI devices in the same group are also added. Then close the dialogue and start the guest. In guest OS, "lspci" can show you the passthrough devices. In future, we plan to add more helpful information to assist user. For example, when the user selects an NIC card, the front-end shows the configured IP address. When the user selects an HBA card, the front-end shows the related block devices such as sda sdb ... So the user can avoid assigning a device in use by the host. Yu Xin Huo (1): Host device passthrough (Front-end): Add PCI Devices to VM Zhou Zheng Sheng (5): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device Host device passthrough: Add unit tests and documents docs/API.md | 66 ++++++- src/kimchi/API.json | 31 +++ src/kimchi/control/host.py | 7 + src/kimchi/control/vm/hostdevs.py | 44 +++++ src/kimchi/featuretests.py | 10 +- src/kimchi/i18n.py | 8 + src/kimchi/mockmodel.py | 127 +++++++++++- src/kimchi/model/config.py | 6 +- src/kimchi/model/host.py | 48 +++-- src/kimchi/model/hostdev.py | 351 +++++++++++++++++++++++++++++++++ src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/vmhostdevs.py | 324 ++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 ++- tests/test_model.py | 31 +++ tests/test_rest.py | 12 +- tests/test_storagepool.py | 7 +- ui/css/theme-default/guest-edit.css | 86 +++++++- ui/js/src/kimchi.api.js | 55 ++++++ ui/js/src/kimchi.guest_edit_main.js | 81 ++++++++ ui/pages/guest-edit.html.tmpl | 28 +++ 21 files changed, 1312 insertions(+), 57 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/model/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.3

2 15

[PATCHv5 0/2] Repository related fixes
by lvroyce＠linux.vnet.ibm.com 07 Oct '14

07 Oct '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v3>v5, fixed style error. Royce Lv (2): Fix: Avoid passing unexpected config params to repository manager Fix: Add rollback to update repository src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 40 +++++++++++++++++++++++++--------------- tests/test_model.py | 10 ++++++++-- 4 files changed, 35 insertions(+), 18 deletions(-) -- 1.8.3.2

6 10

[PATCH] Bug 440 Fix
by huoyuxin＠linux.vnet.ibm.com 07 Oct '14

07 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> 2 Issues: 1. In menu widget, it handle the passin params incorrectly. 2. Filter out storage pools without any available volume. Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 2 +- ui/js/widgets/select-menu.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..6e01d3e 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -61,7 +61,7 @@ kimchi.guest_storage_add_main = function() { var options = []; if (result && result.length) { $.each(result, function(index, storagePool) { - if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso')) { + if ((storagePool.state=="active") && (storagePool.type !== 'kimchi-iso') && storagePool.nr_volumes) { options.push({ label: storagePool.name, value: storagePool.name diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..c4b0209 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -36,8 +36,10 @@ var selectedClass = 'active'; var itemTag = 'li'; var item; + that.listControl.find('li').remove(); + that.label.text(""); + that.target.val(""); if (options.length > 0) { - that.listControl.find('li').remove(); $.each(options, function(index, option) { item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); item.data('value', option.value); @@ -58,8 +60,6 @@ that.target.change(); } }); - } else { - kimchi.message.error.code('KCHAPI6006E'); } }, -- 1.7.1

4 6

[PATCH] pep8: Use blacklist instead of whitelist
by Crístian Viana 07 Oct '14

07 Oct '14

Currently, the command "make check-local" runs the PEP8 verification rules only on files listed in a configuration files. New files must still be added manually and not all files are being checked. List the files which *shouldn't* be checked against the PEP8 rules instead of listing the files which should be checked. Also, fix the errors on those new files. The blacklisted files are: src/kimchi/{i18n,websocket,websockify}.py. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- Makefile.am | 48 ++------------------------------------------- src/kimchi/__init__.py | 2 +- src/kimchi/basemodel.py | 4 +++- src/kimchi/netinfo.py | 2 +- src/kimchi/screenshot.py | 17 +++++++++------- src/kimchi/sslcert.py | 5 +++-- src/kimchi/vmdisks.py | 6 +++--- src/kimchi/vnc.py | 2 +- src/kimchi/xmlutils.py | 2 +- tests/test_authorization.py | 20 +++++++++++-------- tests/test_exception.py | 10 +++++----- tests/test_server.py | 5 +---- tests/test_vmtemplate.py | 2 +- 13 files changed, 44 insertions(+), 81 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3293d9e..c04ba32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,51 +38,7 @@ EXTRA_DIST = \ $(NULL) -# When fixing a file to conform with pep8, add it to the WL here. -# So it will be checked from now on. -PEP8_WHITELIST = \ - plugins/__init__.py \ - plugins/sample/__init__.py \ - plugins/sample/model.py \ - src/kimchid.in \ - src/kimchi/asynctask.py \ - src/kimchi/auth.py \ - src/kimchi/cachebust.py \ - src/kimchi/config.py.in \ - src/kimchi/control/*.py \ - src/kimchi/control/vm/*.py \ - src/kimchi/disks.py \ - src/kimchi/distroloader.py \ - src/kimchi/exception.py \ - src/kimchi/featuretests.py \ - src/kimchi/imageinfo.py \ - src/kimchi/iscsi.py \ - src/kimchi/isoinfo.py \ - src/kimchi/kvmusertests.py \ - src/kimchi/mockmodel.py \ - src/kimchi/model/*.py \ - src/kimchi/objectstore.py \ - src/kimchi/osinfo.py \ - src/kimchi/proxy.py \ - src/kimchi/repositories.py \ - src/kimchi/rollbackcontext.py \ - src/kimchi/root.py \ - src/kimchi/scan.py \ - src/kimchi/server.py \ - src/kimchi/swupdate.py \ - src/kimchi/template.py \ - src/kimchi/utils.py \ - src/kimchi/vmtemplate.py \ - tests/test_config.py.in \ - tests/test_mockmodel.py \ - tests/test_model.py \ - tests/test_osinfo.py \ - tests/test_plugin.py \ - tests/test_rest.py \ - tests/test_rollbackcontext.py \ - tests/test_storagepool.py \ - tests/utils.py \ - $(NULL) +PEP8_BLACKLIST = "src/kimchi/i18n.py,src/kimchi/websocket.py,src/kimchi/websockify.py" SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" @@ -98,7 +54,7 @@ check-local: while read LINE; do echo "$$LINE"; false; done $(PEP8) --version - $(PEP8) --filename '*.py,*.py.in' $(PEP8_WHITELIST) + $(PEP8) --filename '*.py,*.py.in' --exclude="$(PEP8_BLACKLIST)" . # Link built mo files in the source tree to enable use of translations from diff --git a/src/kimchi/__init__.py b/src/kimchi/__init__.py index 1237e99..edf8e5d 100644 --- a/src/kimchi/__init__.py +++ b/src/kimchi/__init__.py @@ -15,4 +15,4 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/src/kimchi/basemodel.py b/src/kimchi/basemodel.py index 93aab0c..096c66b 100644 --- a/src/kimchi/basemodel.py +++ b/src/kimchi/basemodel.py @@ -46,7 +46,9 @@ class BaseModel(object): class Singleton(type): _instances = {} + def __call__(cls, *args, **kwargs): if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs) + inst = super(Singleton, cls).__call__(*args, **kwargs) + cls._instances[cls] = inst return cls._instances[cls] diff --git a/src/kimchi/netinfo.py b/src/kimchi/netinfo.py index 2eaf4ac..bb50479 100644 --- a/src/kimchi/netinfo.py +++ b/src/kimchi/netinfo.py @@ -185,7 +185,7 @@ def get_interface_type(iface): def get_interface_info(iface): - if not iface in ethtool.get_devices(): + if iface not in ethtool.get_devices(): raise ValueError('unknown interface: %s' % iface) ipaddr = '' diff --git a/src/kimchi/screenshot.py b/src/kimchi/screenshot.py index 8528a39..e599d40 100644 --- a/src/kimchi/screenshot.py +++ b/src/kimchi/screenshot.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # import glob @@ -39,6 +39,7 @@ from kimchi.utils import kimchi_log (fd, pipe) = tempfile.mkstemp() stream_test_result = None + class VMScreenshot(object): OUTDATED_SECS = 5 THUMBNAIL_SIZE = (256, 256) @@ -48,8 +49,9 @@ class VMScreenshot(object): def __init__(self, args): self.vm_uuid = args['uuid'] args.setdefault('thumbnail', - os.path.join(config.get_screenshot_path(), - '%s-%s.png' % (self.vm_uuid, str(uuid.uuid4())))) + os.path.join(config.get_screenshot_path(), + '%s-%s.png' % + (self.vm_uuid, str(uuid.uuid4())))) self.info = args @staticmethod @@ -66,8 +68,8 @@ class VMScreenshot(object): if now - last_update > self.OUTDATED_SECS: self._clean_extra(self.LIVE_WINDOW) self._generate_thumbnail() - return '/data/screenshots/%s' % os.path.basename(self.info['thumbnail']) - + return '/data/screenshots/%s' %\ + os.path.basename(self.info['thumbnail']) def _clean_extra(self, window=-1): """ @@ -77,7 +79,8 @@ class VMScreenshot(object): try: now = time.time() clear_list = glob.glob("%s/%s-*.png" % - (config.get_screenshot_path(), self.vm_uuid)) + (config.get_screenshot_path(), + self.vm_uuid)) for f in clear_list: if now - os.path.getmtime(f) > window: os.unlink(f) @@ -122,7 +125,7 @@ class VMScreenshot(object): else: counter = 0 ret = os.waitpid(pid, os.WNOHANG) - while ret == (0,0) and counter < 3: + while ret == (0, 0) and counter < 3: counter += 1 time.sleep(1) ret = os.waitpid(pid, os.WNOHANG) diff --git a/src/kimchi/sslcert.py b/src/kimchi/sslcert.py index bf4d261..e772dc8 100644 --- a/src/kimchi/sslcert.py +++ b/src/kimchi/sslcert.py @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import time @@ -34,6 +34,7 @@ class SSLCert(object): def _gen(self): def keygen_cb(*args): pass + def passphrase_cb(*args): return '' @@ -54,7 +55,6 @@ class SSLCert(object): subject.CN = 'kimchi' subject.O = 'kimchi-project.org' - t = long(time.time()) + time.timezone now = ASN1.ASN1_UTCTIME() now.set_time(t) @@ -80,6 +80,7 @@ class SSLCert(object): def key_pem(self): return self._key + def main(): c = SSLCert() print c.cert_text() diff --git a/src/kimchi/vmdisks.py b/src/kimchi/vmdisks.py index b61c883..f1c3f02 100644 --- a/src/kimchi/vmdisks.py +++ b/src/kimchi/vmdisks.py @@ -39,9 +39,9 @@ def get_vm_disk(dom, dev_name): # Retrieve disk xml and format return dict disk = get_device_xml(dom, dev_name) if disk is None: - raise NotFoundError( - "KCHVMSTOR0007E", - {'dev_name': dev_name, 'vm_name': dom.name()}) + raise NotFoundError("KCHVMSTOR0007E", + {'dev_name': dev_name, + 'vm_name': dom.name()}) path = "" dev_bus = disk.target.attrib['bus'] try: diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py index cfa7c6d..09a4cad 100644 --- a/src/kimchi/vnc.py +++ b/src/kimchi/vnc.py @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import base64 import errno diff --git a/src/kimchi/xmlutils.py b/src/kimchi/xmlutils.py index 8612e66..d3db32a 100644 --- a/src/kimchi/xmlutils.py +++ b/src/kimchi/xmlutils.py @@ -26,7 +26,7 @@ from xml.etree import ElementTree def xpath_get_text(xml, expr): doc = libxml2.parseDoc(xml) res = doc.xpathEval(expr) - ret = [None if x.children == None else x.children.content for x in res] + ret = [None if x.children is None else x.children.content for x in res] doc.freeDoc() return ret diff --git a/tests/test_authorization.py b/tests/test_authorization.py index 2c342a5..71b416f 100644 --- a/tests/test_authorization.py +++ b/tests/test_authorization.py @@ -40,7 +40,7 @@ ssl_port = None def setUpModule(): global test_server, model, host, port, ssl_port - patch_auth(sudo = False) + patch_auth(sudo=False) model = kimchi.mockmodel.MockModel('/tmp/obj-store-test') host = '127.0.0.1' port = get_free_port('http') @@ -111,23 +111,27 @@ class AuthorizationTests(unittest.TestCase): resp = self.request('/templates/test', '{}', 'DELETE') self.assertEquals(403, resp.status) - # Non-root users can only get vms authorized to them model.templates_create({'name': u'test', 'cdrom': '/nonexistent.iso'}) model.vms_create({'name': u'test-me', 'template': '/templates/test'}) - model.vm_update(u'test-me', {'users': [ kimchi.mockmodel.fake_user.keys()[0] ], 'groups': []}) + model.vm_update(u'test-me', + {'users': [kimchi.mockmodel.fake_user.keys()[0]], + 'groups': []}) - model.vms_create({'name': u'test-usera', 'template': '/templates/test'}) - model.vm_update(u'test-usera', {'users': [ 'userA' ], 'groups': []}) + model.vms_create({'name': u'test-usera', + 'template': '/templates/test'}) + model.vm_update(u'test-usera', {'users': ['userA'], 'groups': []}) - model.vms_create({'name': u'test-groupa', 'template': '/templates/test'}) - model.vm_update(u'test-groupa', {'groups': [ 'groupA' ]}) + model.vms_create({'name': u'test-groupa', + 'template': '/templates/test'}) + model.vm_update(u'test-groupa', {'groups': ['groupA']}) resp = self.request('/vms', '{}', 'GET') self.assertEquals(200, resp.status) vms_data = json.loads(resp.read()) - self.assertEquals([ u'test-groupa', u'test-me' ], sorted([ v['name'] for v in vms_data ])) + self.assertEquals([u'test-groupa', u'test-me'], + sorted([v['name'] for v in vms_data])) resp = self.request('/vms', req, 'POST') self.assertEquals(403, resp.status) diff --git a/tests/test_exception.py b/tests/test_exception.py index 90c1ea1..a533015 100644 --- a/tests/test_exception.py +++ b/tests/test_exception.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import json import os @@ -77,8 +77,8 @@ class ExceptionTests(unittest.TestCase): req = json.dumps({}) resp = json.loads(request(host, ssl_port, '/vms', req, 'POST').read()) self.assertEquals('400 Bad Request', resp.get('code')) - msg = u"KCHVM0016E: Specify a template to create a virtual machine from" - self.assertEquals(msg, resp.get('reason')) + m = u"KCHVM0016E: Specify a template to create a virtual machine from" + self.assertEquals(m, resp.get('reason')) self.assertNotIn('call_stack', resp) def test_development_env(self): @@ -106,7 +106,7 @@ class ExceptionTests(unittest.TestCase): # test 400 missing required parameter req = json.dumps({}) resp = json.loads(request(host, ssl_port, '/vms', req, 'POST').read()) - msg = u"KCHVM0016E: Specify a template to create a virtual machine from" + m = u"KCHVM0016E: Specify a template to create a virtual machine from" self.assertEquals('400 Bad Request', resp.get('code')) - self.assertEquals(msg, resp.get('reason')) + self.assertEquals(m, resp.get('reason')) self.assertIn('call_stack', resp) diff --git a/tests/test_server.py b/tests/test_server.py index 9beba6c..bebc383 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os import unittest @@ -24,7 +24,6 @@ import unittest import utils import kimchi.mockmodel -#utils.silence_server() class ServerTests(unittest.TestCase): def test_server_start(self): @@ -44,5 +43,3 @@ class ServerTests(unittest.TestCase): finally: os.unlink('/tmp/obj-store-test') s.stop() - - diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 4ae1d36..2a6fb8e 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os import unittest -- 1.9.3

3 5

Why do we use mockmodel?
by Crístian Viana 03 Oct '14

03 Oct '14

Hi! After creating a few patches for Kimchi, it occurred to me that the mockmodel design has more cons than pros. So I started wondering why we still use it. I understand - and totally agree - that we should have an extensive test infrastructure to make sure the code runs as designed and to make it very easy to find regression bugs on every new feature we implement. And as Kimchi works very integrated to its host system, it may not be easy to create expected/failed situations for things we don't always have control. But for every new feature we implement, we currently have to: 1) Implement the feature itself 2) Create tests for (1) 3) Implement the feature in a mock environment 4) Create tests for (3) And by looking at some existing code, many of the mock tests don't actually test anything. They're just there so we can say we have a mock implementation and a test for it. Why create a mock function and a test for the mock function if what we need is to test the real code? And a lot of times, the mock implementation (and the tests) are just copy/paste of the original feature. For me, that seems very tedious and useless. Why don't we get rid of the mockmodel and keep only the "real" model? I understand that it's not so simple to remove it right away, that's why I'm starting this discussion so we could see how to do it better - if we're actually going to do it. What would we miss if we didn't have the mockmodel anymore? I believe we'll need to be more careful when writing tests which run on a real environment (i.e. we can't "leak" VMs, networks, templates, or anything else) but at least we'll always test real code and we won't be writing code that won't be used. Please share your opinion with us. Best regards, Crístian.

2 2

[PATCH] Display "README" with markdown style on Github
by Crístian Viana 03 Oct '14

03 Oct '14

The file "README" is a markdown file but as it doesn't have the suffix ".md", Github doesn't render it with markdown style. Rename the symlink "README" in order to be displayed with markdown style on Github. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- README | 1 - README.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 README create mode 120000 README.md diff --git a/README b/README deleted file mode 120000 index 0e01b43..0000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -docs/README.md \ No newline at end of file diff --git a/README.md b/README.md new file mode 120000 index 0000000..0e01b43 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +docs/README.md \ No newline at end of file -- 1.9.3

2 2

[PATCH] Backend support for templates with sockets, cores, and threads
by Christy Perez 03 Oct '14

03 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 7 +++++++ src/kimchi/API.json | 28 ++++++++++++++++++++++++++-- src/kimchi/control/templates.py | 11 ++++++++--- src/kimchi/osinfo.py | 2 +- src/kimchi/vmtemplate.py | 22 ++++++++++++++++++++++ 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/docs/API.md b/docs/API.md index d75c55f..cb4d541 100644 --- a/docs/API.md +++ b/docs/API.md @@ -200,6 +200,13 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c3fc5e3..d510634 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,28 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "number" + }, + "cores": { + "type": "number" + }, + "threads": { + "type": "number" + } + }, + "required": [ "sockets", "cores", "threads" ] + } + } } }, "properties": { @@ -438,7 +460,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -608,7 +631,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..5ef35ce 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,13 +38,14 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, + return_data = { + 'name': self.ident, 'icon': self.info['icon'], 'invalid': self.info['invalid'], 'os_distro': self.info['os_distro'], @@ -56,4 +57,8 @@ def data(self): 'storagepool': self.info['storagepool'], 'networks': self.info['networks'], 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + 'graphics': self.info['graphics'] + } + if (self.info.get('cpu_info')): + return_data['cpu_info'] = self.info['cpu_info'] + return return_data diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 1ad353c..8492bb7 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,7 +32,7 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, +common_spec = {'cpus': 1, 'cpu_sockets': '1', 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 761bac5..c64e61d 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -359,6 +359,22 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is not None: + cpu_topo = cpu_info.get('topology') + if cpu_topo is not None: + return """ + <cpu> + <topology sockets='%(sockets)s' + cores='%(cores)s' + threads='%(threads)s'/> + </cpu> + """ % cpu_topo + + return "" + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -371,6 +387,11 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + if params.get('cpu_info') is not None: + params['cpu_info'] = self._get_cpu_xml() + else: + params['cpu_info'] = '' + # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) storage_type = self._get_storage_type() @@ -401,6 +422,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

2 6

A question about iSCSI storage pool
by Yu Xin Huo 03 Oct '14

03 Oct '14

I got a iSCSI target to work on my redhat with a USB disk to test iSCSI storage pool and found below: 1. When create a iSCSI storage pool, I selected a target in dropdown list. 2. Once the pool is created, I see a volume named 'unit:0:0:1'. 3. When edit template, in the 'storage pool' dropdown, 'unit:0:0:1' is listed there. So 'unit:0:0:1' which indeed is a *volume* but listed as a *pool* in template? or something I am misunderstanding?

2 5

Kimchi UI design proposals
by Don S. Spangler 02 Oct '14

02 Oct '14

I recently created a page on the Kimchi wiki (UI Design Proposals <https://github.com/kimchi-project/kimchi/wiki/UI-Design-Proposals>) around developing a set of UI design proposals with the following goals: * Provide a complete user interface and visual style for all major tabs and tasks * Maintain clean design and interactions in keeping with Kimchi directions * Design flexible framework to allow for consistency when adding new capabilities * Enable design to support responsiveness and touch / mobile (tablet / phone) interactions We plan on making iterative updates to the screens and would like to open it up to feedback. The initial focus has been the major content areas (host, guest, template, storage, and networks) and will be working on details of the interactions, including page level blueprints. The layouts to support responsiveness are particularly important and would be part of the next updates. We look forward to your feedback, including areas that may need more clarification and issues around implementation. Thanks! Don Spangler

3 2

[PATCHv2] Fix: accelerate mockmodel for file upload
by lvroyce＠linux.vnet.ibm.com 30 Sep '14

30 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, use wait task rather than adding sleep time (Cristian) File upload fails with error 404 because of small read is time consuming, change read size and wait in test to guarentee storage volume created when query URI. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 2 +- tests/test_rest.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index ab4357d..cbbdba3 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -534,7 +534,7 @@ class MockModel(object): size = 0 try: while True: - data = upload_file.file.read(8192) + data = upload_file.file.read(8192*32) if not data: break size += len(data) diff --git a/tests/test_rest.py b/tests/test_rest.py index 7eb6233..99f2176 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1947,9 +1947,10 @@ class RestTests(unittest.TestCase): self.assertEquals(r.status_code, 202) task = r.json() - self._wait_task(task['id']) + self._wait_task(task['id'], 15) resp = self.request('/storagepools/default/storagevolumes/%s' % task['target_uri'].split('/')[-1]) + self.assertEquals(200, resp.status) # Create a file with 5M to upload -- 1.8.3.2

2 1

[PATCH] Bug Fix: Correct select menu to handle empty input
by huoyuxin＠linux.vnet.ibm.com 30 Sep '14

30 Sep '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/widgets/select-menu.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..c4b0209 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -36,8 +36,10 @@ var selectedClass = 'active'; var itemTag = 'li'; var item; + that.listControl.find('li').remove(); + that.label.text(""); + that.target.val(""); if (options.length > 0) { - that.listControl.find('li').remove(); $.each(options, function(index, option) { item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); item.data('value', option.value); @@ -58,8 +60,6 @@ that.target.change(); } }); - } else { - kimchi.message.error.code('KCHAPI6006E'); } }, -- 1.7.1

3 3

[PATCH V4] Bugfix: Cancel option not working properly in New Storage Define
by Wen Wang 29 Sep '14

29 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> V4: Move the duplicate part to a function that reduce the duplication. V2 -> V3: Make the button style change properly with different storage pool types. V1 -> V2: Make the "Create" button change style and disable the input box only when clicked on "ok" in "confirm" diaguage. The button and the input style stay the same if user cancel the creating job. This bug fix the defect that when adding a new logical storage pool, a confrim message box show up and when canceling it, the inputbox as well as button "Create" is still disabled. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 37 +++++++++++++----------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 4f1f943..ffe8fb6 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -352,8 +352,6 @@ kimchi.validateLogicalForm = function () { kimchi.addPool = function(event) { if (kimchi.validateForm()) { - $('#pool-doAdd').hide(); - $('#pool-loading').show(); var formData = $('#form-pool-add').serializeObject(); delete formData.authname; var poolType = $('#poolTypeId').selectMenu('value'); @@ -390,16 +388,11 @@ kimchi.addPool = function(event) { } else if (poolType === 'scsi'){ formData.source = { adapter_name: $('#scsiAdapter').selectMenu('value') }; } - $('input', '#form-pool-add').attr('disabled','disabled'); - if (poolType === 'logical') { - var settings = { - title : i18n['KCHAPI6001M'], - content : i18n['KCHPOOL6003M'], - confirm : i18n['KCHAPI6002M'], - cancel : i18n['KCHAPI6003M'] - }; - kimchi.confirm(settings, function() { - kimchi.createStoragePool(formData, function() { + var storagePoolAddingFunc = function() { + $('input', '#form-pool-add').attr('disabled','disabled'); + $('#pool-doAdd').hide(); + $('#pool-loading').show(); + kimchi.createStoragePool(formData, function() { kimchi.doListStoragePools(); kimchi.window.close(); }, function(err) { @@ -408,18 +401,20 @@ kimchi.addPool = function(event) { $('#pool-loading').hide(); $('#pool-doAdd').show(); }); + }; + if (poolType === 'logical') { + var settings = { + title : i18n['KCHAPI6001M'], + content : i18n['KCHPOOL6003M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] + }; + kimchi.confirm(settings, function() { + storagePoolAddingFunc(); }, function() { }); } else { - kimchi.createStoragePool(formData, function() { - kimchi.doListStoragePools(); - kimchi.window.close(); - }, function(err) { - kimchi.message.error(err.responseJSON.reason); - $('input', '#form-pool-add').removeAttr('disabled'); - $('#pool-loading').hide(); - $('#pool-doAdd').show(); - }); + storagePoolAddingFunc(); } } }; -- 1.7.1

3 2

[PATCH V2] Bug Fix: Correct select menu to handle empty input
by Wen Wang 29 Sep '14

29 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> V1 -> V2: Have the message item "Options needed." deleted from "ui/pages/i18n.json.tmpl" and make the proper change with each po file. Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/de_DE.po | 3 --- po/en_US.po | 3 --- po/es_ES.po | 3 --- po/fr_FR.po | 3 --- po/it_IT.po | 3 --- po/ja_JP.po | 3 --- po/kimchi.pot | 3 --- po/ko_KR.po | 3 --- po/pt_BR.po | 3 --- po/ru_RU.po | 3 --- po/zh_CN.po | 3 --- po/zh_TW.po | 3 --- ui/js/widgets/select-menu.js | 6 +++--- ui/pages/i18n.json.tmpl | 1 - 14 files changed, 3 insertions(+), 40 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 9d25e20..98bde90 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1256,9 +1256,6 @@ msgstr "Dies ist kein gültiger URL." msgid "No such data available." msgstr "Keine solchen Daten verfügbar." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/en_US.po b/po/en_US.po index e36c88d..eb571ca 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1128,9 +1128,6 @@ msgstr "" msgid "No such data available." msgstr "" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/es_ES.po b/po/es_ES.po index 1279969..5a3fa46 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1274,9 +1274,6 @@ msgstr "No es un URL válido." msgid "No such data available." msgstr "No hay datos de ese tipo disponibles." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/fr_FR.po b/po/fr_FR.po index a13ef9f..414dd4a 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1263,9 +1263,6 @@ msgstr "Ce n'est pas une URL valide." msgid "No such data available." msgstr "De telles données ne sont pas disponibles." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/it_IT.po b/po/it_IT.po index d710a66..4a6c919 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1243,9 +1243,6 @@ msgstr "Non è un URL valido." msgid "No such data available." msgstr "Dati indicati non disponibili." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/ja_JP.po b/po/ja_JP.po index d8d20f7..af00487 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1253,9 +1253,6 @@ msgstr "有効な URL ではありません。" msgid "No such data available." msgstr "そのようなデータはありません。" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/kimchi.pot b/po/kimchi.pot index e72ddcd..685802e 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -1128,9 +1128,6 @@ msgstr "" msgid "No such data available." msgstr "" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/ko_KR.po b/po/ko_KR.po index 7946cb2..a9f82e4 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1185,9 +1185,6 @@ msgstr "올바른 URL이 아닙니다." msgid "No such data available." msgstr "해당 데이터가 없습니다." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/pt_BR.po b/po/pt_BR.po index a86567d..f2fba64 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1265,9 +1265,6 @@ msgstr "Essa não é uma URL válida." msgid "No such data available." msgstr "Não há dados disponíveis." -msgid "Options needed." -msgstr "Opções necessárias." - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/ru_RU.po b/po/ru_RU.po index f17f9bc..059b999 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1184,9 +1184,6 @@ msgstr "Это недопустимый URL." msgid "No such data available." msgstr "Нет таких данных." -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/zh_CN.po b/po/zh_CN.po index 5bf59ca..f77e405 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1151,9 +1151,6 @@ msgstr "这不是一个有效的URL" msgid "No such data available." msgstr "没有可用的数据" -msgid "Options needed." -msgstr "需要选项。" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/po/zh_TW.po b/po/zh_TW.po index 9db4edf..4040b2a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1131,9 +1131,6 @@ msgstr "這是無效的 URL。" msgid "No such data available." msgstr "沒有此類可用資料。" -msgid "Options needed." -msgstr "" - msgid "" "Can not contact the host system. Verify the host system is up and that you " "have network connectivity to it. HTTP request response %1. " diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..c4b0209 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -36,8 +36,10 @@ var selectedClass = 'active'; var itemTag = 'li'; var item; + that.listControl.find('li').remove(); + that.label.text(""); + that.target.val(""); if (options.length > 0) { - that.listControl.find('li').remove(); $.each(options, function(index, option) { item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); item.data('value', option.value); @@ -58,8 +60,6 @@ that.target.change(); } }); - } else { - kimchi.message.error.code('KCHAPI6006E'); } }, diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index c52b175..75f1e43 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -39,7 +39,6 @@ "KCHAPI6003E": "$_("This is not a valid Linux path")", "KCHAPI6004E": "$_("This is not a valid URL.")", "KCHAPI6005E": "$_("No such data available.")", - "KCHAPI6006E": "$_("Options needed.")", "KCHAPI6007E": "$_("Can not contact the host system. Verify the host system is up and that you have network connectivity to it. HTTP request response %1. ")", "KCHAPI6001M": "$_("Delete Confirmation")", -- 1.7.1

3 2

[PATCHv6] Fix wrong config param of repository creation
by lvroyce＠linux.vnet.ibm.com 29 Sep '14

29 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Wrong config param for repository creation needs to be rejected, also fix correspoding testcases. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 11 ++++++++++- tests/test_model.py | 13 +++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index d402dde..1b543ce 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -288,4 +288,5 @@ messages = { "KCHREPOS0025E": _("Unable to retrieve repository information. Details: '%(err)s'"), "KCHREPOS0026E": _("Unable to add repository. Details: '%(err)s'"), "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"), + "KCHREPOS0028E": _("Configuration items: '%(items)s' are not supported by repository manager"), } diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 19edc22..f826ac9 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -26,7 +26,7 @@ from ConfigParser import ConfigParser from kimchi.basemodel import Singleton from kimchi.config import kimchiLock -from kimchi.exception import InvalidOperation +from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter from kimchi.utils import validate_repo_url @@ -52,6 +52,13 @@ class Repositories(object): """ Add and enable a new repository """ + config = params.get('config', {}) + extra_keys = list( + set(config.keys()).difference(set(self._pkg_mnger.CONFIG_ENTRY))) + if len(extra_keys) > 0: + raise InvalidParameter("KCHREPOS0028E", + {'items': ",".join(extra_keys)}) + return self._pkg_mnger.addRepo(params) def getRepositories(self): @@ -105,6 +112,7 @@ class YumRepo(object): """ TYPE = 'yum' DEFAULT_CONF_DIR = "/etc/yum.repos.d" + CONFIG_ENTRY = ('repo_name', 'mirrorlist') def __init__(self): self._yb = getattr(__import__('yum'), 'YumBase') @@ -319,6 +327,7 @@ class AptRepo(object): """ TYPE = 'deb' KIMCHI_LIST = "kimchi-source.list" + CONFIG_ENTRY = ('dist', 'comps') def __init__(self): getattr(__import__('apt_pkg'), 'init_config')() diff --git a/tests/test_model.py b/tests/test_model.py index 63032f5..1f2e79c 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1309,8 +1309,7 @@ class ModelTests(unittest.TestCase): 'baseurl': 'http://www.fedora.org'}, {'repo_id': 'fedora-updates-fake', 'config': - {'mirrorlist': 'http://www.fedoraproject.org', - 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}}] + {'mirrorlist': 'http://www.fedoraproject.org'}}] deb_repos = [{'baseurl': 'http://archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}}, @@ -1325,12 +1324,22 @@ class ModelTests(unittest.TestCase): wrong_mirrorlist = {'repo_id': 'wrong-id', 'baseurl': 'www.example.com', 'config': {'mirrorlist': url}} + wrong_config_item = { + 'repo_id': 'wrong-id', + 'baseurl': 'www.example.com', + 'config': { + 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}} yum_invalid_repos.append(wrong_baseurl) yum_invalid_repos.append(wrong_mirrorlist) + yum_invalid_repos.append(wrong_config_item) wrong_baseurl['config'] = {'dist': 'tasty'} + wrong_config = {'baseurl': deb_repos[0]['baseurl'], + 'config': { + 'unsupported_item': "a_unsupported_item"}} deb_invalid_repos.append(wrong_baseurl) + deb_invalid_repos.append(wrong_config) repo_type = inst.capabilities_lookup()['repo_mngt_tool'] if repo_type == 'yum': -- 1.8.3.2

2 1

[PATCH] Fix: retrieve right bus type in vmstorage update
by lvroyce＠linux.vnet.ibm.com 29 Sep '14

29 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When disk source does not present in xml(i.e. cdrom ejected), bus type probe will be ignored because of former exception. Retrive right bus type before source probe to fix this. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmdisks.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/kimchi/vmdisks.py b/src/kimchi/vmdisks.py index 6012ada..b61c883 100644 --- a/src/kimchi/vmdisks.py +++ b/src/kimchi/vmdisks.py @@ -43,7 +43,7 @@ def get_vm_disk(dom, dev_name): "KCHVMSTOR0007E", {'dev_name': dev_name, 'vm_name': dom.name()}) path = "" - dev_bus = 'ide' + dev_bus = disk.target.attrib['bus'] try: source = disk.source if source is not None: @@ -55,8 +55,6 @@ def get_vm_disk(dom, dev_name): host.attrib['port'] + source.attrib['name']) else: path = source.attrib[DEV_TYPE_SRC_ATTR_MAP[src_type]] - # Retrieve storage bus type - dev_bus = disk.target.attrib['bus'] except: pass dev_type = disk.attrib['device'] -- 1.8.3.2

4 3

[PATCH V3] Bugfix: Cancel option not working properly in New Storage Define
by Wen Wang 29 Sep '14

29 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Make the button style change properly with different storage pool types. V1 -> V2: Make the "Create" button change style and disable the input box only when clicked on "ok" in "confirm" diaguage. The button and the input style stay the same if user cancel the creating job. This bug fix the defect that when adding a new logical storage pool, a confrim message box show up and when canceling it, the inputbox as well as button "Create" is still disabled. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 4f1f943..07e7fbe 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -352,8 +352,6 @@ kimchi.validateLogicalForm = function () { kimchi.addPool = function(event) { if (kimchi.validateForm()) { - $('#pool-doAdd').hide(); - $('#pool-loading').show(); var formData = $('#form-pool-add').serializeObject(); delete formData.authname; var poolType = $('#poolTypeId').selectMenu('value'); @@ -390,7 +388,6 @@ kimchi.addPool = function(event) { } else if (poolType === 'scsi'){ formData.source = { adapter_name: $('#scsiAdapter').selectMenu('value') }; } - $('input', '#form-pool-add').attr('disabled','disabled'); if (poolType === 'logical') { var settings = { title : i18n['KCHAPI6001M'], @@ -399,6 +396,9 @@ kimchi.addPool = function(event) { cancel : i18n['KCHAPI6003M'] }; kimchi.confirm(settings, function() { + $('input', '#form-pool-add').attr('disabled','disabled'); + $('#pool-doAdd').hide(); + $('#pool-loading').show(); kimchi.createStoragePool(formData, function() { kimchi.doListStoragePools(); kimchi.window.close(); @@ -411,6 +411,9 @@ kimchi.addPool = function(event) { }, function() { }); } else { + $('input', '#form-pool-add').attr('disabled','disabled'); + $('#pool-doAdd').hide(); + $('#pool-loading').show(); kimchi.createStoragePool(formData, function() { kimchi.doListStoragePools(); kimchi.window.close(); -- 1.7.1

2 2

[PATCHv6] Reject improper format for storage types
by lvroyce＠linux.vnet.ibm.com 29 Sep '14

29 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v5>v6, aggregate param check to repositories class level. Reject non-iso storage volume for cdrom attachment, and non supported format types for disk attachment Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 11 ++++++++++- tests/test_model.py | 13 +++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index d402dde..1b543ce 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -288,4 +288,5 @@ messages = { "KCHREPOS0025E": _("Unable to retrieve repository information. Details: '%(err)s'"), "KCHREPOS0026E": _("Unable to add repository. Details: '%(err)s'"), "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"), + "KCHREPOS0028E": _("Configuration items: '%(items)s' are not supported by repository manager"), } diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 19edc22..f826ac9 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -26,7 +26,7 @@ from ConfigParser import ConfigParser from kimchi.basemodel import Singleton from kimchi.config import kimchiLock -from kimchi.exception import InvalidOperation +from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter from kimchi.utils import validate_repo_url @@ -52,6 +52,13 @@ class Repositories(object): """ Add and enable a new repository """ + config = params.get('config', {}) + extra_keys = list( + set(config.keys()).difference(set(self._pkg_mnger.CONFIG_ENTRY))) + if len(extra_keys) > 0: + raise InvalidParameter("KCHREPOS0028E", + {'items': ",".join(extra_keys)}) + return self._pkg_mnger.addRepo(params) def getRepositories(self): @@ -105,6 +112,7 @@ class YumRepo(object): """ TYPE = 'yum' DEFAULT_CONF_DIR = "/etc/yum.repos.d" + CONFIG_ENTRY = ('repo_name', 'mirrorlist') def __init__(self): self._yb = getattr(__import__('yum'), 'YumBase') @@ -319,6 +327,7 @@ class AptRepo(object): """ TYPE = 'deb' KIMCHI_LIST = "kimchi-source.list" + CONFIG_ENTRY = ('dist', 'comps') def __init__(self): getattr(__import__('apt_pkg'), 'init_config')() diff --git a/tests/test_model.py b/tests/test_model.py index 63032f5..1f2e79c 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1309,8 +1309,7 @@ class ModelTests(unittest.TestCase): 'baseurl': 'http://www.fedora.org'}, {'repo_id': 'fedora-updates-fake', 'config': - {'mirrorlist': 'http://www.fedoraproject.org', - 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}}] + {'mirrorlist': 'http://www.fedoraproject.org'}}] deb_repos = [{'baseurl': 'http://archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}}, @@ -1325,12 +1324,22 @@ class ModelTests(unittest.TestCase): wrong_mirrorlist = {'repo_id': 'wrong-id', 'baseurl': 'www.example.com', 'config': {'mirrorlist': url}} + wrong_config_item = { + 'repo_id': 'wrong-id', + 'baseurl': 'www.example.com', + 'config': { + 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}} yum_invalid_repos.append(wrong_baseurl) yum_invalid_repos.append(wrong_mirrorlist) + yum_invalid_repos.append(wrong_config_item) wrong_baseurl['config'] = {'dist': 'tasty'} + wrong_config = {'baseurl': deb_repos[0]['baseurl'], + 'config': { + 'unsupported_item': "a_unsupported_item"}} deb_invalid_repos.append(wrong_baseurl) + deb_invalid_repos.append(wrong_config) repo_type = inst.capabilities_lookup()['repo_mngt_tool'] if repo_type == 'yum': -- 1.8.3.2

2 1

[PATCH] Adding bzip to fedora base for compression/decompression
by Brent Baude 26 Sep '14

26 Sep '14

--- fedora-atomic-base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-atomic-base.json b/fedora-atomic-base.json index 0c3d90a..5f0fa22 100644 --- a/fedora-atomic-base.json +++ b/fedora-atomic-base.json @@ -14,7 +14,7 @@ "packages": ["dracut-config-generic", "kernel", "rpm-ostree", "lvm2", "btrfs-progs", "e2fsprogs", "xfsprogs", "syslinux-extlinux", "authconfig", - "gnupg2", + "gnupg2", "bzip2", "basesystem", "bash", "coreutils", -- 1.9.3

2 1

[PATCH] Update translations for newly added msg
by lvroyce＠linux.vnet.ibm.com 26 Sep '14

26 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Updated pot file and added according translation for Chinese. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- po/de_DE.po | 104 ++++++++++++++++++++++++++++++++++------------------------ po/en_US.po | 90 ++++++++++++++++++++++++++++++-------------------- po/es_ES.po | 104 ++++++++++++++++++++++++++++++++++------------------------ po/fr_FR.po | 102 +++++++++++++++++++++++++++++++++----------------------- po/it_IT.po | 104 ++++++++++++++++++++++++++++++++++------------------------ po/ja_JP.po | 102 +++++++++++++++++++++++++++++++++----------------------- po/kimchi.pot | 90 ++++++++++++++++++++++++++++++-------------------- po/ko_KR.po | 103 ++++++++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 102 +++++++++++++++++++++++++++++++++----------------------- po/ru_RU.po | 102 +++++++++++++++++++++++++++++++++----------------------- po/zh_CN.po | 99 ++++++++++++++++++++++++++++++++----------------------- po/zh_TW.po | 104 ++++++++++++++++++++++++++++++++++------------------------ 12 files changed, 722 insertions(+), 484 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index b7a6f75..68b1a80 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -153,6 +153,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "Virtuelle Maschine %(name)s ist bereits vorhanden" @@ -400,8 +406,8 @@ msgid "Unable to delete template due error: %(err)s" msgstr "" "Vorlage kann aufgrund des folgenden Fehlers nicht gelöscht werden: %(err)s" -msgid "Disk size must be greater than 1GB." -msgstr "" +msgid "Disk size must be an integer greater than 1GB." +msgstr "Die Anzahl der CPUs muss eine Ganzzahl sein" msgid "Template base image must be a valid local image file" msgstr "Vorlagen-CD-ROM muss eine lokale oder ferne ISO-Datei sein" @@ -934,6 +940,12 @@ msgstr "" "Geben Sie Typ und Pfad an, um einen neuen Datenträger für eine virtuelle " "Maschine hinzuzfügen" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "" "YUM-Repository-ID darf nur ein aus einer Zeichenfolge bestehendes Wort sein." @@ -1039,6 +1051,11 @@ msgstr "Repository konnte nicht hinzugefügt werden. Details: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Repository konnte nicht entfernt werden. Details: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "FEHLERCODE" @@ -1148,30 +1165,6 @@ msgstr "Abhängen" msgid "Cancel" msgstr "Abbrechen" -msgid "Start" -msgstr "Starten" - -msgid "Reset" -msgstr "Zurücksetzen" - -msgid "Power Off" -msgstr "" - -msgid "Actions" -msgstr "Aktionen" - -msgid "Connect" -msgstr "Verbinden" - -msgid "Edit" -msgstr "Bearbeiten" - -msgid "Shut Down" -msgstr "Herunterfahren" - -msgid "Delete" -msgstr "Löschen" - msgid "Add a Storage Device to VM" msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" @@ -1202,6 +1195,30 @@ msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." msgid "Attach" msgstr "Anhängen" +msgid "Start" +msgstr "Starten" + +msgid "Reset" +msgstr "Zurücksetzen" + +msgid "Power Off" +msgstr "" + +msgid "Actions" +msgstr "Aktionen" + +msgid "Connect" +msgstr "Verbinden" + +msgid "Edit" +msgstr "Bearbeiten" + +msgid "Shut Down" +msgstr "Herunterfahren" + +msgid "Delete" +msgstr "Löschen" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " @@ -1710,6 +1727,21 @@ msgstr "Ja" msgid "No" msgstr "Nein" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "Neuen Speicherpool definieren" @@ -1788,21 +1820,6 @@ msgstr "SCSI-Adapter" msgid "Please, wait..." msgstr "Bitte warten..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "Vorlage hinzufügen" @@ -1939,6 +1956,9 @@ msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "" "Überbrückt: Virtuelle Maschinen sind direkt mit physischem Netz verbunden" +msgid "(No interfaces found)" +msgstr "Keine Vorlagen gefunden." + msgid "Destination" msgstr "Ziel:" diff --git a/po/en_US.po b/po/en_US.po index b84f28c..2d09719 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -141,6 +141,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "" @@ -355,7 +361,7 @@ msgstr "" msgid "Unable to delete template due error: %(err)s" msgstr "" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "" msgid "Template base image must be a valid local image file" @@ -818,6 +824,12 @@ msgid "" "machine disk" msgstr "" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "" @@ -915,6 +927,11 @@ msgstr "" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -1022,58 +1039,58 @@ msgstr "" msgid "Cancel" msgstr "" -msgid "Start" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Reset" +msgid "Device Type" msgstr "" -msgid "Power Off" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Actions" +msgid "Storage Pool" msgstr "" -msgid "Connect" +msgid "Storage pool which volume located in" msgstr "" -msgid "Edit" +msgid "Storage Volume" msgstr "" -msgid "Shut Down" +msgid "Storage volume to be attached" msgstr "" -msgid "Delete" +msgid "File Path" msgstr "" -msgid "Add a Storage Device to VM" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Device Type" +msgid "Attach" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Start" msgstr "" -msgid "Storage Pool" +msgid "Reset" msgstr "" -msgid "Storage pool which volume located in" +msgid "Power Off" msgstr "" -msgid "Storage Volume" +msgid "Actions" msgstr "" -msgid "Storage volume to be attached" +msgid "Connect" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1549,6 +1566,21 @@ msgstr "" msgid "No" msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "" @@ -1619,21 +1651,6 @@ msgstr "" msgid "Please, wait..." msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "" @@ -1769,6 +1786,9 @@ msgstr "" msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "" +msgid "(No interfaces found)" +msgstr "" + msgid "Destination" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index bd6d7b5..46a3c52 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -161,6 +161,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "La máquina virtual %(name)s ya existe" @@ -397,8 +403,8 @@ msgstr "No se puede crear la plantilla debido a un error: %(err)s" msgid "Unable to delete template due error: %(err)s" msgstr "No se puede suprimir la plantilla debido a un error: %(err)s" -msgid "Disk size must be greater than 1GB." -msgstr "" +msgid "Disk size must be an integer greater than 1GB." +msgstr "El número de CPUs debe ser un entero" msgid "Template base image must be a valid local image file" msgstr "El CDROM de plantilla debe ser un archivo ISO local o remoto" @@ -952,6 +958,12 @@ msgstr "" "Especifique el tipo y la vía de acceso para añadir un disco de máquina " "virtual nuevo" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "El ID de repositorio YUM debe ser una serie de una sola palabra." @@ -1057,6 +1069,11 @@ msgstr "No se puede añadir el repositorio. Detalles: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "No se puede eliminar el repositorio. Detalles: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERROR" @@ -1166,30 +1183,6 @@ msgstr "Desconectar" msgid "Cancel" msgstr "Cancelar" -msgid "Start" -msgstr "Iniciar" - -msgid "Reset" -msgstr "Restablecer" - -msgid "Power Off" -msgstr "" - -msgid "Actions" -msgstr "Acciones" - -msgid "Connect" -msgstr "Conectar" - -msgid "Edit" -msgstr "Editar" - -msgid "Shut Down" -msgstr "Concluir" - -msgid "Delete" -msgstr "Suprimir" - msgid "Add a Storage Device to VM" msgstr "Añadir un dispositivo de almacenamiento a VM" @@ -1220,6 +1213,30 @@ msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." msgid "Attach" msgstr "Conectar" +msgid "Start" +msgstr "Iniciar" + +msgid "Reset" +msgstr "Restablecer" + +msgid "Power Off" +msgstr "" + +msgid "Actions" +msgstr "Acciones" + +msgid "Connect" +msgstr "Conectar" + +msgid "Edit" +msgstr "Editar" + +msgid "Shut Down" +msgstr "Concluir" + +msgid "Delete" +msgstr "Suprimir" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " @@ -1729,6 +1746,21 @@ msgstr "Sí" msgid "No" msgstr "No" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "Definir una agrupación de almacenamiento nueva" @@ -1805,21 +1837,6 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, espere..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "Añadir plantilla" @@ -1958,6 +1975,9 @@ msgstr "" "Puenteado: Las máquinas virtuales están conectadas a la red física " "directamente" +msgid "(No interfaces found)" +msgstr "No se han encontrado plantillas." + msgid "Destination" msgstr "Destino:" diff --git a/po/fr_FR.po b/po/fr_FR.po index ec0cf06..e102114 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2014-08-27 21:30+0000\n" "Last-Translator: BobSynfig\n" "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/" @@ -162,6 +162,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "La machine virtuelle %(name)s existe déjà" @@ -405,7 +411,7 @@ msgstr "Impossible de créer le modèle à cause de l'erreur: %(err)s" msgid "Unable to delete template due error: %(err)s" msgstr "Impossilbe de supprimer le modèle à cause de l'erreur: %(err)s" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "La taille de disque doit être supérieure à 1Go" msgid "Template base image must be a valid local image file" @@ -940,6 +946,12 @@ msgstr "" "Seul un chemin ou pool/volume peut être spécifié pour ajouter un nouveau " "disque de machine virtuelle" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "" "L'ID du dépôt YUM doit être une chaîne de caractères ne comportant qu'un " @@ -1045,6 +1057,11 @@ msgstr "Impossible d'ajouter un dépôt. Détails: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Impossible de supprimer un dépôt. Détails: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "ERROR CODE" @@ -1154,30 +1171,6 @@ msgstr "Détacher" msgid "Cancel" msgstr "Annuler" -msgid "Start" -msgstr "Démarrer" - -msgid "Reset" -msgstr "Réinitialiser" - -msgid "Power Off" -msgstr "Mettre hors tension" - -msgid "Actions" -msgstr "Actions" - -msgid "Connect" -msgstr "Connecter" - -msgid "Edit" -msgstr "Éditer" - -msgid "Shut Down" -msgstr "Éteindre" - -msgid "Delete" -msgstr "Supprimer" - msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" @@ -1209,6 +1202,30 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM." msgid "Attach" msgstr "Attacher" +msgid "Start" +msgstr "Démarrer" + +msgid "Reset" +msgstr "Réinitialiser" + +msgid "Power Off" +msgstr "Mettre hors tension" + +msgid "Actions" +msgstr "Actions" + +msgid "Connect" +msgstr "Connecter" + +msgid "Edit" +msgstr "Éditer" + +msgid "Shut Down" +msgstr "Éteindre" + +msgid "Delete" +msgstr "Supprimer" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " @@ -1722,6 +1739,21 @@ msgstr "Oui" msgid "No" msgstr "Non" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "Définir un Nouveau Pool de Stockage" @@ -1800,21 +1832,6 @@ msgstr "Adaptateur SCSI" msgid "Please, wait..." msgstr "Vauillez patienter..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "Ajouter un Modèle" @@ -1951,6 +1968,9 @@ msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "" "Bridgé: Les macines virtuelles sont connectées directement au réseau physique" +msgid "(No interfaces found)" +msgstr "Aucun modèle trouvé." + msgid "Destination" msgstr "Destination" diff --git a/po/it_IT.po b/po/it_IT.po index ba4234b..8bc1cf8 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -156,6 +156,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "Macchina virtuale %(name)s già esistente" @@ -390,8 +396,8 @@ msgstr "Impossibile creare il modello a causa dell'errore: %(err)s" msgid "Unable to delete template due error: %(err)s" msgstr "Impossibile eliminare il modello a causa dell'errore: %(err)s" -msgid "Disk size must be greater than 1GB." -msgstr "" +msgid "Disk size must be an integer greater than 1GB." +msgstr "Il numero di CPU deve essere un numero intero" msgid "Template base image must be a valid local image file" msgstr "Il CDROM del modello deve essere un file ISO locale o remoto" @@ -918,6 +924,12 @@ msgstr "" "Specificare tipo e percorso per aggiungere un nuovo disco della macchina " "virtuale" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "L'ID repository YUM deve essere una stringa di una sola parola." @@ -1026,6 +1038,11 @@ msgstr "Impossibile aggiungere il repository. Dettagli: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Impossibile rimuovere il repository. Dettagli: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "CODICE DI ERRORE" @@ -1135,30 +1152,6 @@ msgstr "Scollega" msgid "Cancel" msgstr "Annulla" -msgid "Start" -msgstr "Avvia" - -msgid "Reset" -msgstr "Reimposta" - -msgid "Power Off" -msgstr "" - -msgid "Actions" -msgstr "Azioni" - -msgid "Connect" -msgstr "Connetti" - -msgid "Edit" -msgstr "Modifica" - -msgid "Shut Down" -msgstr "Arresta" - -msgid "Delete" -msgstr "Elimina" - msgid "Add a Storage Device to VM" msgstr "Aggiungi un dispositivo di memoria alla VM" @@ -1189,6 +1182,30 @@ msgstr "Il percorso file ISO nel server per CDROM." msgid "Attach" msgstr "Allega" +msgid "Start" +msgstr "Avvia" + +msgid "Reset" +msgstr "Reimposta" + +msgid "Power Off" +msgstr "" + +msgid "Actions" +msgstr "Azioni" + +msgid "Connect" +msgstr "Connetti" + +msgid "Edit" +msgstr "Modifica" + +msgid "Shut Down" +msgstr "Arresta" + +msgid "Delete" +msgstr "Elimina" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " @@ -1696,6 +1713,21 @@ msgstr "Sì" msgid "No" msgstr "No" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "Definisci un nuovo pool di memoria" @@ -1775,21 +1807,6 @@ msgstr "Adattatore SCSI" msgid "Please, wait..." msgstr "Attendere..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "Aggiungi modello" @@ -1926,6 +1943,9 @@ msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "" "Con bridge: le macchine virtuali sono connesse direttamente alla rete fisica" +msgid "(No interfaces found)" +msgstr "Nessun modello trovato." + msgid "Destination" msgstr "Destinazione:" diff --git a/po/ja_JP.po b/po/ja_JP.po index 196f085..0cc892a 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -155,6 +155,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "仮想マシン %(name)s は既に存在します" @@ -395,7 +401,7 @@ msgstr "次のエラーのため、テンプレートを作成できません: % msgid "Unable to delete template due error: %(err)s" msgstr "次のエラーのため、テンプレートを削除できません: %(err)s" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "" msgid "Template base image must be a valid local image file" @@ -929,6 +935,12 @@ msgid "" "machine disk" msgstr "新しい仮想マシン・ディスクに追加するタイプおよびパスを指定します" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "YUM リポジトリー ID は、1 ワードのみのストリングでなければなりません" @@ -1038,6 +1050,11 @@ msgstr "リポジトリーを追加できません。詳細: 「%(err)s」" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "リポジトリーを削除できません。詳細: 「%(err)s」" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "エラー・コード" @@ -1147,30 +1164,6 @@ msgstr "切り離し" msgid "Cancel" msgstr "取消" -msgid "Start" -msgstr "開始" - -msgid "Reset" -msgstr "リセット" - -msgid "Power Off" -msgstr "" - -msgid "Actions" -msgstr "アクション" - -msgid "Connect" -msgstr "接続" - -msgid "Edit" -msgstr "編集" - -msgid "Shut Down" -msgstr "シャットダウン" - -msgid "Delete" -msgstr "削除" - msgid "Add a Storage Device to VM" msgstr "VM にストレージ・デバイスを追加" @@ -1201,6 +1194,30 @@ msgstr "サーバー内での CDROM の ISO ファイル・パス。" msgid "Attach" msgstr "接続" +msgid "Start" +msgstr "開始" + +msgid "Reset" +msgstr "リセット" + +msgid "Power Off" +msgstr "" + +msgid "Actions" +msgstr "アクション" + +msgid "Connect" +msgstr "接続" + +msgid "Edit" +msgstr "編集" + +msgid "Shut Down" +msgstr "シャットダウン" + +msgid "Delete" +msgstr "削除" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" @@ -1697,6 +1714,21 @@ msgstr " はい" msgid "No" msgstr " いいえ" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "新規ストレージ・プールの定義" @@ -1774,21 +1806,6 @@ msgstr "SCSI アダプター" msgid "Please, wait..." msgstr "お待ちください..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "テンプレートの追加" @@ -1924,6 +1941,9 @@ msgstr "NAT: アウトバウンド物理ネットワーク接続のみ" msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "ブリッジ: 仮想マシンが直接物理ネットワークに接続される" +msgid "(No interfaces found)" +msgstr "テンプレートが見つかりません。" + msgid "Destination" msgstr "宛先:" diff --git a/po/kimchi.pot b/po/kimchi.pot index 9c38005..62f64fb 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -141,6 +141,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "" @@ -355,7 +361,7 @@ msgstr "" msgid "Unable to delete template due error: %(err)s" msgstr "" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "" msgid "Template base image must be a valid local image file" @@ -818,6 +824,12 @@ msgid "" "machine disk" msgstr "" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "" @@ -915,6 +927,11 @@ msgstr "" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "" @@ -1022,58 +1039,58 @@ msgstr "" msgid "Cancel" msgstr "" -msgid "Start" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Reset" +msgid "Device Type" msgstr "" -msgid "Power Off" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Actions" +msgid "Storage Pool" msgstr "" -msgid "Connect" +msgid "Storage pool which volume located in" msgstr "" -msgid "Edit" +msgid "Storage Volume" msgstr "" -msgid "Shut Down" +msgid "Storage volume to be attached" msgstr "" -msgid "Delete" +msgid "File Path" msgstr "" -msgid "Add a Storage Device to VM" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Device Type" +msgid "Attach" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Start" msgstr "" -msgid "Storage Pool" +msgid "Reset" msgstr "" -msgid "Storage pool which volume located in" +msgid "Power Off" msgstr "" -msgid "Storage Volume" +msgid "Actions" msgstr "" -msgid "Storage volume to be attached" +msgid "Connect" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1549,6 +1566,21 @@ msgstr "" msgid "No" msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "" @@ -1619,21 +1651,6 @@ msgstr "" msgid "Please, wait..." msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "" @@ -1769,6 +1786,9 @@ msgstr "" msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "" +msgid "(No interfaces found)" +msgstr "" + msgid "Destination" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 8807787..2c845a9 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -150,6 +150,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "가상 머신 %(name)s이(가) 이미 존재합니다." @@ -371,7 +377,7 @@ msgstr "오류 때문에 템플리트를 작성할 수 없음: %(err)s" msgid "Unable to delete template due error: %(err)s" msgstr "오류 때문에 템플리트를 삭제할 수 없음: %(err)s" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "" msgid "Template base image must be a valid local image file" @@ -872,6 +878,12 @@ msgid "" "machine disk" msgstr "새 가상 머신 디스크를 추가할 유형 및 경로를 지정하십시오." +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "YUM 저장소 ID는 단일 단어의 문자열이어야 합니다." @@ -969,6 +981,11 @@ msgstr "저장소를 추가할 수 없습니다. 세부사항: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "저장소를 제거할 수 없습니다. 세부사항: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "오류 코드" @@ -1078,30 +1095,6 @@ msgstr "분리" msgid "Cancel" msgstr "취소" -msgid "Start" -msgstr "시작" - -msgid "Reset" -msgstr "다시 설정" - -msgid "Power Off" -msgstr "" - -msgid "Actions" -msgstr "조치" - -msgid "Connect" -msgstr "연결" - -msgid "Edit" -msgstr "편집" - -msgid "Shut Down" -msgstr "시스템 종료" - -msgid "Delete" -msgstr "삭제" - msgid "Add a Storage Device to VM" msgstr "스토리지 장치를 VM에 추가" @@ -1132,6 +1125,30 @@ msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." msgid "Attach" msgstr "연결" +msgid "Start" +msgstr "시작" + +msgid "Reset" +msgstr "다시 설정" + +msgid "Power Off" +msgstr "" + +msgid "Actions" +msgstr "조치" + +msgid "Connect" +msgstr "연결" + +msgid "Edit" +msgstr "편집" + +msgid "Shut Down" +msgstr "시스템 종료" + +msgid "Delete" +msgstr "삭제" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." @@ -1624,6 +1641,21 @@ msgstr "예" msgid "No" msgstr "아니오" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "새 스토리지 풀 정의" @@ -1697,21 +1729,6 @@ msgstr "SCSI 어댑터" msgid "Please, wait..." msgstr "잠시 기다려 주십시오." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "템플리트 추가" @@ -1847,6 +1864,10 @@ msgstr "NAT: 아웃바운드 물리적 네트워크 연결만" msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "브릿지됨: 가상 머신이 물리적 네트워크에 직접 연결됨" +#, fuzzy +msgid "(No interfaces found)" +msgstr "템플리트가 없습니다." + msgid "Destination" msgstr "대상:" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7761caf..4a02d48 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2014-08-28 20:24+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -170,6 +170,12 @@ msgid "Unable to read image file %(filename)s" msgstr "Não foi possível ler o arquivo de imagem %(filename)s." #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "Máquina virtual %(name)s já existe" @@ -406,7 +412,7 @@ msgstr "Não foi possível criar o modelo devido a um erro: %(err)s" msgid "Unable to delete template due error: %(err)s" msgstr "Não foi possível remover o modelo devido a um erro: %(err)s" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "Tamanho do disco deve ser maior do que 1GB." msgid "Template base image must be a valid local image file" @@ -936,6 +942,12 @@ msgstr "" "Somente um caminho ou pool/volume pode ser especificado para adicionar um " "novo disco da máquina virtual." +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "ID do repositório YUM deve ser apenas uma palavra." @@ -1044,6 +1056,11 @@ msgstr "Não foi possível adicionar o repositório. Detalhes: '%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Não foi possível remover o repositório. Detalhes: '%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "CÓDIGO DE ERRO" @@ -1153,30 +1170,6 @@ msgstr "Remover" msgid "Cancel" msgstr "Cancelar" -msgid "Start" -msgstr "Iniciar" - -msgid "Reset" -msgstr "Reiniciar" - -msgid "Power Off" -msgstr "Forçar desligamento" - -msgid "Actions" -msgstr "Ações" - -msgid "Connect" -msgstr "Conectar" - -msgid "Edit" -msgstr "Editar" - -msgid "Shut Down" -msgstr "Desligar" - -msgid "Delete" -msgstr "Remover" - msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" @@ -1208,6 +1201,30 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor." msgid "Attach" msgstr "Adicionar" +msgid "Start" +msgstr "Iniciar" + +msgid "Reset" +msgstr "Reiniciar" + +msgid "Power Off" +msgstr "Forçar desligamento" + +msgid "Actions" +msgstr "Ações" + +msgid "Connect" +msgstr "Conectar" + +msgid "Edit" +msgstr "Editar" + +msgid "Shut Down" +msgstr "Desligar" + +msgid "Delete" +msgstr "Remover" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." @@ -1721,6 +1738,21 @@ msgstr "Sim" msgid "No" msgstr "Não" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "Definir novo Storage Pool" @@ -1794,21 +1826,6 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, aguarde..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "Adicionar Modelo" @@ -1945,6 +1962,9 @@ msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "" "Bridged: Máquinas virtuais estão conectadas diretamente com a rede física" +msgid "(No interfaces found)" +msgstr "Nenhum modelo encontrado." + msgid "Destination" msgstr "Destino" diff --git a/po/ru_RU.po b/po/ru_RU.po index b02bf5f..45cadca 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2014-08-28 17:32+0000\n" "Last-Translator: Aline Manera <aline.manera(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/" @@ -149,6 +149,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "Виртуальная машина %(name)s уже существует" @@ -369,7 +375,7 @@ msgstr "Не удалось создать шаблон из-за ошибки % msgid "Unable to delete template due error: %(err)s" msgstr "Не удалось удалить шаблон из-за ошибки %(err)s" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "Размер диска должен быть больше 1 Гб." msgid "Template base image must be a valid local image file" @@ -865,6 +871,12 @@ msgid "" "machine disk" msgstr "Укажите тип и путь для добавления нового диска виртуальной машины" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "" "ИД хранилища YUM должен быть строкой, состоящей только из одного слова." @@ -969,6 +981,11 @@ msgstr "Не удалось добавить хранилище. Сведени msgid "Unable to remove repository. Details: '%(err)s'" msgstr "Не удалось удалить хранилище. Сведения: %(err)s" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "Код ошибки" @@ -1078,30 +1095,6 @@ msgstr "Отключить" msgid "Cancel" msgstr "Отмена" -msgid "Start" -msgstr "Запустить" - -msgid "Reset" -msgstr "Сбросить" - -msgid "Power Off" -msgstr "Выключить" - -msgid "Actions" -msgstr "Действия" - -msgid "Connect" -msgstr "Подключить" - -msgid "Edit" -msgstr "Редактировать" - -msgid "Shut Down" -msgstr "Завершить работу" - -msgid "Delete" -msgstr "Удалить" - msgid "Add a Storage Device to VM" msgstr "Добавить устройство хранения в VM" @@ -1132,6 +1125,30 @@ msgstr "Путь к файлу ISO для CDROM на сервере." msgid "Attach" msgstr "Подключить" +msgid "Start" +msgstr "Запустить" + +msgid "Reset" +msgstr "Сбросить" + +msgid "Power Off" +msgstr "Выключить" + +msgid "Actions" +msgstr "Действия" + +msgid "Connect" +msgstr "Подключить" + +msgid "Edit" +msgstr "Редактировать" + +msgid "Shut Down" +msgstr "Завершить работу" + +msgid "Delete" +msgstr "Удалить" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." @@ -1627,6 +1644,21 @@ msgstr "Да" msgid "No" msgstr "Нет" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "Создать пул памяти" @@ -1699,21 +1731,6 @@ msgstr "Адаптер SCSI" msgid "Please, wait..." msgstr "Подождите..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "Добавить шаблон" @@ -1849,6 +1866,9 @@ msgstr "NAT (только исходящее физическое сетевое msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "Через мост (прямое подключение виртуальных машин к физической сети)" +msgid "(No interfaces found)" +msgstr "Не найдены шаблоны." + msgid "Destination" msgstr "Целевое расположение:" diff --git a/po/zh_CN.po b/po/zh_CN.po index 47e1713..68790a5 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-09-24 14:00-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+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" @@ -160,6 +160,12 @@ msgid "Unable to read image file %(filename)s" msgstr "未能读取镜像文件 %(filename)s" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "磁盘文件必须已存在系统中，%(filename)s不是合法文件名" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "虚拟机%(name)s已经存在" @@ -376,7 +382,7 @@ msgstr "创建模板失败。详情：%(err)s" msgid "Unable to delete template due error: %(err)s" msgstr "由于错误：%(err)s，未能删除模板" -msgid "Disk size must be greater than 1GB." +msgid "Disk size must be an integer greater than 1GB." msgstr "磁盘大小必须大于1GB。" msgid "Template base image must be a valid local image file" @@ -841,6 +847,12 @@ msgid "" "machine disk" msgstr "增加虚拟机磁盘时，仅能指定路径或存储池/存储卷中的一个" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "格式为%(format)s的卷不符合存储类型%(type)s" + msgid "YUM Repository ID must be one word only string." msgstr "YUM软件仓库ID必须是只包含一个单词的字符串" @@ -938,6 +950,11 @@ msgstr "不能增加软件仓库。详情：'%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "不能移除软件仓库。详情：'%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "软件仓库不支持配置类型: %(items)s" + msgid "ERROR CODE" msgstr "错误码" @@ -1045,30 +1062,6 @@ msgstr "卸载" msgid "Cancel" msgstr "取消" -msgid "Start" -msgstr "启用" - -msgid "Reset" -msgstr "重置" - -msgid "Power Off" -msgstr "关闭电源" - -msgid "Actions" -msgstr "操作" - -msgid "Connect" -msgstr "连接到" - -msgid "Edit" -msgstr "编辑" - -msgid "Shut Down" -msgstr "关机" - -msgid "Delete" -msgstr "删除" - msgid "Add a Storage Device to VM" msgstr "为虚拟机添加一个存储设备" @@ -1099,6 +1092,30 @@ msgstr "服务器端CDROM所使用的ISO文件路径" msgid "Attach" msgstr "装载" +msgid "Start" +msgstr "启用" + +msgid "Reset" +msgstr "重置" + +msgid "Power Off" +msgstr "关闭电源" + +msgid "Actions" +msgstr "操作" + +msgid "Connect" +msgstr "连接到" + +msgid "Edit" +msgstr "编辑" + +msgid "Shut Down" +msgstr "关机" + +msgid "Delete" +msgstr "删除" + msgid "The username or password you entered is incorrect. Please try again." msgstr "用户名或密码错误，请重新输入。" @@ -1577,6 +1594,21 @@ msgstr "是" msgid "No" msgstr "否" +msgid "Add a Volume to Storage Pool" +msgstr "为存储池添加一个卷" + +msgid "Fetch from remote URL" +msgstr "从远程URL获取" + +msgid "Enter the remote URL here." +msgstr "在这里输入远程URL。" + +msgid "Upload an file" +msgstr "上传一个文件" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" + msgid "Define a New Storage Pool" msgstr "定义一个新的存储池" @@ -1647,21 +1679,6 @@ msgstr "SCSI适配器" msgid "Please, wait..." msgstr "请等待..." -msgid "Add a Volume to Storage Pool" -msgstr "为存储池添加一个卷" - -msgid "Fetch from remote URL" -msgstr "从远程URL获取" - -msgid "Enter the remote URL here." -msgstr "在这里输入远程URL。" - -msgid "Upload an file" -msgstr "上传一个文件" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" - msgid "Add Template" msgstr "创建模板" diff --git a/po/zh_TW.po b/po/zh_TW.po index 7186a52..5a32278 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-25 17:06+0800\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -144,6 +144,12 @@ msgid "Unable to read image file %(filename)s" msgstr "" #, python-format +msgid "" +"Image file must be an existing file on system. %(filename)s is not a valid " +"input." +msgstr "" + +#, python-format msgid "Virtual machine %(name)s already exists" msgstr "虛擬機器 %(name)s 已存在" @@ -358,8 +364,8 @@ msgstr "由於下列錯誤，無法建立範本：%(err)s" msgid "Unable to delete template due error: %(err)s" msgstr "由於下列錯誤，無法刪除範本：%(err)s" -msgid "Disk size must be greater than 1GB." -msgstr "" +msgid "Disk size must be an integer greater than 1GB." +msgstr "硬碟大小必須是大于1GB的整數" msgid "Template base image must be a valid local image file" msgstr "範本 CDROM 必須是本端或遠端 ISO 檔案" @@ -821,6 +827,12 @@ msgid "" "machine disk" msgstr "指定類型和路徑以新增虛擬機器磁碟" +#, python-format +msgid "" +"Volume chosen with format %(format)s does not fit in the storage type " +"%(type)s" +msgstr "" + msgid "YUM Repository ID must be one word only string." msgstr "YUM 儲存庫 ID 必須是僅限一個單字的字串。" @@ -918,6 +930,11 @@ msgstr "無法新增儲存庫。詳細資料：'%(err)s'" msgid "Unable to remove repository. Details: '%(err)s'" msgstr "無法移除儲存庫。詳細資料：'%(err)s'" +#, python-format +msgid "" +"Configuration items: '%(items)s' are not supported by repository manager" +msgstr "" + msgid "ERROR CODE" msgstr "錯誤碼" @@ -1025,30 +1042,6 @@ msgstr "分離" msgid "Cancel" msgstr "取消 " -msgid "Start" -msgstr "開始" - -msgid "Reset" -msgstr "重設" - -msgid "Power Off" -msgstr "" - -msgid "Actions" -msgstr "動作" - -msgid "Connect" -msgstr "連接" - -msgid "Edit" -msgstr "編輯" - -msgid "Shut Down" -msgstr "關閉" - -msgid "Delete" -msgstr "刪除" - msgid "Add a Storage Device to VM" msgstr "將儲存裝置新增至 VM" @@ -1079,6 +1072,30 @@ msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" msgid "Attach" msgstr "連接" +msgid "Start" +msgstr "開始" + +msgid "Reset" +msgstr "重設" + +msgid "Power Off" +msgstr "" + +msgid "Actions" +msgstr "動作" + +msgid "Connect" +msgstr "連接" + +msgid "Edit" +msgstr "編輯" + +msgid "Shut Down" +msgstr "關閉" + +msgid "Delete" +msgstr "刪除" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" @@ -1563,6 +1580,21 @@ msgstr "是" msgid "No" msgstr "否" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload an file" +msgstr "" + +msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgstr "" + msgid "Define a New Storage Pool" msgstr "定義新的儲存區" @@ -1633,21 +1665,6 @@ msgstr "SCSI 配接卡" msgid "Please, wait..." msgstr "請稍候..." -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload an file" -msgstr "" - -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" - msgid "Add Template" msgstr "新增範本" @@ -1783,6 +1800,9 @@ msgstr "NAT：僅限出埠實體網路連線" msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "已橋接：虛擬機器直接已連接至實體網路" +msgid "(No interfaces found)" +msgstr "找不到範本。" + msgid "Destination" msgstr "目的地：" -- 1.8.3.2

4 3

[PATCH] Fix: accelerate mockmodel for file upload
by lvroyce＠linux.vnet.ibm.com 26 Sep '14

26 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> File upload fails with error 404 because of small read is time consuming, change read size and wait in test to guarentee storage volume created when query URI. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 2 +- tests/test_rest.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index ab4357d..cbbdba3 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -534,7 +534,7 @@ class MockModel(object): size = 0 try: while True: - data = upload_file.file.read(8192) + data = upload_file.file.read(8192*32) if not data: break size += len(data) diff --git a/tests/test_rest.py b/tests/test_rest.py index 7eb6233..fa44985 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -1948,8 +1948,10 @@ class RestTests(unittest.TestCase): self.assertEquals(r.status_code, 202) task = r.json() self._wait_task(task['id']) + time.sleep(5) resp = self.request('/storagepools/default/storagevolumes/%s' % task['target_uri'].split('/')[-1]) + self.assertEquals(200, resp.status) # Create a file with 5M to upload -- 1.8.3.2

3 2

[PATCH V2] Bugfix: Cancel option not working properly in New Storage Define
by Wen Wang 26 Sep '14

26 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: Make the "Create" button change style and disable the input box only when clicked on "ok" in "confirm" diaguage. The button and the input style stay the same if user cancel the creating job. This bug fix the defect that when adding a new logical storage pool, a confrim message box show up and when canceling it, the inputbox as well as button "Create" is still disabled. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 4f1f943..c167acd 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -352,8 +352,6 @@ kimchi.validateLogicalForm = function () { kimchi.addPool = function(event) { if (kimchi.validateForm()) { - $('#pool-doAdd').hide(); - $('#pool-loading').show(); var formData = $('#form-pool-add').serializeObject(); delete formData.authname; var poolType = $('#poolTypeId').selectMenu('value'); @@ -390,7 +388,6 @@ kimchi.addPool = function(event) { } else if (poolType === 'scsi'){ formData.source = { adapter_name: $('#scsiAdapter').selectMenu('value') }; } - $('input', '#form-pool-add').attr('disabled','disabled'); if (poolType === 'logical') { var settings = { title : i18n['KCHAPI6001M'], @@ -399,6 +396,9 @@ kimchi.addPool = function(event) { cancel : i18n['KCHAPI6003M'] }; kimchi.confirm(settings, function() { + $('input', '#form-pool-add').attr('disabled','disabled'); + $('#pool-loading').show(); + $('#pool-doAdd').hide(); kimchi.createStoragePool(formData, function() { kimchi.doListStoragePools(); kimchi.window.close(); -- 1.7.1

2 2

Kimchi 1.3 is released!
by Aline Manera 25 Sep '14

25 Sep '14

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of *Kimchi 1.3*! This release adds many new features including: ✔ Guest access based on users and groups ✔ Discovery of other Kimchi servers on the same network ✔ Check README-federation for more details ✔ Template based on image files ✔ iSCSI pool: Discover available iSCSI targets given an iSCSI server ✔ Debug report renaming ✔ Download file to storage pool ✔ Partial translation for the following languages:: ✔ Traditional Chinese ✔ Russian ✔ Korean ✔ Japanese ✔ Italian ✔ French ✔ Spanish ✔ German We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 20, Ubuntu 14.04, openSUSE 13.1, RHEL 6.5 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.3.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

[PATCH V2] issue #447: Check download URL prior to start Task
by Aline Manera 25 Sep '14

25 Sep '14

When user provides an invalid donwload URL, the error message "Unexpected exception" was displayed without any more information. On Kimchi logs, there is: Error in async_task 1 Traceback (most recent call last): File "/home/alinefm/kimchi/src/kimchi/asynctask.py", line 72, in _run_helper self.fn(cb, opaque) File "/home/alinefm/kimchi/src/kimchi/model/storagevolumes.py", line 192, in _create_volume_with_url with contextlib.closing(urllib2.urlopen(url)) as response: File "/usr/lib64/python2.7/urllib2.py", line 127, in urlopen return _opener.open(url, data, timeout) File "/usr/lib64/python2.7/urllib2.py", line 404, in open response = self._open(req, data) File "/usr/lib64/python2.7/urllib2.py", line 422, in _open '_open', req) File "/usr/lib64/python2.7/urllib2.py", line 382, in _call_chain result = func(*args) File "/usr/lib64/python2.7/urllib2.py", line 1224, in https_open return self.do_open(httplib.HTTPSConnection, req) File "/usr/lib64/python2.7/urllib2.py", line 1186, in do_open raise URLError(err) URLError: <urlopen error [Errno -2] Name or service not known> It is because the download URL was not being checked prior to start the Task and this case was not checked on Task handler. To solver it, check if the download URL is accessible prior to start the Task so user can change it accordingly. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/storagevolumes.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 4466d23..d402dde 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -190,6 +190,7 @@ messages = { "KCHVOL0019E": _("Create volume from %(param)s is not supported"), "KCHVOL0020E": _("Storage volume capacity must be an integer number."), "KCHVOL0021E": _("Storage volume URL must be http://, https://, ftp:// or ftps://."), + "KCHVOL0022E": _("Unable to access file %(url)s. Please, check it."), "KCHIFACE0001E": _("Interface %(name)s does not exist"), diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index ac6887a..cc61e68 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -67,6 +67,14 @@ class StorageVolumesModel(object): create_param = vol_source[index_list[0]] + # Verify if the URL is valid + if create_param == 'url': + url = params['url'] + try: + urllib2.urlopen(url).close() + except: + raise InvalidParameter('KCHVOL0022E', {'url': url}) + if name is None: # the methods listed in 'REQUIRE_NAME_PARAMS' cannot have # 'name' == None -- 1.9.3

2 2

[PATCH] issue #447: Check download URL prior to start Task
by Aline Manera 25 Sep '14

25 Sep '14

When user provides an invalid donwload URL, the error message "Unexpected exception" was displayed without any more information. On Kimchi logs, there is: Error in async_task 1 Traceback (most recent call last): File "/home/alinefm/kimchi/src/kimchi/asynctask.py", line 72, in _run_helper self.fn(cb, opaque) File "/home/alinefm/kimchi/src/kimchi/model/storagevolumes.py", line 192, in _create_volume_with_url with contextlib.closing(urllib2.urlopen(url)) as response: File "/usr/lib64/python2.7/urllib2.py", line 127, in urlopen return _opener.open(url, data, timeout) File "/usr/lib64/python2.7/urllib2.py", line 404, in open response = self._open(req, data) File "/usr/lib64/python2.7/urllib2.py", line 422, in _open '_open', req) File "/usr/lib64/python2.7/urllib2.py", line 382, in _call_chain result = func(*args) File "/usr/lib64/python2.7/urllib2.py", line 1224, in https_open return self.do_open(httplib.HTTPSConnection, req) File "/usr/lib64/python2.7/urllib2.py", line 1186, in do_open raise URLError(err) URLError: <urlopen error [Errno -2] Name or service not known> It is because the download URL was not being checked prior to start the Task and this case was not checked on Task handler. To solver it, check if the download URL is accessible prior to start the Task so user can change it accordingly. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/storagevolumes.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 635d6b9..67dfc11 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -190,6 +190,7 @@ messages = { "KCHVOL0019E": _("Create volume from %(param)s is not supported"), "KCHVOL0020E": _("Storage volume capacity must be an integer number."), "KCHVOL0021E": _("Storage volume URL must be http://, https://, ftp:// or ftps://."), + "KCHVOL0022E": _("Unable to access file %(url)s. Please, check it."), "KCHIFACE0001E": _("Interface %(name)s does not exist"), diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index ac6887a..58730ea 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -67,6 +67,14 @@ class StorageVolumesModel(object): create_param = vol_source[index_list[0]] + # Verify if the URL is valid + if create_param == 'url': + url = params['url'] + try: + urllib2.urlopen(url) + except: + raise InvalidParameter('KCHVOL0022E', {'url': url}) + if name is None: # the methods listed in 'REQUIRE_NAME_PARAMS' cannot have # 'name' == None -- 1.9.3

2 2

[PATCH] Update distros.d files to point to a valid URL
by Aline Manera 25 Sep '14

25 Sep '14

Gentoo and Debian JSON files had entried with invalid URLs which was preventing them to be displayed on Kimchi. Also add a valid entry for OpenSUSE 13.1 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/distros.d/debian.json | 4 ++-- src/distros.d/gentoo.json | 6 +++--- src/distros.d/opensuse.json | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/distros.d/debian.json b/src/distros.d/debian.json index 17111c0..60bdf41 100644 --- a/src/distros.d/debian.json +++ b/src/distros.d/debian.json @@ -3,7 +3,7 @@ "name": "debian-Wheezy", "os_distro": "debian", "os_arch": "x86_64", - "os_version": "7.4.0", - "path": "http://ftp.acc.umu.se/debian-cd/7.4.0-live/amd64/iso-hybrid/debian-live-7.4…" + "os_version": "7.6.0", + "path": "http://ftp.acc.umu.se/debian-cd/7.6.0-live/amd64/iso-hybrid/debian-live-7.6…" } ] diff --git a/src/distros.d/gentoo.json b/src/distros.d/gentoo.json index 2f9a669..1c398e8 100644 --- a/src/distros.d/gentoo.json +++ b/src/distros.d/gentoo.json @@ -1,9 +1,9 @@ [ { - "name": "gentoo-20140227", + "name": "gentoo-20140904", "os_distro": "gentoo", "os_arch": "x86_64", - "os_version": "20140227", - "path": "http://distfiles.gentoo.org/releases/amd64/autobuilds/current-iso/install-a…" + "os_version": "20140904", + "path": "http://distfiles.gentoo.org/releases/amd64/autobuilds/current-iso/install-a…" } ] diff --git a/src/distros.d/opensuse.json b/src/distros.d/opensuse.json index 315cf78..ad80c50 100644 --- a/src/distros.d/opensuse.json +++ b/src/distros.d/opensuse.json @@ -5,5 +5,12 @@ "os_arch": "x86_64", "os_version": "12.3", "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/12.3/iso/openSUSE-12.…" + }, + { + "name": "opensuse-13.1", + "os_distro": "opensuse", + "os_arch": "x86_64", + "os_version": "13.1", + "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/13.1/iso/openSUSE-13.…" } ] -- 1.9.3

2 2

[PATCH] issue #454: Properly display storage volumes in a pool with sub-directories
by Aline Manera 25 Sep '14

25 Sep '14

Kimchi controller allows filterting the resources according to their parameters, but the filter data type may vary: string, list, regex. When using re.match() to valid the regex we need to make sure the value is a string, otherwise we will face the error: File "/usr/lib64/python2.6/re.py", line 137, in match return _compile(pattern, flags).match(string) File "/usr/lib64/python2.6/re.py", line 232, in _compile p = _cache.get(cachekey) TypeError: unhashable type: 'list' Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 2e0816f..1eb10bd 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -277,7 +277,7 @@ class Collection(object): if all(key in res.data and (res.data[key] == val or res.data[key] in val or - re.match(val, res.data[key])) + re.match(str(val), res.data[key])) for key, val in fields_filter.iteritems()): data.append(res.data) return data -- 1.9.3

3 3

[PATCHv2 1/2] Fix: filter unsupported source type from volume list
by lvroyce0210＠gmail.com 25 Sep '14

25 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> For disk attachment, isos should not be listed, and cdrom should just accept isos. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..ca7f7cf 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -33,11 +33,12 @@ kimchi.guest_storage_add_main = function() { var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); var volTextbox = $('input[name="vol"]', storageAddForm); + var selectType = $(typeTextbox).val(); typeTextbox.change(function() { $('#guest-storage-bus').selectMenu(); var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'} - var selectType = $(this).val(); + selectType = $(this).val(); $.each(pathObject, function(type, value) { if(selectType == type){ $(value).removeClass('hidden'); @@ -75,11 +76,12 @@ kimchi.guest_storage_add_main = function() { poolTextbox.change(function() { var options = []; kimchi.listStorageVolumes($(this).val(), function(result) { + var validVolType = { cdrom: /iso/, disk: /^(raw|qcow|qcow2|bochs|qed|vmdk)$/}; $('#guest-disk').selectMenu(); if (result.length) { $.each(result, function(index, value) { // Only unused volume can be attached - if (value.ref_cnt == 0) { + if ((value.ref_cnt == 0) && (validVolType[selectType].test(value.format))) { options.push({ label: value.name, value: value.name -- 1.8.3.2

2 2

[PATCH] issue #433: Fix repository tests
by Crístian Viana 25 Sep '14

25 Sep '14

Commit 2696052 has introduced bugs in the tests which could only be reproducible when running on Ubuntu. Fix the tests by using correct "fake" repositories values and validating URLs even when updating repositories. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 2 ++ tests/test_model.py | 18 +++++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 676b7c2..1d19fb7 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -489,6 +489,8 @@ class AptRepo(object): 'config': {'type': 'deb', 'dist': r.dist, 'comps': r.comps}} + validate_repo_url(info['baseurl']) + if 'config' in params.keys(): config = params['config'] info['config']['dist'] = config.get('dist', r.dist) diff --git a/tests/test_model.py b/tests/test_model.py index ceedc6f..b03b6aa 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1290,9 +1290,9 @@ class ModelTests(unittest.TestCase): {'mirrorlist': 'http://www.fedoraproject.org', 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}}] - deb_repos = [{'baseurl': 'http://br.archive.ubuntu.com/kimchi/fake', + deb_repos = [{'baseurl': 'http://archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}}, - {'baseurl': 'http://br.archive.kimchi.com/ubuntu/fake', + {'baseurl': 'http://archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal', 'comps': ['main']}}] repo_type = inst.capabilities_lookup()['repo_mngt_tool'] @@ -1320,6 +1320,7 @@ class ModelTests(unittest.TestCase): # create repositories with invalid mirrorlist for url in invalid_urls: repo = {'repo_id': 'repo_fake', + 'baseurl': url, 'config': {'mirrorlist': url, 'dist': 'quantal'}} self.assertRaises(InvalidParameter, inst.repositories_create, repo) @@ -1360,9 +1361,10 @@ class ModelTests(unittest.TestCase): 'baseurl': 'http://www.fedora.org'} yum_new_repo = {'baseurl': 'http://www.fedoraproject.org'} - deb_repo = {'baseurl': 'http://br.archive.ubuntu.com/kimchi/fake', + deb_repo = {'baseurl': 'http://archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}} - deb_new_repo = {'baseurl': 'http://archive.canonical.com/kimchi'} + deb_new_repo = {'baseurl': 'http://br.archive.canonical.com/ubuntu/', + 'config': {'dist': 'utopic'}} repo_type = inst.capabilities_lookup()['repo_mngt_tool'] if repo_type == 'yum': @@ -1393,12 +1395,6 @@ class ModelTests(unittest.TestCase): self.assertRaises(InvalidParameter, inst.repository_update, repo_id, wrong_repo) - # update repositories with invalid mirrorlist - for url in invalid_urls: - wrong_repo = {'config': {'mirrorlist': url}} - self.assertRaises(InvalidParameter, inst.repository_update, - repo_id, wrong_repo) - new_repo_id = inst.repository_update(repo_id, new_repo) repo_info = inst.repository_lookup(new_repo_id) @@ -1415,7 +1411,7 @@ class ModelTests(unittest.TestCase): yum_repo = {'repo_id': 'fedora-fake', 'baseurl': 'http://www.fedora.org'} - deb_repo = {'baseurl': 'http://br.archive.ubuntu.com/kimchi/fake', + deb_repo = {'baseurl': 'http://archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}} repo_type = inst.capabilities_lookup()['repo_mngt_tool'] -- 1.9.3

3 3

[PATCHv4 0/2] Repository related fixes
by lvroyce＠linux.vnet.ibm.com 25 Sep '14

25 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (2): Fix: Avoid passing unexpected config params to repository manager Fix: Add rollback to update repository src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 40 +++++++++++++++++++++++++--------------- tests/test_model.py | 10 ++++++++-- 4 files changed, 35 insertions(+), 18 deletions(-) -- 1.8.3.2

1 2

[PATCHv3 0/2] Repository related fixes
by lvroyce＠linux.vnet.ibm.com 25 Sep '14

25 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (2): Fix: Avoid passing unexpected config params to repository manager Fix: Add rollback to update repository src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 40 +++++++++++++++++++++++++--------------- tests/test_model.py | 10 ++++++++-- 4 files changed, 35 insertions(+), 18 deletions(-) -- 1.8.3.2

1 2

[PATCH] Bugfix: Cancel option not working properly in New Storage Define
by Wen Wang 25 Sep '14

25 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This bug fix the defect that when adding a new logical storage pool, a confrim message box show up and when canceling it, the inputbox as well as button "Create" is still disabled. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 4f1f943..d926ad7 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -409,6 +409,9 @@ kimchi.addPool = function(event) { $('#pool-doAdd').show(); }); }, function() { + $('input', '#form-pool-add').removeAttr('disabled'); + $('#pool-loading').hide(); + $('#pool-doAdd').show(); }); } else { kimchi.createStoragePool(formData, function() { -- 1.7.1

4 6

[PATCHv2 0/3] Fix repository related testcases
by lvroyce＠linux.vnet.ibm.com 25 Sep '14

25 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Repository update remove valid repo but when add fails did not add back. And url need to check so fake ones will result error. repository config params need to be check. Royce Lv (3): Fix: Avoid passing unexpected config params to repository manager issue#433: Fix fake url for repository test Fix: Add rollback to update repository docs/API.md | 2 ++ src/kimchi/API.json | 12 ++++++++++- src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 52 +++++++++++++++++++++++++++++----------------- tests/test_model.py | 41 ++++++++++++++++++++++++------------ 5 files changed, 75 insertions(+), 33 deletions(-) -- 1.8.3.2

3 8

No problem to input Chinese in guest OS, need to install Chinese Input Software and switch to Chinese Input
by Yu Xin Huo 25 Sep '14

25 Sep '14

1 0

[PATCH] Fix: filter unsupported source type from volume list
by lvroyce＠linux.vnet.ibm.com 25 Sep '14

25 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> For disk attachment, isos should not be listed, and cdrom should just accept isos. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..ca7f7cf 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -33,11 +33,12 @@ kimchi.guest_storage_add_main = function() { var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); var volTextbox = $('input[name="vol"]', storageAddForm); + var selectType = $(typeTextbox).val(); typeTextbox.change(function() { $('#guest-storage-bus').selectMenu(); var pathObject = {'cdrom': ".path-section", 'disk': '.volume-section'} - var selectType = $(this).val(); + selectType = $(this).val(); $.each(pathObject, function(type, value) { if(selectType == type){ $(value).removeClass('hidden'); @@ -75,11 +76,12 @@ kimchi.guest_storage_add_main = function() { poolTextbox.change(function() { var options = []; kimchi.listStorageVolumes($(this).val(), function(result) { + var validVolType = { cdrom: /iso/, disk: /^(raw|qcow|qcow2|bochs|qed|vmdk)$/}; $('#guest-disk').selectMenu(); if (result.length) { $.each(result, function(index, value) { // Only unused volume can be attached - if (value.ref_cnt == 0) { + if ((value.ref_cnt == 0) && (validVolType[selectType].test(value.format))) { options.push({ label: value.name, value: value.name -- 1.8.3.2

3 5

[PATCH] issue #445: Request /peers on every click
by Aline Manera 25 Sep '14

25 Sep '14

The peers information was only request after login. But as the information can change during the login time, it is better to request it on every menu selection. Also fix some typos: drowdown to dropdown. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/theme-default/topbar.css | 4 ++-- ui/js/src/kimchi.main.js | 49 +++++++++++++++++++++++++++++------------ ui/pages/kimchi-ui.html.tmpl | 6 ++--- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index 127c56a..d21fc50 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -194,7 +194,7 @@ a#btn-logout:hover { width: 0; } -.peers .drowdown { +.peers .dropdown { top: 45px; right: 110px; color: black; @@ -204,7 +204,7 @@ a#btn-logout:hover { width: inherit; } -.peers .drowdown a { +.peers .dropdown a { display: block; padding: 10px; } diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index a3305e9..a8ae42a 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -20,24 +20,13 @@ kimchi.tabMode = {}; kimchi.capabilities = undefined; kimchi.getCapabilities(function(result) { kimchi.capabilities = result; - kimchi.setupPeers(); + + if(kimchi.capabilities.federation=="on") + $('#peers').removeClass('hide-content'); }, function() { kimchi.capabilities = {}; }); -kimchi.setupPeers = function(){ - if(kimchi.capabilities.federation=="on"){ - $('#peers').removeClass('hide-content'); - kimchi.getPeers(function(data){ - var hints = $('p', $('.drowdown', '#peers')); - data.length==0 ? hints.toggleClass('hide-content'): hints.addClass('hide-content'); - for(var i=0; i<data.length; i++){ - $('.drowdown', '#peers').append("<a href='"+data[i]+"' target='_blank'>"+data[i]+"</a>"); - } - }); - } -}; - kimchi.main = function() { kimchi.isLoggingOut = false; kimchi.popable(); @@ -220,7 +209,11 @@ kimchi.main = function() { * 2) hashchange event * 3) Tab list click event * 4) Log-out button click event + * 5) About button click event + * 6) Help button click event + * 7) Peers button click event */ + var searchingPeers = false; var initListeners = function() { kimchi.topic('languageChanged').subscribe(onLanguageChanged); kimchi.topic('redirect').subscribe(onKimchiRedirect); @@ -260,12 +253,40 @@ kimchi.main = function() { kimchi.message.error(err.responseJSON.reason); }); }); + + // Set handler for about button $('#btn-about').on('click', function(event) { kimchi.window.open({"content": $('#about-tmpl').html()}); event.preventDefault(); }); + // Set handler for help button $('#btn-help').on('click', kimchi.getHelp); + + // Set handler to peers drop down + $('#peers').on('click', function() { + + // Check if any request is in progress + if ($('.popover', '#peers').is(':visible') || searchingPeers == true) + return + + $('#search-peers').show(); + $('#no-peers').addClass('hide-content'); + $('a', '#peers').remove(); + + searchingPeers = true; + + kimchi.getPeers(function(data){ + $('#search-peers').hide(); + if (data.length == 0) + $('#no-peers').removeClass('hide-content'); + + for(var i=0; i<data.length; i++){ + $('.dropdown', '#peers').append("<a href='"+data[i]+"' target='_blank'>"+data[i]+"</a>"); + } + searchingPeers = false; + }); + }); }; var initUI = function() { diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 867ee36..aee3c4a 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -74,9 +74,9 @@ <div id="peers" class="peers hide-content popable"> <span>$_("Peers")</span> <span class="arrow"></span> - <div class="drowdown popover right-side"> - <p>$_("Searching")...</p> - <p class="hide-content">$_("No peers found.")</p> + <div class="dropdown popover right-side"> + <p id="search-peers">$_("Searching")...</p> + <p id="no-peers" class="hide-content">$_("No peers found.")</p> </div> </div> </li> -- 1.9.3

2 2

[PATCH] issue #462: Do not allow user to enter non-integer template disk size
by Crístian Viana 25 Sep '14

25 Sep '14

If the user enters a non-integer template disk size (e.g. 10.5), guests created with that template fail to start. In order to simplify the user experience, all numeric values are supposed to be consistent. Currently, all numeric values (except the template disk size) are integer numbers, so it's more consistent for the user to use integer numbers here as well. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index f262e1c..5b752dc 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -585,7 +585,7 @@ }, "size": { "description": "Size (GB) of the disk", - "type": "number", + "type": "integer", "minimum": 1, "error": "KCHTMPL0022E" } diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 8315d1d..635d6b9 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -128,7 +128,7 @@ messages = { "KCHTMPL0019E": _("The volume %(volume)s is not in storage pool %(pool)s"), "KCHTMPL0020E": _("Unable to create template due error: %(err)s"), "KCHTMPL0021E": _("Unable to delete template due error: %(err)s"), - "KCHTMPL0022E": _("Disk size must be greater than 1GB."), + "KCHTMPL0022E": _("Disk size must be an integer greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), -- 1.9.3

2 1

[PATCH] build: Add README-federation.md to Kimchi package
by Aline Manera 25 Sep '14

25 Sep '14

README-federation.md guides user on how to enable federation feature on Kimchi so it needs to be installed too. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/Makefile.am | 1 + 3 files changed, 3 insertions(+) diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index bd1f04d..4327376 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -161,6 +161,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/plugins/*.py* %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md +%{_datadir}/kimchi/doc/README-federation.md %{_datadir}/kimchi/doc/kimchi-guest.png %{_datadir}/kimchi/doc/kimchi-templates.png %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index d0bf317..4386d2d 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -82,6 +82,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/plugins/*.py* %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md +%{_datadir}/kimchi/doc/README-federation.md %{_datadir}/kimchi/doc/kimchi-guest.png %{_datadir}/kimchi/doc/kimchi-templates.png %{_prefix}/share/locale/*/LC_MESSAGES/kimchi.mo diff --git a/docs/Makefile.am b/docs/Makefile.am index f195cbc..679aa18 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -22,6 +22,7 @@ docdir = $(datadir)/kimchi/doc dist_doc_DATA = \ API.md \ README.md \ + README-federation.md \ kimchi-guest.png \ kimchi-templates.png \ $(NULL) -- 1.9.3

2 2

[PATCH] issue #447: Remove downloaded volume if an error occurs
by Crístian Viana 25 Sep '14

25 Sep '14

If a storage volume is being downloaded by Kimchi and an error occurs (e.g. timeout, network down, no available disk space), whatever has been downloaded so far is kept on the storage pool. Remove the partially downloaded storage volume if an error occurs during the operation. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index f9f226f..ac6887a 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -204,6 +204,8 @@ class StorageVolumesModel(object): downloaded_size += len(chunk_data) cb('%s/%s' % (downloaded_size, remote_size)) except Exception, e: + if os.path.isfile(file_path): + os.remove(file_path) raise OperationFailed('KCHVOL0007E', {'name': name, 'pool': pool_name, 'err': e.message}) -- 1.9.3

2 1

[PATCH] issue #432: Display unique values for iSCSI targets
by Aline Manera 25 Sep '14

25 Sep '14

When creating a iSCSI pool, the iSCSI targets were listed twice on openSUSE systems as returned by iscsiadm. opensuse-vm:~ # iscsiadm -m discovery -t sendtargets -p localhost [::1]:3260,1 iqn.2014-09.mydomain:alinefm [fe80::5054:ff:fe29:5551]:3260,1 iqn.2014-09.mydomain:alinefm To avoid confusion, display unique values. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/storagetargets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/storagetargets.py b/src/kimchi/model/storagetargets.py index dd72814..30717fd 100644 --- a/src/kimchi/model/storagetargets.py +++ b/src/kimchi/model/storagetargets.py @@ -83,7 +83,7 @@ class StorageTargetsModel(object): # Filter target_list to not not show the used paths target_list = [elem for elem in target_list if elem.get('target') not in used_paths] - return target_list + return [dict(t) for t in set(tuple(t.items()) for t in target_list)] def _get_storage_server_spec(self, **kwargs): # Required parameters: -- 1.9.3

2 2

[PATCH] Update Chinese transtation to po
by Wen Wang 25 Sep '14

25 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: Translation improved Update the Chinese translation support Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 199 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 101 insertions(+), 98 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 29a615b..30d825f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 14:11-0300\n" +"POT-Creation-Date: 2014-09-23 14:42+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" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -35,7 +35,7 @@ msgstr "" #, python-format msgid "Unknown parameter %(value)s" -msgstr "" +msgstr "未知变量 %(value)s" #, python-format msgid "Delete is not allowed for %(resource)s" @@ -64,7 +64,7 @@ msgid "Parameters does not match requirement in schema: %(err)s" msgstr "参数不符合要求的格式：%(err)s" msgid "You don't have permission to perform this operation." -msgstr "" +msgstr "您没有权限执行这项操作。" msgid "Datastore is not initiated in the model object." msgstr "尚未为model对象初始化数据存储。" @@ -111,7 +111,7 @@ msgstr "无法登录iSCSI主机%(host)s上的目标%(target)s。" #, python-format msgid "Unable to find ISO file %(filename)s" -msgstr "" +msgstr "未能找到ISO文件 %(filename)s" #, python-format msgid "The ISO file %(filename)s is not bootable" @@ -141,8 +141,8 @@ msgstr "ISO文件%(filename)s的卷描述符格式错误" msgid "" "The hypervisor doesn't have permission to use this ISO %(filename)s. " "Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " +"file access control lists for '%(user)s' user if possible, or add the '%" +"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" "hypervisor没有访问ISO文件%(filename)s的权限。可以将ISO移到/var/lib/libvirt目" @@ -150,14 +150,14 @@ msgstr "" "或者为所有的用户增加访问权限 'chmod -R o+x '（不推荐）。详情：%(err)s" msgid "An error occurred when probing image OS information." -msgstr "" +msgstr "搜索镜像操作系统信息时发生错误。" msgid "No OS information found in given image." -msgstr "" +msgstr "在指定的镜像文件中未发现操作系统信息。" #, python-format msgid "Unable to read image file %(filename)s" -msgstr "" +msgstr "未能读取镜像文件 %(filename)s" #, python-format msgid "Virtual machine %(name)s already exists" @@ -172,6 +172,8 @@ msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s is already " "in use or the virtual machine is not powered off." msgstr "" +"未能实现虚拟机 %(name)s 重命名，名称 %(new_name)s 已被使用或者该虚拟机未关" +"机。" #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" @@ -182,7 +184,7 @@ msgstr "该服务器不支持远程ISO镜像。" #, python-format msgid "Screenshot is not supported on virtual machine %(name)s" -msgstr "" +msgstr "虚拟机 %(name)s 不支持快照" #, python-format msgid "Unable to create virtual machine %(name)s. Details: %(err)s" @@ -198,21 +200,21 @@ msgstr "不能获取虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to connect to powered off virtual machine %(name)s." -msgstr "" +msgstr "虚拟机%(name)s已关机，连接失败。" msgid "Virtual machine name must be a string" msgstr "虚拟机名字必须是个字符串" #, python-format msgid "Invalid template URI %(value)s specified for virtual machine" -msgstr "" +msgstr "无效的虚拟机模板URI %(value)s" #, python-format msgid "Invalid storage pool URI %(value)s specified for virtual machine" -msgstr "" +msgstr "无效的虚拟机存储池URI %(value)s" msgid "Supported virtual machine graphics are Spice or VNC" -msgstr "" +msgstr "虚拟机图形界面仅支持Spice以及VNC" msgid "Graphics address to listen on must be IPv4 or IPv6" msgstr "远程图形访问的监听地址必须是IPv4或IPv6地址。" @@ -237,13 +239,13 @@ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s" msgstr "未能重置虚拟机%(name)s。详情：%(err)s" msgid "User name list must be an array" -msgstr "" +msgstr "用户名列表必须为一个数组" msgid "User name must be a string" msgstr "用户名必须是一个字符串" msgid "Group name list must be an array" -msgstr "" +msgstr "组名称列表必须为一个数组" msgid "Group name must be a string" msgstr "用户组名称必须是一个字符串" @@ -266,10 +268,10 @@ msgid "" msgstr "无法获得虚拟机 %(name)s的元数据，详情：%(err)s" msgid "The guest console password must be a string." -msgstr "" +msgstr "客户机控制台密码必须为一个字符串。" msgid "The life time for the guest console password must be a number." -msgstr "" +msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -354,17 +356,17 @@ msgid "Invalid storage pool URI %(value)s specified for template" msgstr "给模板指定了无效的存储池URI %(value)s" msgid "Specify an ISO image as CDROM or a base image to create a template" -msgstr "" +msgstr "指定一个ISO镜像作为创建模板的CDROM或者基础镜像" msgid "All networks for the template must be specified in a list." msgstr "为模板指定的网络必须在一个列表中" msgid "Specify a volume to a template when storage pool is iSCSI or SCSI" -msgstr "" +msgstr "当存储池类型为iSCSI或者SCSI的时候须为模板指定一个卷" #, python-format msgid "The volume %(volume)s is not in storage pool %(pool)s" -msgstr "" +msgstr "卷%(volume)s不在存储池%(pool)s中" #, python-format msgid "Unable to create template due error: %(err)s" @@ -378,11 +380,11 @@ msgid "Disk size must be greater than 1GB." msgstr "磁盘大小必须大于1GB。" msgid "Template base image must be a valid local image file" -msgstr "" +msgstr "模板基础镜像必须为一个有效的本地镜像文件" #, python-format msgid "Cannot identify base image %(path)s format" -msgstr "" +msgstr "未能识别基础镜像%(path)s格式" #, python-format msgid "Storage pool %(name)s already exists" @@ -410,8 +412,8 @@ msgstr "不能创建存储池 %(name)s。详情： %(err)s" #, python-format msgid "" -"Unable to get number of storage volumes in storage pool %(name)s. Details: " -"%(err)s" +"Unable to get number of storage volumes in storage pool %(name)s. Details: %" +"(err)s" msgstr "不能获取储存池%(name)s中卷的数目。详情： %(err)s" #, python-format @@ -441,7 +443,7 @@ msgstr "不支持的存储池类型：%(type)s" #, python-format msgid "Error while retrieving storage pool XML to %(pool)s" -msgstr "" +msgstr "查询存储池XML到%(pool)s时出现错误" msgid "Storage pool name must be a string" msgstr "存储池名字必须是一个字符串" @@ -449,7 +451,7 @@ msgstr "存储池名字必须是一个字符串" msgid "" "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-" "iso" -msgstr "" +msgstr "存储池类型仅支持dir，netfs，logical，iscsi，isci以及kimchi-iso" msgid "Storage pool path must be a string" msgstr "存储池路径必须是字符串" @@ -458,7 +460,7 @@ msgid "Storage pool host must be a IP or hostname" msgstr "存储池主机必须是一个IP后者主机名" msgid "Storage pool device must be the absolute path to the block device" -msgstr "" +msgstr "存储池设备必须为块设备的一个绝对路径" msgid "Storage pool devices parameter must be a list" msgstr "存储池设备参数必须是一个列表" @@ -470,23 +472,23 @@ msgid "Port of a remote storage server must be an integer between 1 and 65535" msgstr "远程存储服务器的端口必须是1到65535之间的整数" msgid "iSCSI target username must be a string" -msgstr "" +msgstr "iSCSI目标用户名必须为一个字符串" msgid "iSCSI target password must be a string" -msgstr "" +msgstr "iSCSI目标密码必须为一个字符串" msgid "Specify name and type to create a storage pool" msgstr "为新存储池指定名字和类型" #, python-format msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." +"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)" +"s." msgstr "%(disk)s 不是有效的磁盘/分区。不能被添加到存储池%(pool)s中" #, python-format msgid "Unable to extend logical pool %(pool)s. Details: %(err)s" -msgstr "" +msgstr "未能实现逻辑池%(pool)s的扩展，详情：%(err)s" msgid "The parameter disks only can be updated for logical storage pool." msgstr "只有逻辑存储池支持更新磁盘参数。" @@ -540,7 +542,7 @@ msgstr "存储池%(pool)s中没有存储卷%(name)s" msgid "" "Unable to create storage volume %(volume)s because storage pool %(pool)s is " "not active" -msgstr "" +msgstr "未能创建存储卷%(volume)s，因为存储池%(pool)s 未被激活" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" @@ -559,8 +561,8 @@ msgstr "不能列出存储卷，因为存储池%(pool)s没有激活" #, python-format msgid "" -"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: " -"%(err)s" +"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %" +"(err)s" msgstr "不能在存储池%(pool)s中创建存储卷%(name)s。详情：%(err)s" #, python-format @@ -603,17 +605,17 @@ msgstr "存储卷信息更新失败。详情：%(err)s" #, python-format msgid "Only one of parameter %(param)s can be specified" -msgstr "" +msgstr "只能对参数%(param)s中的一个进行指定" #, python-format msgid "Create volume from %(param)s is not supported" -msgstr "" +msgstr "不支持从%(param)s创建虚拟机" msgid "Storage volume capacity must be an integer number." -msgstr "" +msgstr "存储卷容量必须为一个整数" msgid "Storage volume URL must be http://, https://, ftp:// or ftps://." -msgstr "" +msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Interface %(name)s does not exist" @@ -711,19 +713,21 @@ msgstr "不能创建诊断报告%(name)s。详情：%(err)s" #, python-format msgid "Can not find any debug report with the given name %(name)s" -msgstr "" +msgstr "未能找到指定名称%(name)s的调试报告" #, python-format msgid "Unable to generate debug report %(name)s. Details: %(err)s" msgstr "不能生成诊断报告%(name)s。详情：%(err)s" msgid "You should give a name for the debug report file." -msgstr "" +msgstr "您应当为调试报告文件指定一个名称。" msgid "" "Debug report name must be a string. Only letters, digits, underscore ('_') " "and hyphen ('-') are allowed." msgstr "" +"调试报告名称必须为一个字符串。只有英文字符，数字，下划线('_')以及连字符('-')" +"为合法字符。" #, python-format msgid "" @@ -780,31 +784,23 @@ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds" msgstr "命令'%(cmd)s'运行%(seconds)s秒后超时。" msgid "Unable to choose a virtual machine name" -msgstr "" - -msgid "Invalid vm storage device name" -msgstr "无效的虚拟机存储设备名称" +msgstr "未能选择一个虚拟机名称" msgid "Invalid storage type. Types supported: 'cdrom', 'disk'" msgstr "无效的存储类型。支持类型为：'cdrom'，'disk'" #, python-format msgid "The path '%(value)s' is not a valid local/remote path for the device" -msgstr "" - -#, python-format -msgid "" -"Device name %(dev_name)s already exists in the virtual machine %(vm_name)s" -msgstr "" +msgstr "路径'%(value)s'不是设备的有效本地/远程路径" msgid "Only CDROM path can be update." -msgstr "" +msgstr "仅支持CDROM路径更新。" #, python-format msgid "" -"The storage device %(dev_name)s does not exist in the virtual machine " -"%(vm_name)s" -msgstr "" +"The storage device %(dev_name)s does not exist in the virtual machine %" +"(vm_name)s" +msgstr "存储设备%(dev_name)s在虚拟机%(vm_name)s中不存在" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -819,7 +815,7 @@ msgid "Error while removing storage device: %(error)s" msgstr "移除存储设备时出错：%(error)s" msgid "Do not support IDE device hot plug" -msgstr "" +msgstr "不支持IDE设备的热插拔" msgid "" "Specify type and path or type and pool/volume to add a new virtual machine " @@ -835,10 +831,10 @@ msgstr "控制器类型为%(type)s的设备达到上限%(limit)s" #, python-format msgid "Cannot retrieve disk path information for given pool/volume: %(error)s" -msgstr "" +msgstr "未能为给出的存储池/存储卷找到对应磁盘路径信息：%(error)s" msgid "Volume already in use by other virtual machine." -msgstr "" +msgstr "该卷已经被其他虚拟机使用。" msgid "" "Only one of path or pool/volume can be specified to add a new virtual " @@ -1140,7 +1136,7 @@ msgid "No such data available." msgstr "没有可用的数据" msgid "Options needed." -msgstr "" +msgstr "需要选项。" msgid "" "Can not contact the host system. Verify the host system is up and that you " @@ -1161,13 +1157,13 @@ msgid "Warning" msgstr "警告" msgid "Creating..." -msgstr "" +msgstr "正在创建..." msgid "Loading..." msgstr "正在加载..." msgid "An error occurred while checking for packages update." -msgstr "" +msgstr "查找软件包更新时出现错误。" msgid "Retry" msgstr "重试" @@ -1176,7 +1172,7 @@ msgid "Detailed message:" msgstr "详细消息：" msgid "No ISO found" -msgstr "" +msgstr "没有发现ISO文件" msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" @@ -1279,7 +1275,7 @@ msgid "Updating..." msgstr "正在更新..." msgid "Failed to retrieve packages update information." -msgstr "" +msgstr "查找软件包更新信息失败。" msgid "Failed to update package(s)." msgstr "更新软件包失败" @@ -1343,11 +1339,11 @@ msgid "Note the guest OS may ignore this request. Would you like to continue?" msgstr "注意，客户机操作系统可能会忽略这个请求，确认要继续吗？" msgid "Virtual Machine delete Confirmation" -msgstr "" +msgstr "虚拟机删除确认" msgid "" "This virtual machine is not persistent. Power Off will delete it. Continue?" -msgstr "" +msgstr "该虚拟机不是一个稳定的虚拟机，关机将会删除它，是否继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1372,7 +1368,7 @@ msgstr "成功卸载" msgid "" "This disk will be detached permanently and you can re-attach it. Continue to " "detach it?" -msgstr "" +msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1414,46 +1410,46 @@ msgid "No SCSI adapters found." msgstr "没有发现SCSI适配器" msgid "Loading iSCSI targets..." -msgstr "" +msgstr "读取iSCSI目标..." msgid "No iSCSI found. Please input one." -msgstr "" +msgstr "未能找到iSCSI,请输入一个" msgid "Failed to load iSCSI targets." -msgstr "" +msgstr "读取iSCSI目标失败。" msgid "The storage pool name can not be blank." -msgstr "存储池的名称不能为空" +msgstr "存储池的名称不能为空。" msgid "The storage pool path can not be blank." -msgstr "存储池的路径不能为空" +msgstr "存储池的路径不能为空。" msgid "NFS server mount path can not be blank." -msgstr "NFS服务器挂载路径不能为空" +msgstr "NFS服务器挂载路径不能为空。" msgid "Invalid storage pool name. It should not contain '/'." msgstr "无效的存储池的名字。名字中不能包含‘/’。" msgid "Invalid NFS mount path." -msgstr "无效的NFS挂载路径" +msgstr "无效的NFS挂载路径。" msgid "No logical device selected." -msgstr "没有选择逻辑设备" +msgstr "没有选择逻辑设备。" msgid "The iSCSI target can not be blank." -msgstr "iSCSI目标不能为空" +msgstr "iSCSI目标不能为空。" msgid "Server name can not be blank." -msgstr "服务器不能为空" +msgstr "服务器不能为空。" msgid "This is not a valid Server Name or IP. Please, modify it." -msgstr "" +msgstr "这不是你个有效的服务器名称或IP地址，请对其进行修改。" msgid "Looking for available partitions ..." msgstr "查找有效的分区 ..." msgid "No available partitions found." -msgstr "没有发现模板" +msgstr "没有发现模板。" msgid "" "This storage pool is not persistent. Instead of deactivate, this action will " @@ -1461,28 +1457,28 @@ msgid "" msgstr "对于非持久存储池，这个操作将会永久删除存储池而不是停用。是否继续？" msgid "Unable to retrieve partitions information." -msgstr "" +msgstr "未能找到分区信息。" msgid "In progress..." -msgstr "" +msgstr "正在进行..." msgid "Failed!" -msgstr "" +msgstr "失败！" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." -msgstr "" +msgstr "CDROM路径需要一个有效的本地/远程路径且不能为空。" msgid "Disk pool or volume cannot be blank." msgstr "存储池或卷不能为空" msgid "Peers" -msgstr "" +msgstr "对等机" msgid "Searching" -msgstr "" +msgstr "正在查询" msgid "No peers found." -msgstr "" +msgstr "没有发现对等机。" msgid "Help" msgstr "帮助" @@ -1520,15 +1516,15 @@ msgstr "" "含字母、数字、下划线 ('_') 和连字符（'-'）" msgid "Rename a Debug Report" -msgstr "" +msgstr "重命名一个调试报告" msgid "" "The name used to identify the report. Name can contain: letters, digits and " "hyphen (\"-\")." -msgstr "" +msgstr "报告的唯一表示名称，名称可以包含：英文字符，数字和连字符(\"-\")。" msgid "Submit" -msgstr "" +msgstr "提交" msgid "Add a Repository" msgstr "增加一个软件仓库" @@ -1649,19 +1645,19 @@ msgid "Please, wait..." msgstr "请等待..." msgid "Add a Volume to Storage Pool" -msgstr "" +msgstr "为存储池添加一个卷" msgid "Fetch from remote URL" -msgstr "" +msgstr "从远程URL获取" msgid "Enter the remote URL here." -msgstr "" +msgstr "在这里输入远程URL。" msgid "Upload an file" -msgstr "" +msgstr "上传一个文件" msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" +msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" msgid "Add Template" msgstr "创建模板" @@ -1673,7 +1669,7 @@ msgid "Local ISO Image" msgstr "本地ISO镜像" msgid "Local Image File" -msgstr "" +msgstr "本地镜像文件" msgid "Remote ISO Image" msgstr "远程ISO镜像" @@ -1730,7 +1726,7 @@ msgid "CDROM" msgstr "光驱" msgid "Image File" -msgstr "" +msgstr "镜像文件" msgid "Graphics" msgstr "图形" @@ -1832,7 +1828,7 @@ msgid "Activate" msgstr "激活" msgid "Add Volume" -msgstr "" +msgstr "添加卷" msgid "Extend" msgstr "扩展" @@ -1851,3 +1847,10 @@ msgstr "没有发现模板" msgid "Clone" msgstr "制作副本" + +#~ msgid "Invalid vm storage device name" +#~ msgstr "无效的虚拟机存储设备名称" + +#~ msgid "" +#~ "Device name %(dev_name)s already exists in the virtual machine %(vm_name)s" +#~ msgstr "设备名称%(dev_name)s已经存在于虚拟机%(vm_name)s" -- 1.7.1

2 3

[PATCH v2] issue #433: Fix repository tests
by Crístian Viana 25 Sep '14

25 Sep '14

This is the difference between this and the previous patchset (v1): - The test comments have been updated to reflect the actual tests. - The tests which try to create/update repositories with wrong data have been rewritten. Now there is a list of repositories with wrong data specific to each distribution (i.e. yum/apt), so each one of them only tests what is relevant. That means that Ubuntu won't test Fedora's specific features, like 'mirrorlist', and Fedora won't test Ubuntu's specific features, like 'dist'. Crístian Viana (1): issue #433: Fix repository tests src/kimchi/repositories.py | 2 ++ tests/test_model.py | 86 +++++++++++++++++++++++++++------------------- 2 files changed, 52 insertions(+), 36 deletions(-) -- 1.9.3

2 2

[PATCH] issue #437: Only allow a bootable image file to be used on template
by Aline Manera 24 Sep '14

24 Sep '14

While creating a template from a image file, the latter must be a bootable image. As probe_image() does all the verifications regarding the image file, the exception must be raised in order to inform user about the problem. Also update the test case accordingly. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 8 ++------ tests/test_model.py | 29 +++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 4994a5f..5f22db9 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -29,8 +29,7 @@ from distutils.version import LooseVersion from kimchi import osinfo -from kimchi.exception import InvalidParameter, IsoFormatError, ImageFormatError -from kimchi.exception import MissingParameter +from kimchi.exception import InvalidParameter, IsoFormatError, MissingParameter from kimchi.imageinfo import probe_image, probe_img_info from kimchi.isoinfo import IsoImage from kimchi.utils import check_url_path, pool_name_from_uri @@ -96,10 +95,7 @@ class VMTemplate(object): if 'base' in d.keys(): base_imgs.append(d) if scan: - try: - distro, version = probe_image(d['base']) - except ImageFormatError: - pass + distro, version = probe_image(d['base']) if 'size' not in d.keys(): d['size'] = probe_img_info(d['base'])['virtual-size'] diff --git a/tests/test_model.py b/tests/test_model.py index d458478..63be20e 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -37,8 +37,8 @@ import kimchi.objectstore import utils from kimchi import netinfo from kimchi.config import paths -from kimchi.exception import InvalidOperation, InvalidParameter -from kimchi.exception import NotFoundError, OperationFailed +from kimchi.exception import ImageFormatError, InvalidOperation +from kimchi.exception import InvalidParameter, NotFoundError, OperationFailed from kimchi.iscsi import TargetClient from kimchi.model import model from kimchi.rollbackcontext import RollbackContext @@ -126,10 +126,27 @@ class ModelTests(unittest.TestCase): rollback.prependDefer(inst.storagevolume_delete, 'default', vol) params = {'name': 'test', 'disks': [{'base': vol_path}]} - inst.templates_create(params) - rollback.prependDefer(inst.template_delete, 'test') - - params = {'name': 'kimchi-vm', 'template': '/templates/test'} + self.assertRaises(ImageFormatError, 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 + # using model + # As it is difficult to create one on test runtime, inject a + # template with an empty image file to the objstore to test the + # feature + tmpl_name = "img-tmpl" + tmpl_info = {"cpus": 1, "cdrom": "", + "graphics": {"type": "vnc", "listen": "127.0.0.1"}, + "networks": ["default"], "memory": 1024, "folder": [], + "icon": "images/icon-vm.png", + "os_distro": "unknown", "os_version": "unknown", + "disks": [{"base": vol_path, "size": 10}], + "storagepool": "/storagepools/default"} + + with inst.objstore as session: + session.store('template', tmpl_name, tmpl_info) + + params = {'name': 'kimchi-vm', 'template': '/templates/img-tmpl'} inst.vms_create(params) rollback.prependDefer(inst.vm_delete, 'kimchi-vm') -- 1.9.3

2 2

[PATCH] issue #417: Validate image file path when creating a new template
by Aline Manera 24 Sep '14

24 Sep '14

To create a template using an image file, the user must specify an existing file on system. Add this verification to avoid error while dealing with guestfs. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/imageinfo.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 552be25..8315d1d 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -65,6 +65,7 @@ messages = { "KCHIMG0001E": _("An error occurred when probing image OS information."), "KCHIMG0002E": _("No OS information found in given image."), "KCHIMG0003E": _("Unable to read image file %(filename)s"), + "KCHIMG0004E": _("Image file must be an existing file on system. %(filename)s is not a valid input."), "KCHVM0001E": _("Virtual machine %(name)s already exists"), "KCHVM0002E": _("Virtual machine %(name)s does not exist"), diff --git a/src/kimchi/imageinfo.py b/src/kimchi/imageinfo.py index f4c6356..89d1e0a 100644 --- a/src/kimchi/imageinfo.py +++ b/src/kimchi/imageinfo.py @@ -1,7 +1,7 @@ # # Kimchi # -# Copyright IBM Corp, 2014 +# Copyright IBM, Corp. 2014 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ import os import sys import guestfs -from kimchi.exception import ImageFormatError, TimeoutExpired +from kimchi.exception import ImageFormatError, InvalidParameter, TimeoutExpired from kimchi.utils import run_command, kimchi_log @@ -42,15 +42,21 @@ def probe_img_info(path): def probe_image(image_path): + if not os.path.isfile(image_path): + raise InvalidParameter("KCHIMG0004E", {'filename': image_path}) + + if not os.access(image_path, os.R_OK): + raise ImageFormatError("KCHIMG0003E", {'filename': image_path}) + g = guestfs.GuestFS(python_return_dict=True) g.add_drive_opts(image_path, readonly=1) g.launch() - if not os.access(image_path, os.R_OK): - raise ImageFormatError("KCHIMG0003E", {'filename': image_path}) + try: roots = g.inspect_os() except: raise ImageFormatError("KCHIMG0001E") + if len(roots) == 0: raise ImageFormatError("KCHIMG0002E") -- 1.9.3

2 2

[PATCH V4] Bugfix#424: Edit Template, "Disk (GB)" is changing with storage pool
by Wen Wang 24 Sep '14

24 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> V4: Change the variable name that store "Disk(GB)" into the format without "kimchi" and fixed oneline of error coding. V2 -> V3: Make the value of "Disk(GB)" inputbox consistent with user input. If choosing iSCSI or SCSI, inputbox is disabled and value of "Disk(GB)" is refreshed with the system. If changing back, the value stays the same with user last input. V1 -> V2: Considering iSCSI and SCSI situation that we need to have the input box disabled when choosing iSCSI and SCSI for storage pool and enable when choosing others. This patch fix the bug that value of "Disk(GB)" input box is changing with the item of "Storage Pool" in "Templates" --> "Actions" --> "Edit" -->"Edit Templates" dialogue. This might be comfusing to user when changing the "Storage Pool", "Disk(GB)" is changed with it without even notice. This might confuse the users and is not necessary. Solved by removing the change. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index cb43091..2f4cc9a 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -19,6 +19,7 @@ kimchi.template_edit_main = function() { var templateEditForm = $('#form-template-edit'); var origDisks; var origPool; + var templateDiskSize; $('#template-name', templateEditForm).val(kimchi.selectedTemplate); kimchi.retrieveTemplate(kimchi.selectedTemplate, function(template) { origDisks = template.disks; @@ -40,6 +41,7 @@ kimchi.template_edit_main = function() { } var disks = template.disks; $('input[name="disks"]').val(disks[0].size); + templateDiskSize = $('input[name="disks"]').val(); if (disks[0].volume) { var spool_value = $('#form-template-edit [name="storagepool"]').val(); $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); @@ -131,16 +133,13 @@ kimchi.template_edit_main = function() { kimchi.message.error(err.responseJSON.reason); }); } else { - if (origPool == storagepool) { - // Previous disk size value - $('input[name="disks"]', templateEditForm).val(origDisks[0].size); - } else { - // Default disk size value - $('input[name="disks"]', templateEditForm).val(10); - } $('input[name="disks"]', templateEditForm).removeAttr('disabled'); + $('input[name="disks"]', templateEditForm).val(templateDiskSize); } }); + $('input[name="disks"]', templateEditForm).keyup(function() { + templateDiskSize = $('input[name="disks"]', templateEditForm).val(); + }); $('#tmpl-edit-button-save').on('click', function() { var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; -- 1.7.1

2 1

[PATCH V3] Update Chinese transtation to po
by Wen Wang 24 Sep '14

24 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: rebase V1 -> V2: Translation improved Update the Chinese translation support Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 189 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 98 insertions(+), 91 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e722a3d..14abd1a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-23 10:19-0300\n" +"POT-Creation-Date: 2014-09-24 14:22+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" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -35,7 +35,7 @@ msgstr "" #, python-format msgid "Unknown parameter %(value)s" -msgstr "" +msgstr "未知变量 %(value)s" #, python-format msgid "Delete is not allowed for %(resource)s" @@ -64,7 +64,7 @@ msgid "Parameters does not match requirement in schema: %(err)s" msgstr "参数不符合要求的格式：%(err)s" msgid "You don't have permission to perform this operation." -msgstr "" +msgstr "您没有权限执行这项操作。" msgid "Datastore is not initiated in the model object." msgstr "尚未为model对象初始化数据存储。" @@ -111,7 +111,7 @@ msgstr "无法登录iSCSI主机%(host)s上的目标%(target)s。" #, python-format msgid "Unable to find ISO file %(filename)s" -msgstr "" +msgstr "未能找到ISO文件 %(filename)s" #, python-format msgid "The ISO file %(filename)s is not bootable" @@ -141,8 +141,8 @@ msgstr "ISO文件%(filename)s的卷描述符格式错误" msgid "" "The hypervisor doesn't have permission to use this ISO %(filename)s. " "Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " +"file access control lists for '%(user)s' user if possible, or add the '%" +"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" "hypervisor没有访问ISO文件%(filename)s的权限。可以将ISO移到/var/lib/libvirt目" @@ -150,14 +150,14 @@ msgstr "" "或者为所有的用户增加访问权限 'chmod -R o+x '（不推荐）。详情：%(err)s" msgid "An error occurred when probing image OS information." -msgstr "" +msgstr "搜索镜像操作系统信息时发生错误。" msgid "No OS information found in given image." -msgstr "" +msgstr "在指定的镜像文件中未发现操作系统信息。" #, python-format msgid "Unable to read image file %(filename)s" -msgstr "" +msgstr "未能读取镜像文件 %(filename)s" #, python-format msgid "Virtual machine %(name)s already exists" @@ -172,6 +172,8 @@ msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s is already " "in use or the virtual machine is not powered off." msgstr "" +"未能实现虚拟机 %(name)s 重命名，名称 %(new_name)s 已被使用或者该虚拟机未关" +"机。" #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" @@ -182,7 +184,7 @@ msgstr "该服务器不支持远程ISO镜像。" #, python-format msgid "Screenshot is not supported on virtual machine %(name)s" -msgstr "" +msgstr "虚拟机 %(name)s 不支持快照" #, python-format msgid "Unable to create virtual machine %(name)s. Details: %(err)s" @@ -198,21 +200,21 @@ msgstr "不能获取虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to connect to powered off virtual machine %(name)s." -msgstr "" +msgstr "虚拟机%(name)s已关机，连接失败。" msgid "Virtual machine name must be a string" msgstr "虚拟机名字必须是个字符串" #, python-format msgid "Invalid template URI %(value)s specified for virtual machine" -msgstr "" +msgstr "无效的虚拟机模板URI %(value)s" #, python-format msgid "Invalid storage pool URI %(value)s specified for virtual machine" -msgstr "" +msgstr "无效的虚拟机存储池URI %(value)s" msgid "Supported virtual machine graphics are Spice or VNC" -msgstr "" +msgstr "虚拟机图形界面仅支持Spice以及VNC" msgid "Graphics address to listen on must be IPv4 or IPv6" msgstr "远程图形访问的监听地址必须是IPv4或IPv6地址。" @@ -237,13 +239,13 @@ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s" msgstr "未能重置虚拟机%(name)s。详情：%(err)s" msgid "User name list must be an array" -msgstr "" +msgstr "用户名列表必须为一个数组" msgid "User name must be a string" msgstr "用户名必须是一个字符串" msgid "Group name list must be an array" -msgstr "" +msgstr "组名称列表必须为一个数组" msgid "Group name must be a string" msgstr "用户组名称必须是一个字符串" @@ -266,10 +268,10 @@ msgid "" msgstr "无法获得虚拟机 %(name)s的元数据，详情：%(err)s" msgid "The guest console password must be a string." -msgstr "" +msgstr "客户机控制台密码必须为一个字符串。" msgid "The life time for the guest console password must be a number." -msgstr "" +msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -354,17 +356,17 @@ msgid "Invalid storage pool URI %(value)s specified for template" msgstr "给模板指定了无效的存储池URI %(value)s" msgid "Specify an ISO image as CDROM or a base image to create a template" -msgstr "" +msgstr "指定一个ISO镜像作为创建模板的CDROM或者基础镜像" msgid "All networks for the template must be specified in a list." msgstr "为模板指定的网络必须在一个列表中" msgid "Specify a volume to a template when storage pool is iSCSI or SCSI" -msgstr "" +msgstr "当存储池类型为iSCSI或者SCSI的时候须为模板指定一个卷" #, python-format msgid "The volume %(volume)s is not in storage pool %(pool)s" -msgstr "" +msgstr "卷%(volume)s不在存储池%(pool)s中" #, python-format msgid "Unable to create template due error: %(err)s" @@ -378,11 +380,11 @@ msgid "Disk size must be greater than 1GB." msgstr "磁盘大小必须大于1GB。" msgid "Template base image must be a valid local image file" -msgstr "" +msgstr "模板基础镜像必须为一个有效的本地镜像文件" #, python-format msgid "Cannot identify base image %(path)s format" -msgstr "" +msgstr "未能识别基础镜像%(path)s格式" #, python-format msgid "Storage pool %(name)s already exists" @@ -410,8 +412,8 @@ msgstr "不能创建存储池 %(name)s。详情： %(err)s" #, python-format msgid "" -"Unable to get number of storage volumes in storage pool %(name)s. Details: " -"%(err)s" +"Unable to get number of storage volumes in storage pool %(name)s. Details: %" +"(err)s" msgstr "不能获取储存池%(name)s中卷的数目。详情： %(err)s" #, python-format @@ -441,7 +443,7 @@ msgstr "不支持的存储池类型：%(type)s" #, python-format msgid "Error while retrieving storage pool XML to %(pool)s" -msgstr "" +msgstr "查询存储池XML到%(pool)s时出现错误" msgid "Storage pool name must be a string" msgstr "存储池名字必须是一个字符串" @@ -449,7 +451,7 @@ msgstr "存储池名字必须是一个字符串" msgid "" "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-" "iso" -msgstr "" +msgstr "存储池类型仅支持dir，netfs，logical，iscsi，isci以及kimchi-iso" msgid "Storage pool path must be a string" msgstr "存储池路径必须是字符串" @@ -458,7 +460,7 @@ msgid "Storage pool host must be a IP or hostname" msgstr "存储池主机必须是一个IP后者主机名" msgid "Storage pool device must be the absolute path to the block device" -msgstr "" +msgstr "存储池设备必须为块设备的一个绝对路径" msgid "Storage pool devices parameter must be a list" msgstr "存储池设备参数必须是一个列表" @@ -470,23 +472,23 @@ msgid "Port of a remote storage server must be an integer between 1 and 65535" msgstr "远程存储服务器的端口必须是1到65535之间的整数" msgid "iSCSI target username must be a string" -msgstr "" +msgstr "iSCSI目标用户名必须为一个字符串" msgid "iSCSI target password must be a string" -msgstr "" +msgstr "iSCSI目标密码必须为一个字符串" msgid "Specify name and type to create a storage pool" msgstr "为新存储池指定名字和类型" #, python-format msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." +"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)" +"s." msgstr "%(disk)s 不是有效的磁盘/分区。不能被添加到存储池%(pool)s中" #, python-format msgid "Unable to extend logical pool %(pool)s. Details: %(err)s" -msgstr "" +msgstr "未能实现逻辑池%(pool)s的扩展，详情：%(err)s" msgid "The parameter disks only can be updated for logical storage pool." msgstr "只有逻辑存储池支持更新磁盘参数。" @@ -540,7 +542,7 @@ msgstr "存储池%(pool)s中没有存储卷%(name)s" msgid "" "Unable to create storage volume %(volume)s because storage pool %(pool)s is " "not active" -msgstr "" +msgstr "未能创建存储卷%(volume)s，因为存储池%(pool)s 未被激活" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" @@ -559,8 +561,8 @@ msgstr "不能列出存储卷，因为存储池%(pool)s没有激活" #, python-format msgid "" -"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: " -"%(err)s" +"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %" +"(err)s" msgstr "不能在存储池%(pool)s中创建存储卷%(name)s。详情：%(err)s" #, python-format @@ -603,17 +605,17 @@ msgstr "存储卷信息更新失败。详情：%(err)s" #, python-format msgid "Only one of parameter %(param)s can be specified" -msgstr "" +msgstr "只能对参数%(param)s中的一个进行指定" #, python-format msgid "Create volume from %(param)s is not supported" -msgstr "" +msgstr "不支持从%(param)s创建虚拟机" msgid "Storage volume capacity must be an integer number." -msgstr "" +msgstr "存储卷容量必须为一个整数" msgid "Storage volume URL must be http://, https://, ftp:// or ftps://." -msgstr "" +msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Interface %(name)s does not exist" @@ -711,19 +713,21 @@ msgstr "不能创建诊断报告%(name)s。详情：%(err)s" #, python-format msgid "Can not find any debug report with the given name %(name)s" -msgstr "" +msgstr "未能找到指定名称%(name)s的调试报告" #, python-format msgid "Unable to generate debug report %(name)s. Details: %(err)s" msgstr "不能生成诊断报告%(name)s。详情：%(err)s" msgid "You should give a name for the debug report file." -msgstr "" +msgstr "不能生成诊断报告%(name)s。详情：%(err)s" msgid "" "Debug report name must be a string. Only letters, digits, underscore ('_') " "and hyphen ('-') are allowed." msgstr "" +"调试报告名称必须为一个字符串。只有英文字符，数字，下划线('_')以及连字符('-')" +"为合法字符。" #, python-format msgid "" @@ -780,23 +784,23 @@ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds" msgstr "命令'%(cmd)s'运行%(seconds)s秒后超时。" msgid "Unable to choose a virtual machine name" -msgstr "" +msgstr "未能选择一个虚拟机名称" msgid "Invalid storage type. Types supported: 'cdrom', 'disk'" msgstr "无效的存储类型。支持类型为：'cdrom'，'disk'" #, python-format msgid "The path '%(value)s' is not a valid local/remote path for the device" -msgstr "" +msgstr "路径'%(value)s'不是设备的有效本地/远程路径" msgid "Only CDROM path can be update." -msgstr "" +msgstr "仅支持CDROM路径更新。" #, python-format msgid "" -"The storage device %(dev_name)s does not exist in the virtual machine " -"%(vm_name)s" -msgstr "" +"The storage device %(dev_name)s does not exist in the virtual machine %" +"(vm_name)s" +msgstr "存储设备%(dev_name)s在虚拟机%(vm_name)s中不存在" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -811,7 +815,7 @@ msgid "Error while removing storage device: %(error)s" msgstr "移除存储设备时出错：%(error)s" msgid "Do not support IDE device hot plug" -msgstr "" +msgstr "不支持IDE设备的热插拔" msgid "" "Specify type and path or type and pool/volume to add a new virtual machine " @@ -827,10 +831,10 @@ msgstr "控制器类型为%(type)s的设备达到上限%(limit)s" #, python-format msgid "Cannot retrieve disk path information for given pool/volume: %(error)s" -msgstr "" +msgstr "未能为给出的存储池/存储卷找到对应磁盘路径信息：%(error)s" msgid "Volume already in use by other virtual machine." -msgstr "" +msgstr "该卷已经被其他虚拟机使用。" msgid "" "Only one of path or pool/volume can be specified to add a new virtual " @@ -1132,7 +1136,7 @@ msgid "No such data available." msgstr "没有可用的数据" msgid "Options needed." -msgstr "" +msgstr "需要选项。" msgid "" "Can not contact the host system. Verify the host system is up and that you " @@ -1153,13 +1157,13 @@ msgid "Warning" msgstr "警告" msgid "Creating..." -msgstr "" +msgstr "正在创建..." msgid "Loading..." msgstr "正在加载..." msgid "An error occurred while checking for packages update." -msgstr "" +msgstr "查找软件包更新时出现错误。" msgid "Retry" msgstr "重试" @@ -1168,7 +1172,7 @@ msgid "Detailed message:" msgstr "详细消息：" msgid "No ISO found" -msgstr "" +msgstr "没有发现ISO文件" msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" @@ -1271,7 +1275,7 @@ msgid "Updating..." msgstr "正在更新..." msgid "Failed to retrieve packages update information." -msgstr "" +msgstr "查找软件包更新信息失败。" msgid "Failed to update package(s)." msgstr "更新软件包失败" @@ -1308,7 +1312,7 @@ msgid "Pending..." msgstr "正在加载..." msgid "Report name is the same as the original one." -msgstr "" +msgstr "报告名称与原始名称重复。" msgid "" "This will delete the virtual machine and its virtual disks. This operation " @@ -1338,11 +1342,11 @@ msgid "Note the guest OS may ignore this request. Would you like to continue?" msgstr "注意，客户机操作系统可能会忽略这个请求，确认要继续吗？" msgid "Virtual Machine delete Confirmation" -msgstr "" +msgstr "虚拟机删除确认" msgid "" "This virtual machine is not persistent. Power Off will delete it. Continue?" -msgstr "" +msgstr "该虚拟机不是一个稳定的虚拟机，关机将会删除它，是否继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1367,7 +1371,7 @@ msgstr "成功卸载" msgid "" "This disk will be detached permanently and you can re-attach it. Continue to " "detach it?" -msgstr "" +msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1409,46 +1413,46 @@ msgid "No SCSI adapters found." msgstr "没有发现SCSI适配器" msgid "Loading iSCSI targets..." -msgstr "" +msgstr "读取iSCSI目标..." msgid "No iSCSI found. Please input one." -msgstr "" +msgstr "未能找到iSCSI,请输入一个。" msgid "Failed to load iSCSI targets." -msgstr "" +msgstr "读取iSCSI目标失败。" msgid "The storage pool name can not be blank." -msgstr "存储池的名称不能为空" +msgstr "存储池的名称不能为空。" msgid "The storage pool path can not be blank." -msgstr "存储池的路径不能为空" +msgstr "存储池的路径不能为空。" msgid "NFS server mount path can not be blank." -msgstr "NFS服务器挂载路径不能为空" +msgstr "NFS服务器挂载路径不能为空。" msgid "Invalid storage pool name. It should not contain '/'." msgstr "无效的存储池的名字。名字中不能包含‘/’。" msgid "Invalid NFS mount path." -msgstr "无效的NFS挂载路径" +msgstr "无效的NFS挂载路径。" msgid "No logical device selected." -msgstr "没有选择逻辑设备" +msgstr "没有选择逻辑设备。" msgid "The iSCSI target can not be blank." -msgstr "iSCSI目标不能为空" +msgstr "iSCSI目标不能为空。" msgid "Server name can not be blank." -msgstr "服务器不能为空" +msgstr "服务器不能为空。" msgid "This is not a valid Server Name or IP. Please, modify it." -msgstr "" +msgstr "这不是你个有效的服务器名称或IP地址，请对其进行修改。" msgid "Looking for available partitions ..." msgstr "查找有效的分区 ..." msgid "No available partitions found." -msgstr "没有发现模板" +msgstr "没有发现模板。" msgid "" "This storage pool is not persistent. Instead of deactivate, this action will " @@ -1456,28 +1460,28 @@ msgid "" msgstr "对于非持久存储池，这个操作将会永久删除存储池而不是停用。是否继续？" msgid "Unable to retrieve partitions information." -msgstr "" +msgstr "未能找到分区信息。" msgid "In progress..." -msgstr "" +msgstr "正在进行..." msgid "Failed!" -msgstr "" +msgstr "失败！" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." -msgstr "" +msgstr "CDROM路径需要一个有效的本地/远程路径且不能为空。" msgid "Disk pool or volume cannot be blank." msgstr "存储池或卷不能为空" msgid "Peers" -msgstr "" +msgstr "对等机" msgid "Searching" -msgstr "" +msgstr "正在查询" msgid "No peers found." -msgstr "" +msgstr "没有发现对等机。" msgid "Help" msgstr "帮助" @@ -1515,15 +1519,15 @@ msgstr "" "含字母、数字、下划线 ('_') 和连字符（'-'）" msgid "Rename a Debug Report" -msgstr "" +msgstr "重命名一个调试报告" msgid "" "The name used to identify the report. Name can contain: letters, digits and " "hyphen (\"-\")." -msgstr "" +msgstr "报告的唯一表示名称，名称可以包含：英文字符，数字和连字符(\"-\")。" msgid "Submit" -msgstr "" +msgstr "提交" msgid "Add a Repository" msgstr "增加一个软件仓库" @@ -1644,19 +1648,19 @@ msgid "Please, wait..." msgstr "请等待..." msgid "Add a Volume to Storage Pool" -msgstr "" +msgstr "为存储池添加一个卷" msgid "Fetch from remote URL" -msgstr "" +msgstr "从远程URL获取" msgid "Enter the remote URL here." -msgstr "" +msgstr "在这里输入远程URL。" msgid "Upload an file" -msgstr "" +msgstr "上传一个文件" msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" +msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" msgid "Add Template" msgstr "创建模板" @@ -1668,7 +1672,7 @@ msgid "Local ISO Image" msgstr "本地ISO镜像" msgid "Local Image File" -msgstr "" +msgstr "本地镜像文件" msgid "Remote ISO Image" msgstr "远程ISO镜像" @@ -1725,7 +1729,7 @@ msgid "CDROM" msgstr "光驱" msgid "Image File" -msgstr "" +msgstr "镜像文件" msgid "Graphics" msgstr "图形" @@ -1793,6 +1797,9 @@ msgstr "NAT: 从虚拟机到物理网络单向连接" msgid "Bridged: Virtual machines are connected to physical network directly" msgstr "桥接：虚拟机可以直接连接到物理网络中。" +msgid "(No interfaces found)" +msgstr "(没有发现网络接口)" + msgid "Destination" msgstr "目标设备" @@ -1827,7 +1834,7 @@ msgid "Activate" msgstr "激活" msgid "Add Volume" -msgstr "" +msgstr "添加卷" msgid "Extend" msgstr "扩展" -- 1.7.1

2 1

[PATCH] issue #435: Fix resource authorization logic
by Crístian Viana 24 Sep '14

24 Sep '14

The current logic is broken. Therefore, some cases which should allow a user to have access to a VM may fail. For example, if one VM has only group permission but no user permission, users who are members of the allowed groups are not able to access that VM. Other cases may behave wrong as well. Change the authorization logic so it works in all cases. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 9 +++------ tests/test_authorization.py | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 6391a1a..2e0816f 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -160,13 +160,10 @@ class Resource(object): users = self.data.get("users", None) groups = self.data.get("groups", None) - if (users is not None or groups is not None) and \ - user_role and user_role != 'admin' and \ - (user_name not in users or - (groups and list(set(user_groups) & set(groups)) == [])): - return False + if (users is None and groups is None) or user_role == 'admin': + return True - return True + return user_name in users or len(set(user_groups) & set(groups)) > 0 def update(self): try: diff --git a/tests/test_authorization.py b/tests/test_authorization.py index a74e3c7..2c342a5 100644 --- a/tests/test_authorization.py +++ b/tests/test_authorization.py @@ -121,10 +121,13 @@ class AuthorizationTests(unittest.TestCase): model.vms_create({'name': u'test-usera', 'template': '/templates/test'}) model.vm_update(u'test-usera', {'users': [ 'userA' ], 'groups': []}) + model.vms_create({'name': u'test-groupa', 'template': '/templates/test'}) + model.vm_update(u'test-groupa', {'groups': [ 'groupA' ]}) + resp = self.request('/vms', '{}', 'GET') self.assertEquals(200, resp.status) vms_data = json.loads(resp.read()) - self.assertEquals([ u'test-me' ], [ v['name'] for v in vms_data ]) + self.assertEquals([ u'test-groupa', u'test-me' ], sorted([ v['name'] for v in vms_data ])) resp = self.request('/vms', req, 'POST') self.assertEquals(403, resp.status) -- 1.9.3

2 1

[PATCH V3] Bugfix:#424 Edit Template, "Disk (GB)" is changing with storage pool
by Wen Wang 24 Sep '14

24 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Make the value of "Disk(GB)" inputbox consistent with user input. If choosing iSCSI or SCSI, inputbox is disabled and value of "Disk(GB)" is refreshed with the system. If changing back, the value stays the same with user last input. V1 -> V2: Considering iSCSI and SCSI situation that we need to have the input box disabled when choosing iSCSI and SCSI for storage pool and enable when choosing others. This patch fix the bug that value of "Disk(GB)" input box is changing with the item of "Storage Pool" in "Templates" --> "Actions" --> "Edit" -->"Edit Templates" dialogue. This might be comfusing to user when changing the "Storage Pool", "Disk(GB)" is changed with it without even notice. This might confuse the users and is not necessary. Solved by removing the change. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index cb43091..d2bbe23 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -40,6 +40,7 @@ kimchi.template_edit_main = function() { } var disks = template.disks; $('input[name="disks"]').val(disks[0].size); + kimchi.templateDiskSize = $('input[name="disks"]').val(); if (disks[0].volume) { var spool_value = $('#form-template-edit [name="storagepool"]').val(); $('input[name="storagepool"]', templateEditForm).val(spool_value + '/' + disks[0].volume); @@ -128,19 +129,16 @@ kimchi.template_edit_main = function() { $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); return false; }, function (err) { + $('input[name="disks"]', templateEditForm).val(kimchi.templateDiskSize); kimchi.message.error(err.responseJSON.reason); }); } else { - if (origPool == storagepool) { - // Previous disk size value - $('input[name="disks"]', templateEditForm).val(origDisks[0].size); - } else { - // Default disk size value - $('input[name="disks"]', templateEditForm).val(10); - } $('input[name="disks"]', templateEditForm).removeAttr('disabled'); } }); + $('input[name="disks"]', templateEditForm).keyup(function() { + kimchi.templateDiskSize = $('input[name="disks"]', templateEditForm).val(); + }); $('#tmpl-edit-button-save').on('click', function() { var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; -- 1.7.1

2 2

Bugs in test matrix updated
by Crístian Viana 24 Sep '14

24 Sep '14

Hi everyone! The bugs listed in the test matrix for the 1.3 release have been updated because a lot of them have been fixed. Great work! Please take a look at the table to make sure the ones still there are actually open: https://github.com/kimchi-project/kimchi/wiki/Testing-1.3 Also, I'd like to remind you that tomorrow is the last day before the 1.3 GA release, so let's focus on the remaining bugs! :-) Best regards, Crístian.

1 0

[PATCH] Adding ability to pass an optional custom MAC address when users add an interface to a cold vm.
by bbaude＠redhat.com 23 Sep '14

23 Sep '14

From: Brent Baude <bbaude(a)redhat.com> Feature to add a custom mac address when creating network interfaces. --- docs/API.md | 1 + src/kimchi/API.json | 4 ++++ src/kimchi/i18n.py | 2 ++ src/kimchi/model/vmifaces.py | 25 +++++++++++++++++++++---- tests/test_model.py | 10 ++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 8 files changed, 60 insertions(+), 15 deletions(-) diff --git a/docs/API.md b/docs/API.md index c070fa7..02daa37 100644 --- a/docs/API.md +++ b/docs/API.md @@ -223,6 +223,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom mac address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 1319531..a020e1e 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,10 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string" } } }, diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..8d024f9 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,8 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("The custom MAC address %(custommac)s is not properly formatted as 12 character hexidecimal value seperated by colons(:)"), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..2b3b31d 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,13 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + return False + else: + return True + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -60,6 +68,14 @@ class VMIfacesModel(object): for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + if 'custommac' not in params: + mac = randomMAC() + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + while True: if mac not in macs: break @@ -73,10 +89,11 @@ class VMIfacesModel(object): attrib = {"type": params["type"]} xml = etree.tostring(E.interface(*children, **attrib)) - - dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - - return mac + if validMac(mac): + dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) + return mac + else: + raise NotFoundError("KCHVMIF0009E", {'custommac': mac}) @staticmethod def get_vmifaces(vm, conn): diff --git a/tests/test_model.py b/tests/test_model.py index 5774c82..13b5269 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,16 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 938dfd9..a7c822a 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -175,7 +175,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -211,20 +214,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

5 6

[PATCH V2] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 23 Sep '14

23 Sep '14

V1: Kimchi is currently not able to configure and open help pages of any plugin tab. This patch fixes this problem and removes the HELP button if the plugin does not have a help configured properly. Help pages for a plugin tab follow same Kimchi system: - html help file should have the same name of plugin html tab file - html files should be in plugin's " ui/pages/help/<LANG> " path - plugin should add following lines to <PLUGIN_NAME>.conf: * [/help] * tools.staticdir.on = True * tools.nocache.on = True - plugins should add a <help> element with tab help html name in "ui/config/tab-ext.xml", for each configured tab. If this element does not exist, 'Help' will be disabled V2: - Changed the way that tab help html is being checked. - Now, all tabs have the help html file checked (per language) You can check enabling Sample plugin. Go to plugin Sample tab. For en_US, the help button will be enabled. But if you logout and change to other language, the help button will be disabled, because the sample plugin does not have help in other languages. Rodrigo Trujillo (1): Detect and enable help pages for tabs and plugin tabs plugins/sample/sample.conf.in | 4 ++++ plugins/sample/ui/pages/help/en_US/tab.html | 1 + src/kimchi/config.py.in | 1 + src/kimchi/utils.py | 9 ++++++-- ui/js/src/kimchi.main.js | 36 ++++++++++++++++++++++++++++- 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/tab.html -- 1.9.3

2 4

[PATCH V3] Bugfix#426: When no interface available, creating network popup error
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: Change the align of "No interfaces found" that is aligned in another line. Using ".show()", ".hide()" instead of "prop()". V1 -> V2: Add an indicator "(No interfaces found)" in "bridged" option under Network tab when there exists no bridged interface. This patch fix the the issue when creating a network that lack of interface options pops up errors Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/network.css | 6 ++++++ ui/js/src/kimchi.network.js | 11 ++++++----- ui/pages/tabs/network.html.tmpl | 9 +++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/network.css b/ui/css/theme-default/network.css index 6f690ed..5d07468 100644 --- a/ui/css/theme-default/network.css +++ b/ui/css/theme-default/network.css @@ -170,6 +170,12 @@ height: 200px; } +.network-config .section-container .bridged-inline { + display: inline-block; + vertical-align: top; + max-width: 520px; +} + .network-config .section-header { font-weight: bold; font-size: 14px; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 4ee7249..7194f93 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -247,17 +247,16 @@ kimchi.openNetworkDialog = function(okCallback) { kimchi.getInterfaces(function(result) { var options = []; $('#networkDestinationID').selectMenu(); - $("#networkDestinationID").on('click',function(){ - }); var nics = {}; for (var i = 0; i < result.length; i++) { options.push({label:result[i].name,value:result[i].name}); nics[result[i].name] = result[i]; } - $("#networkDestinationID").selectMenu("setData", options); + result.length>0 && $("#networkDestinationID").selectMenu("setData", options); onChange = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); - if (nics[$("#networkDestinationLabel").text()].type === "bridge") { + $("#networkDestinationID li:first-child").addClass("active"); + if (result.length>0 && nics[$("#networkDestinationLabel").text()].type === "bridge") { $("#enableVlan").prop("checked", false); $("#enableVlan").prop("disabled", true); $("#networkVlanID").val(""); @@ -268,8 +267,8 @@ kimchi.openNetworkDialog = function(okCallback) { } }; $("#networkDestinationLabel").on("change", onChange); - onChange(); kimchi.setDefaultNetworkType(result.length!==0); + onChange(); }); $("#networkConfig").dialog({ title : i18n.KCHNET6003M @@ -318,10 +317,12 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeNat").prop("checked", !isInterfaceAvail); if (!isInterfaceAvail) { kimchi.enableBridgeOptions(false); + $("#networkBriDisabledLabel").show(); } else { $("#bridgeOptions").slideDown(100); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); + $("#networkBriDisabledLabel").hide(); } }; diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 214fb01..6a6e5f7 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -65,8 +65,13 @@ <label for="networkTypeNat">$_("NAT: outbound physical network connection only")</label> </div> <div class="input-container"> - <input type="radio" id="networkTypeBri" name="networkType" value="bridged" /> - <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> + <div class="bridged-inline"> + <input type="radio" id="networkTypeBri" name="networkType" value="bridged" /> + </div> + <div class="bridged-inline"> + <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label><br /> + <label id="networkBriDisabledLabel" style="display:none">$_("(No interfaces found)")</label> + </div> </div> <div id="bridgeOptions"> <div> -- 1.7.1

2 2

[PATCH] help i18n: Add new languages to build process
by Aline Manera 23 Sep '14

23 Sep '14

Commit c9649834 was reverted because wildcard can not be used to list subdirectories: [alinefm@alinefm kimchi]$ sudo ./autogen.sh --system ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(dir does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(wildcard does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/*/)) does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(dir does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/$(wildcard does not exist ui/pages/help/Makefile.am:17: error: required directory ui/pages/help/*/)) does not exist autoreconf: automake failed with exit status: 1 So manually list the new languages supported for help. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/pages/help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index fa9786b..5c04319 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -14,7 +14,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -SUBDIRS = en_US pt_BR zh_CN +SUBDIRS = zh_CN it_IT en_US zh_TW pt_BR ja_JP ru_RU ko_KR fr_FR de_DE es_ES DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard */*.dita)) HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), $(wildcard */*.html)) -- 1.9.3

2 2

[PATCH] Bugfix: Overlap issue occurs on the Power Off confirmation dialog
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fixes the bug that layout of confirm dialogue display rightly when changing the languages. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/message.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/message.css b/ui/css/theme-default/message.css index 2631a18..c530f84 100644 --- a/ui/css/theme-default/message.css +++ b/ui/css/theme-default/message.css @@ -79,7 +79,7 @@ max-width: 100%; max-height: 100%; width: 350px; - height: 170px; + height: 200px; z-index: 9999; } -- 1.7.1

3 3

[PATCH] Bugfix#: Prevent overlap issue occurs under General tab on Edit
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fix the bug that occurs when changing languages which might contain long words that cause problems of layout in "General" tab under "Edit" for VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 10 ++++---- ui/pages/guest-edit.html.tmpl | 38 +++++++++++++++------------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index f6cf214..75032c6 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -33,6 +33,10 @@ padding: 1em; } +#form-guest-edit-general .edit-general-inline { + display: inline-block; +} + #form-guest-edit-storage input[readonly] { background: none; border-color: transparent; @@ -43,16 +47,12 @@ padding-right: 0; } -.guest-edit-wrapper-label, .guest-edit-wrapper-controls { - display: inline-block; -} - .guest-edit-wrapper-label { height: 38px; line-height: 38px; margin-top: 5px; vertical-align: top; - width: 100px; + min-width: 100px; } #form-guest-edit-storage .guest-edit-wrapper-label { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0eaa08d..3003ab1 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -44,48 +44,44 @@ </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> - <div> + <div class="edit-general-inline"> <div class="guest-edit-wrapper-label"> <label for="guest-edit-id-textbox"> $_("Name") </label> </div> - <div class="guest-edit-wrapper-controls"> - <input id="guest-edit-id-textbox" - name="name" type="text" /> - </div> - </div> - <div> <div class="guest-edit-wrapper-label"> <label for="guest-edit-cores-textbox"> $_("CPUs") </label> </div> + <div class="guest-edit-wrapper-label"> + <label for="guest-edit-memory-textbox"> + $_("Memory (MB)") + </label> + </div> + <div class="guest-edit-wrapper-label"> + <label for="guest-edit-icon-textbox"> + $_("Icon") + </label> + </div> + </div> + <div class="edit-general-inline"> + <div class="guest-edit-wrapper-controls"> + <input id="guest-edit-id-textbox" + name="name" type="text" /> + </div> <div class="guest-edit-wrapper-controls"> <input id="guest-edit-cores-textbox" name="cpus" type="text" /> </div> - </div> - <div> - <div class="guest-edit-wrapper-label"> - <label for="guest-edit-memory-textbox"> - $_("Memory (MB)") - </label> - </div> <div class="guest-edit-wrapper-controls"> <input id="guest-edit-memory-textbox" name="memory" type="text" /> </div> - </div> - <div> - <div class="guest-edit-wrapper-label"> - <label for="guest-edit-icon-textbox"> - $_("Icon") - </label> - </div> <div class="guest-edit-wrapper-controls"> <input id="guest-edit-icon-textbox" -- 1.7.1

3 2

[PATCH] Bug 431 Fix
by huoyuxin＠linux.vnet.ibm.com 23 Sep '14

23 Sep '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.storage_main.js | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 28b2b58..9a45b65 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -21,7 +21,7 @@ kimchi.doListStoragePools = function() { if (result && result.length) { var listHtml = ''; $.each(result, function(index, value) { - value.usage = parseInt(value.allocated / value.capacity * 100) || 0; + value.usage = Math.round(value.allocated / value.capacity * 100) || 0; value.capacity = kimchi.changetoProperUnit(value.capacity,1); value.allocated = kimchi.changetoProperUnit(value.allocated,1); value.enableExt = value.type==="logical" ? "" : "hide-content"; @@ -313,7 +313,12 @@ kimchi.initLogicalPoolExtend = function() { $("input[type='checkbox']:checked", "#logicalPoolExtend").each(function(){ devicePaths.push($(this).prop('value')); }) - kimchi.updateStoragePool($("#logicalPoolExtend").dialog("option", "poolName"),{disks: devicePaths}); + kimchi.updateStoragePool($("#logicalPoolExtend").dialog("option", "poolName"),{disks: devicePaths},function(data){ + var item = $("#"+$("#logicalPoolExtend").dialog("option", "poolName")); + $(".usage", $(".storage-name", item)).text((Math.round(data.allocated/data.capacity*100)||0)+"%"); + $(".storage-text", $(".storage-capacity", item)).text(kimchi.changetoProperUnit(data.capacity,1)); + $(".storage-text", $(".storage-allocate", item)).text(kimchi.changetoProperUnit(data.allocated,1)); + }); $(this).dialog("close"); } }] -- 1.7.1

2 1

[PATCH] Bugfix:#424 Edit Template, "Disk (GB)" is changing with storage pool
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fix the bug that value of "Disk(GB)" input box is changing with the item of "Storage Pool" in "Templates" --> "Actions" --> "Edit" -->"Edit Templates" dialogue. This might be comfusing to user when changing the "Storage Pool", "Disk(GB)" is changed with it without even notice. This might confuse the users and is not necessary. Solved by removing the change. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index cb43091..61d23b4 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -117,31 +117,6 @@ kimchi.template_edit_main = function() { }); }); - $('#template-edit-storagePool').change(function() { - storagepool = $(this).val(); - var storageArray = storagepool.split("/"); - if (storageArray.length > 3) { - volumeName = storageArray.pop(); - poolName = storageArray.pop(); - kimchi.getStoragePoolVolume(poolName, volumeName, function(result) { - $('input[name="disks"]', templateEditForm).val(result.capacity / Math.pow(1024,3)); - $('input[name="disks"]', templateEditForm).attr('disabled','disabled'); - return false; - }, function (err) { - kimchi.message.error(err.responseJSON.reason); - }); - } else { - if (origPool == storagepool) { - // Previous disk size value - $('input[name="disks"]', templateEditForm).val(origDisks[0].size); - } else { - // Default disk size value - $('input[name="disks"]', templateEditForm).val(10); - } - $('input[name="disks"]', templateEditForm).removeAttr('disabled'); - } - }); - $('#tmpl-edit-button-save').on('click', function() { var editableFields = [ 'name', 'cpus', 'memory', 'storagepool', 'disks', 'graphics']; var data = {}; -- 1.7.1

2 5

[PATCH] issue #429: Properly set rollback function when creating vlan tagged bridged
by Aline Manera 23 Sep '14

23 Sep '14

The rollback function must be defined right after the action. It is not linked to the exception raised. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/networks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 73e7ace..0ea9449 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -216,12 +216,11 @@ class NetworksModel(object): 'err': error_msg}) with RollbackContext() as rollback: - try: vlan_tagged_br = conn.interfaceDefineXML(br_xml, 0) + rollback.prependDefer(vlan_tagged_br.destroy) vlan_tagged_br.create(0) except libvirt.libvirtError as e: - rollback.prependDefer(vlan_tagged_br.destroy) raise OperationFailed(e.message) else: return br_name -- 1.9.3

2 2

[PATCH] issue #415: Do not allow renaming a debug report to the same name
by Crístian Viana 23 Sep '14

23 Sep '14

If the user tries to rename a debug report to the same name (i.e. not actually rename...), Kimchi displays an error message indicating that a debug report with that name already exists. Check the new report name before renaming it, and if it hasn't changed, display a message indicating that the name is the same as the original one. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.report_rename_main.js | 8 ++++++++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 9 insertions(+) diff --git a/ui/js/src/kimchi.report_rename_main.js b/ui/js/src/kimchi.report_rename_main.js index 03c3c3a..6ee56d9 100644 --- a/ui/js/src/kimchi.report_rename_main.js +++ b/ui/js/src/kimchi.report_rename_main.js @@ -24,6 +24,14 @@ kimchi.report_rename_main = function() { return false; } var reportName = nameTextbox.val(); + + // if the user hasn't changed the report's name, + // nothing should be done. + if (reportName == kimchi.selectedReport) { + kimchi.message.error.code('KCHDR6013M'); + return false; + } + var validator = RegExp("^[A-Za-z0-9-]*$"); if (!validator.test(reportName)) { kimchi.message.error.code('KCHDR6011M'); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 659bec8..c52b175 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -115,6 +115,7 @@ "KCHDR6010M": "$_("Download")", "KCHDR6011M": "$_("Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-').")", "KCHDR6012M": "$_("Pending...")", + "KCHDR6013M": "$_("Report name is the same as the original one.")", "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", "KCHVM6002M": "$_("Power off Confirmation")", -- 1.9.3

2 1

[PATCH V2] Bugfix:#424 Edit Template, "Disk (GB)" is changing with storage pool
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: Considering iSCSI and SCSI situation that we need to have the input box disabled when choosing iSCSI and SCSI for storage pool and enable when choosing others. This patch fix the bug that value of "Disk(GB)" input box is changing with the item of "Storage Pool" in "Templates" --> "Actions" --> "Edit" -->"Edit Templates" dialogue. This might be comfusing to user when changing the "Storage Pool", "Disk(GB)" is changed with it without even notice. This might confuse the users and is not necessary. Solved by removing the change. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_edit_main.js | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index cb43091..8133878 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -131,13 +131,6 @@ kimchi.template_edit_main = function() { kimchi.message.error(err.responseJSON.reason); }); } else { - if (origPool == storagepool) { - // Previous disk size value - $('input[name="disks"]', templateEditForm).val(origDisks[0].size); - } else { - // Default disk size value - $('input[name="disks"]', templateEditForm).val(10); - } $('input[name="disks"]', templateEditForm).removeAttr('disabled'); } }); -- 1.7.1

2 2

[PATCH] Update Chinese transtation to po
by Wen Wang 23 Sep '14

23 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Update the Chinese translation support Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- po/zh_CN.po | 186 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 95 insertions(+), 91 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e6f9ac7..193fa58 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 14:11-0300\n" +"POT-Creation-Date: 2014-09-18 13:24+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" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -35,7 +35,7 @@ msgstr "" #, python-format msgid "Unknown parameter %(value)s" -msgstr "" +msgstr "未知变量 %(value)s" #, python-format msgid "Delete is not allowed for %(resource)s" @@ -64,7 +64,7 @@ msgid "Parameters does not match requirement in schema: %(err)s" msgstr "参数不符合要求的格式：%(err)s" msgid "You don't have permission to perform this operation." -msgstr "" +msgstr "您没有权限执行这项操作。" msgid "Datastore is not initiated in the model object." msgstr "尚未为model对象初始化数据存储。" @@ -111,7 +111,7 @@ msgstr "无法登录iSCSI主机%(host)s上的目标%(target)s。" #, python-format msgid "Unable to find ISO file %(filename)s" -msgstr "" +msgstr "未能找到ISO文件 %(filename)s" #, python-format msgid "The ISO file %(filename)s is not bootable" @@ -141,8 +141,8 @@ msgstr "ISO文件%(filename)s的卷描述符格式错误" msgid "" "The hypervisor doesn't have permission to use this ISO %(filename)s. " "Consider moving it under /var/lib/libvirt, or set the search permission to " -"file access control lists for '%(user)s' user if possible, or add the " -"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " +"file access control lists for '%(user)s' user if possible, or add the '%" +"(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" msgstr "" "hypervisor没有访问ISO文件%(filename)s的权限。可以将ISO移到/var/lib/libvirt目" @@ -150,14 +150,14 @@ msgstr "" "或者为所有的用户增加访问权限 'chmod -R o+x '（不推荐）。详情：%(err)s" msgid "An error occurred when probing image OS information." -msgstr "" +msgstr "搜索镜像操作系统信息时发生错误。" msgid "No OS information found in given image." -msgstr "" +msgstr "在指定的镜像文件中未发现操作系统信息。" #, python-format msgid "Unable to read image file %(filename)s" -msgstr "" +msgstr "未能读取镜像文件 %(filename)s" #, python-format msgid "Virtual machine %(name)s already exists" @@ -172,6 +172,8 @@ msgid "" "Unable to rename virtual machine %(name)s. The name %(new_name)s is already " "in use or the virtual machine is not powered off." msgstr "" +"未能实现虚拟机 %(name)s 重命名，名称 %(new_name)s 已被使用或者该虚拟机未关" +"机。" #, python-format msgid "Unable to retrieve screenshot for stopped virtual machine %(name)s" @@ -182,7 +184,7 @@ msgstr "该服务器不支持远程ISO镜像。" #, python-format msgid "Screenshot is not supported on virtual machine %(name)s" -msgstr "" +msgstr "虚拟机 %(name)s 不支持快照" #, python-format msgid "Unable to create virtual machine %(name)s. Details: %(err)s" @@ -198,21 +200,21 @@ msgstr "不能获取虚拟机%(name)s。详情：%(err)s" #, python-format msgid "Unable to connect to powered off virtual machine %(name)s." -msgstr "" +msgstr "虚拟机 %(name)s 连接关闭失败。" msgid "Virtual machine name must be a string" msgstr "虚拟机名字必须是个字符串" #, python-format msgid "Invalid template URI %(value)s specified for virtual machine" -msgstr "" +msgstr "无效的虚拟机模板URI %(value)s" #, python-format msgid "Invalid storage pool URI %(value)s specified for virtual machine" -msgstr "" +msgstr "无效的虚拟机存储池URI %(value)s" msgid "Supported virtual machine graphics are Spice or VNC" -msgstr "" +msgstr "虚拟机图形界面仅支持Spice以及VNC" msgid "Graphics address to listen on must be IPv4 or IPv6" msgstr "远程图形访问的监听地址必须是IPv4或IPv6地址。" @@ -237,13 +239,13 @@ msgid "Unable to reset virtual machine %(name)s. Details: %(err)s" msgstr "未能重置虚拟机%(name)s。详情：%(err)s" msgid "User name list must be an array" -msgstr "" +msgstr "用户名列表必须为一个数组" msgid "User name must be a string" msgstr "用户名必须是一个字符串" msgid "Group name list must be an array" -msgstr "" +msgstr "组名称列表必须为一个数组" msgid "Group name must be a string" msgstr "用户组名称必须是一个字符串" @@ -266,10 +268,10 @@ msgid "" msgstr "无法获得虚拟机 %(name)s的元数据，详情：%(err)s" msgid "The guest console password must be a string." -msgstr "" +msgstr "客户机控制台密码必须为一个字符串。" msgid "The life time for the guest console password must be a number." -msgstr "" +msgstr "客户机命令行密码有效时间必须是一个数字。" #, python-format msgid "Interface %(iface)s does not exist in virtual machine %(name)s" @@ -354,17 +356,17 @@ msgid "Invalid storage pool URI %(value)s specified for template" msgstr "给模板指定了无效的存储池URI %(value)s" msgid "Specify an ISO image as CDROM or a base image to create a template" -msgstr "" +msgstr "指定一个ISO镜像作为创建模板的CDROM或者基础镜像" msgid "All networks for the template must be specified in a list." msgstr "为模板指定的网络必须在一个列表中" msgid "Specify a volume to a template when storage pool is iSCSI or SCSI" -msgstr "" +msgstr "当存储池类型为iSCSI或者SCSI的时候须为模板指定一个卷" #, python-format msgid "The volume %(volume)s is not in storage pool %(pool)s" -msgstr "" +msgstr "卷%(volume)s不在存储池%(pool)s中" #, python-format msgid "Unable to create template due error: %(err)s" @@ -378,11 +380,11 @@ msgid "Disk size must be greater than 1GB." msgstr "磁盘大小必须大于1GB。" msgid "Template base image must be a valid local image file" -msgstr "" +msgstr "模板基础镜像必须为一个有效的本地镜像文件" #, python-format msgid "Cannot identify base image %(path)s format" -msgstr "" +msgstr "未能识别基础镜像%(path)s格式" #, python-format msgid "Storage pool %(name)s already exists" @@ -410,8 +412,8 @@ msgstr "不能创建存储池 %(name)s。详情： %(err)s" #, python-format msgid "" -"Unable to get number of storage volumes in storage pool %(name)s. Details: " -"%(err)s" +"Unable to get number of storage volumes in storage pool %(name)s. Details: %" +"(err)s" msgstr "不能获取储存池%(name)s中卷的数目。详情： %(err)s" #, python-format @@ -441,7 +443,7 @@ msgstr "不支持的存储池类型：%(type)s" #, python-format msgid "Error while retrieving storage pool XML to %(pool)s" -msgstr "" +msgstr "查询存储池XML到%(pool)s时出现错误" msgid "Storage pool name must be a string" msgstr "存储池名字必须是一个字符串" @@ -449,7 +451,7 @@ msgstr "存储池名字必须是一个字符串" msgid "" "Supported storage pool types are dir, netfs, logical, iscsi, isci and kimchi-" "iso" -msgstr "" +msgstr "存储池类型仅支持dir，netfs，logical，iscsi，isci以及kimchi-iso" msgid "Storage pool path must be a string" msgstr "存储池路径必须是字符串" @@ -458,7 +460,7 @@ msgid "Storage pool host must be a IP or hostname" msgstr "存储池主机必须是一个IP后者主机名" msgid "Storage pool device must be the absolute path to the block device" -msgstr "" +msgstr "存储池设备必须为块设备的一个绝对路径" msgid "Storage pool devices parameter must be a list" msgstr "存储池设备参数必须是一个列表" @@ -470,23 +472,23 @@ msgid "Port of a remote storage server must be an integer between 1 and 65535" msgstr "远程存储服务器的端口必须是1到65535之间的整数" msgid "iSCSI target username must be a string" -msgstr "" +msgstr "iSCSI目标用户名必须为一个字符串" msgid "iSCSI target password must be a string" -msgstr "" +msgstr "iSCSI目标密码必须为一个字符串" msgid "Specify name and type to create a storage pool" msgstr "为新存储池指定名字和类型" #, python-format msgid "" -"%(disk)s is not a valid disk/partition. Could not add it to the pool " -"%(pool)s." +"%(disk)s is not a valid disk/partition. Could not add it to the pool %(pool)" +"s." msgstr "%(disk)s 不是有效的磁盘/分区。不能被添加到存储池%(pool)s中" #, python-format msgid "Unable to extend logical pool %(pool)s. Details: %(err)s" -msgstr "" +msgstr "未能实现逻辑池%(pool)s的扩展，详情：%(err)s" msgid "The parameter disks only can be updated for logical storage pool." msgstr "只有逻辑存储池支持更新磁盘参数。" @@ -540,7 +542,7 @@ msgstr "存储池%(pool)s中没有存储卷%(name)s" msgid "" "Unable to create storage volume %(volume)s because storage pool %(pool)s is " "not active" -msgstr "" +msgstr "未能创建存储卷%(volume)s，因为存储池%(pool)s 未被激活" #, python-format msgid "Specify %(item)s in order to create storage volume %(volume)s" @@ -559,8 +561,8 @@ msgstr "不能列出存储卷，因为存储池%(pool)s没有激活" #, python-format msgid "" -"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: " -"%(err)s" +"Unable to create storage volume %(name)s in storage pool %(pool)s. Details: %" +"(err)s" msgstr "不能在存储池%(pool)s中创建存储卷%(name)s。详情：%(err)s" #, python-format @@ -603,17 +605,17 @@ msgstr "存储卷信息更新失败。详情：%(err)s" #, python-format msgid "Only one of parameter %(param)s can be specified" -msgstr "" +msgstr "只能对参数%(param)s中的一个进行指定" #, python-format msgid "Create volume from %(param)s is not supported" -msgstr "" +msgstr "不支持从%(param)s创建虚拟机" msgid "Storage volume capacity must be an integer number." -msgstr "" +msgstr "存储卷容量必须为一个整数" msgid "Storage volume URL must be http://, https://, ftp:// or ftps://." -msgstr "" +msgstr "存储卷URL必须为http://，https://，ftp://或ftps://" #, python-format msgid "Interface %(name)s does not exist" @@ -711,19 +713,21 @@ msgstr "不能创建诊断报告%(name)s。详情：%(err)s" #, python-format msgid "Can not find any debug report with the given name %(name)s" -msgstr "" +msgstr "未能找到指定名称%(name)s的调试报告" #, python-format msgid "Unable to generate debug report %(name)s. Details: %(err)s" msgstr "不能生成诊断报告%(name)s。详情：%(err)s" msgid "You should give a name for the debug report file." -msgstr "" +msgstr "您应当为调试报告文件指定一个名称。" msgid "" "Debug report name must be a string. Only letters, digits, underscore ('_') " "and hyphen ('-') are allowed." msgstr "" +"调试报告名称必须为一个字符串。只有英文字符，数字，下划线('_')以及连字符('-')" +"为合法字符。" #, python-format msgid "" @@ -780,7 +784,7 @@ msgid "Timeout while running command '%(cmd)s' after %(seconds)s seconds" msgstr "命令'%(cmd)s'运行%(seconds)s秒后超时。" msgid "Unable to choose a virtual machine name" -msgstr "" +msgstr "未能选择一个虚拟机名称" msgid "Invalid vm storage device name" msgstr "无效的虚拟机存储设备名称" @@ -790,21 +794,21 @@ msgstr "无效的存储类型。支持类型为：'cdrom'，'disk'" #, python-format msgid "The path '%(value)s' is not a valid local/remote path for the device" -msgstr "" +msgstr "路径'%(value)s'不是设备的有效本地/远程路径" #, python-format msgid "" "Device name %(dev_name)s already exists in the virtual machine %(vm_name)s" -msgstr "" +msgstr "设备名称%(dev_name)s已经存在于虚拟机%(vm_name)s" msgid "Only CDROM path can be update." -msgstr "" +msgstr "仅支持CDROM路径更新。" #, python-format msgid "" -"The storage device %(dev_name)s does not exist in the virtual machine " -"%(vm_name)s" -msgstr "" +"The storage device %(dev_name)s does not exist in the virtual machine %" +"(vm_name)s" +msgstr "存储设备%(dev_name)s在虚拟机%(vm_name)s中不存在" #, python-format msgid "Error while creating new storage device: %(error)s" @@ -819,7 +823,7 @@ msgid "Error while removing storage device: %(error)s" msgstr "移除存储设备时出错：%(error)s" msgid "Do not support IDE device hot plug" -msgstr "" +msgstr "不支持IDE设备的热插拔" msgid "" "Specify type and path or type and pool/volume to add a new virtual machine " @@ -835,10 +839,10 @@ msgstr "控制器类型为%(type)s的设备达到上限%(limit)s" #, python-format msgid "Cannot retrieve disk path information for given pool/volume: %(error)s" -msgstr "" +msgstr "未能为给出的存储池/存储卷找到对应磁盘路径信息：%(error)s" msgid "Volume already in use by other virtual machine." -msgstr "" +msgstr "该卷已经被其他虚拟机使用。" msgid "" "Only one of path or pool/volume can be specified to add a new virtual " @@ -1148,7 +1152,7 @@ msgid "No such data available." msgstr "没有可用的数据" msgid "Options needed." -msgstr "" +msgstr "需要选项。" msgid "" "Can not contact the host system. Verify the host system is up and that you " @@ -1169,13 +1173,13 @@ msgid "Warning" msgstr "警告" msgid "Creating..." -msgstr "" +msgstr "正在创建..." msgid "Loading..." msgstr "正在加载..." msgid "An error occurred while checking for packages update." -msgstr "" +msgstr "查找软件包更新时出现错误。" msgid "Retry" msgstr "重试" @@ -1184,7 +1188,7 @@ msgid "Detailed message:" msgstr "详细消息：" msgid "No ISO found" -msgstr "" +msgstr "没有发现ISO文件" msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" @@ -1287,7 +1291,7 @@ msgid "Updating..." msgstr "正在更新..." msgid "Failed to retrieve packages update information." -msgstr "" +msgstr "查找软件包更新信息失败。" msgid "Failed to update package(s)." msgstr "更新软件包失败" @@ -1351,11 +1355,11 @@ msgid "Note the guest OS may ignore this request. Would you like to continue?" msgstr "注意，客户机操作系统可能会忽略这个请求，确认要继续吗？" msgid "Virtual Machine delete Confirmation" -msgstr "" +msgstr "虚拟机删除确认" msgid "" "This virtual machine is not persistent. Power Off will delete it. Continue?" -msgstr "" +msgstr "该虚拟机不是一个稳定的虚拟机，关机将会删除它，是否继续？" msgid "" "This CDROM will be detached permanently and you can re-attach it. Continue " @@ -1380,7 +1384,7 @@ msgstr "成功卸载" msgid "" "This disk will be detached permanently and you can re-attach it. Continue to " "detach it?" -msgstr "" +msgstr "该磁盘将会被永久卸载，你可以重新添加它，继续执行卸载操作吗?" msgid "The VLAN id must be between 1 and 4094." msgstr "VLAN 标识符必须在1至4094之间" @@ -1422,46 +1426,46 @@ msgid "No SCSI adapters found." msgstr "没有发现SCSI适配器" msgid "Loading iSCSI targets..." -msgstr "" +msgstr "读取iSCSI目标..." msgid "No iSCSI found. Please input one." -msgstr "" +msgstr "未能找到iSCSI,请输入一个" msgid "Failed to load iSCSI targets." -msgstr "" +msgstr "读取iSCSI目标失败。" msgid "The storage pool name can not be blank." -msgstr "存储池的名称不能为空" +msgstr "存储池的名称不能为空。" msgid "The storage pool path can not be blank." -msgstr "存储池的路径不能为空" +msgstr "存储池的路径不能为空。" msgid "NFS server mount path can not be blank." -msgstr "NFS服务器挂载路径不能为空" +msgstr "NFS服务器挂载路径不能为空。" msgid "Invalid storage pool name. It should not contain '/'." msgstr "无效的存储池的名字。名字中不能包含‘/’。" msgid "Invalid NFS mount path." -msgstr "无效的NFS挂载路径" +msgstr "无效的NFS挂载路径。" msgid "No logical device selected." -msgstr "没有选择逻辑设备" +msgstr "没有选择逻辑设备。" msgid "The iSCSI target can not be blank." -msgstr "iSCSI目标不能为空" +msgstr "iSCSI目标不能为空。" msgid "Server name can not be blank." -msgstr "服务器不能为空" +msgstr "服务器不能为空。" msgid "This is not a valid Server Name or IP. Please, modify it." -msgstr "" +msgstr "这不是你个有效的服务器名称或IP地址，请对其进行修改。" msgid "Looking for available partitions ..." msgstr "查找有效的分区 ..." msgid "No available partitions found." -msgstr "没有发现模板" +msgstr "没有发现模板。" msgid "" "This storage pool is not persistent. Instead of deactivate, this action will " @@ -1469,28 +1473,28 @@ msgid "" msgstr "对于非持久存储池，这个操作将会永久删除存储池而不是停用。是否继续？" msgid "Unable to retrieve partitions information." -msgstr "" +msgstr "未能找到分区信息。" msgid "In progress..." -msgstr "" +msgstr "正在进行..." msgid "Failed!" -msgstr "" +msgstr "失败！" msgid "CDROM path needs to be a valid local/remote path and cannot be blank." -msgstr "" +msgstr "CDROM路径需要一个有效的本地/远程路径且不能为空。" msgid "Disk pool or volume cannot be blank." msgstr "存储池或卷不能为空" msgid "Peers" -msgstr "" +msgstr "对等机" msgid "Searching" -msgstr "" +msgstr "正在查询" msgid "No peers found." -msgstr "" +msgstr "没有发现对等机。" msgid "Help" msgstr "帮助" @@ -1528,15 +1532,15 @@ msgstr "" "含字母、数字、下划线 ('_') 和连字符（'-'）" msgid "Rename a Debug Report" -msgstr "" +msgstr "重命名一个调试报告" msgid "" "The name used to identify the report. Name can contain: letters, digits and " "hyphen (\"-\")." -msgstr "" +msgstr "报告的唯一表示名称，名称可以包含：英文字符，数字和连字符(\"-\")。" msgid "Submit" -msgstr "" +msgstr "提交" msgid "Add a Repository" msgstr "增加一个软件仓库" @@ -1657,19 +1661,19 @@ msgid "Please, wait..." msgstr "请等待..." msgid "Add a Volume to Storage Pool" -msgstr "" +msgstr "为存储池添加一个卷" msgid "Fetch from remote URL" -msgstr "" +msgstr "从远程URL获取" msgid "Enter the remote URL here." -msgstr "" +msgstr "在这里输入远程URL。" msgid "Upload an file" -msgstr "" +msgstr "上传一个文件" msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "" +msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" msgid "Add Template" msgstr "创建模板" @@ -1681,7 +1685,7 @@ msgid "Local ISO Image" msgstr "本地ISO镜像" msgid "Local Image File" -msgstr "" +msgstr "本地镜像文件" msgid "Remote ISO Image" msgstr "远程ISO镜像" @@ -1738,7 +1742,7 @@ msgid "CDROM" msgstr "光驱" msgid "Image File" -msgstr "" +msgstr "镜像文件" msgid "Graphics" msgstr "图形" @@ -1840,7 +1844,7 @@ msgid "Activate" msgstr "激活" msgid "Add Volume" -msgstr "" +msgstr "添加卷" msgid "Extend" msgstr "扩展" -- 1.7.1

2 2

[PATCH] [wip-v1] Create template from guest (BACKEND)
by Rodrigo Trujillo 22 Sep '14

22 Sep '14

This patch implements new functionality that allows user to create a template based on a givem virtual machine. Template will have same number of CPUS, amount of Memory, CDROM attached, disks, etc. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 6 ++++++ src/kimchi/i18n.py | 1 + src/kimchi/model/templates.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c3fc5e3..e1e0218 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -385,6 +385,12 @@ "minimum": 512, "error": "KCHTMPL0013E" }, + "vm": { + "description": "Virtual Machine which template will be based in", + "type": "string", + "minimum": 1, + "error": "KCHTMPL0025E" + }, "cdrom": { "description": "Path for cdrom", "type": "string", diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 2eae7e8..8b9c713 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -130,6 +130,7 @@ messages = { "KCHTMPL0022E": _("Disk size must be greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), + "KCHTMPL0025E": _("Virtual machine name must be a string"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index bf04304..15296b0 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -36,6 +36,7 @@ class TemplatesModel(object): def __init__(self, **kargs): self.objstore = kargs['objstore'] self.conn = kargs['conn'] + self.kargs = kargs def create(self, params): name = params.get('name', '').strip() @@ -68,6 +69,12 @@ class TemplatesModel(object): except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) + + # Template based in a given VM + vm = params.get('vm') + if vm: + params.update(self._get_vm_params(vm)) + # Creates the template class with necessary information # Checkings will be done while creating this class, so any exception # will be raised here @@ -83,6 +90,33 @@ class TemplatesModel(object): return name + def _get_vm_params(self, vm): + from kimchi.model.vms import VMModel + vm_info = VMModel(**self.kargs).lookup(vm) + ret = {} + + # Get CPUs, Memory, Graphics + ret['cpus'] = vm_info['cpus'] + ret['memory'] = vm_info['memory'] + ret['graphics'] = vm_info['graphics'] + + # CDROM + from kimchi.model.vmstorages import VMStoragesModel, VMStorageModel + vmStorages = VMStoragesModel(**self.kargs) + disks = vmStorages.get_list(vm) + vmStorage = VMStorageModel(**self.kargs) + for disk in disks: + disk_info = vmStorage.lookup(vm, disk) + if disk_info['type'] == 'cdrom': + # get first cdrom found + ret['cdrom'] = disk_info['path'] + break + # ToDo: + # Get Disks + # Get StoragePool + # Get Networks + return ret + def get_list(self): with self.objstore as session: return session.get_list('template') -- 1.9.3

3 5

[PATCH] Add firewall instructions to README-federation
by Aline Manera 22 Sep '14

22 Sep '14

To properly run Kimchi with federation on system behind firewall, the user must configure the firewall to do not block multicast responses. Add those instructions to README-federation.md Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/README-federation.md | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/docs/README-federation.md b/docs/README-federation.md index fdf4aed..47adfeb 100644 --- a/docs/README-federation.md +++ b/docs/README-federation.md @@ -10,15 +10,46 @@ virtualization and requires additional software installation. To enable it, do the following: -1) Install openslp and openslp-server packages -2) openSLP uses port 427 (UDP) and port 427 (TCP) so make sure to open those +1. Install openslp and openslp-server packages +2. openSLP uses port 427 (UDP) and port 427 (TCP) so make sure to open those ports in your firewall configuration -3) Start slpd service and make sure it is up while running Kimchi -4) Enable federation on Kimchi by editing the /etc/kimchi/kimchi.conf file: + + For system using firewalld, do: + sudo firewall-cmd --permanent --add-port=427/udp + sudo firewall-cmd --permanent --add-port=427/tcp + sudo firewall-cmd --reload + + For openSUSE systems, do: + sudo /sbin/SuSEfirewall2 open EXT TCP 427 + sudo /sbin/SuSEfirewall2 open EXT UDP 427 + + For system using iptables, do: + sudo iptables -A INPUT -p tcp --dport 427 -j ACCEPT + sudo iptables -A INPUT -p udp --dport 427 -j ACCEPT + +3. In addition to the openSLP ports, you also need to allow multicast in the + firewall configuration + + For system using firewalld, do: + sudo firewall-cmd --direct --add-rule ipv4 filter INPUT 0 -s <subnet> -j ACCEPT + + For openSUSE systems, do: + Add the subnet to the trusted networks listed on FW_TRUSTED_NETS in + /etc/sysconfig/SuSEfirewall2 file. + Make sure to restart /sbin/SuSEfirewall2 after modifying /etc/sysconfig/SuSEfirewall2 + + For system using iptables, do: + sudo iptables -A INPUT -s <subnet> -j ACCEPT + +4. Start slpd service and make sure it is up while running Kimchi + sudo service slpd start + +5. Enable federation on Kimchi by editing the /etc/kimchi/kimchi.conf file: federation = on -5) Then restart Kimchi service +6. Then start Kimchi service + sudo service kimchid start The Kimchi server will be registered on openSLP on server starting up and will be found by other Kimchi peers (with federation feature enabled) in the same -- 1.9.3

2 2

[PATCH] mock: Do not write file when downloading a volume
by Crístian Viana 22 Sep '14

22 Sep '14

The storage volumes created via download in mockmodel are being written to the filesystem. As it is a mock environment, there's no real need to write that file. After running the current tests, the storage pool at "/var/lib/libvirt/images/" has the volume "anyurl.wor.kz" left because of that behaviour. Remove the file writing implementation when creating a volume via download. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 8b58c36..904d335 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -575,13 +575,9 @@ class MockModel(object): pool = self._get_storagepool(pool_name) - file_path = os.path.join(pool.info['path'], name) - - with open(file_path, 'w') as file: - file.write(url) - - params['path'] = file_path + params['path'] = os.path.join(pool.info['path'], name) params['type'] = 'file' + params['base'] = url volume = MockStorageVolume(pool, name, params) pool._volumes[name] = volume -- 1.9.3

2 1

[PATCH] issue #447: Use required parameter in function "refresh"
by Crístian Viana 22 Sep '14

22 Sep '14

The function "refresh" (storage pool) 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 "refresh" with its default value (0). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 237173d..f9f226f 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -132,8 +132,7 @@ class StorageVolumesModel(object): 'err': e.message}) # Refresh to make sure volume can be found in following lookup - pool = StoragePoolModel.get_storagepool(pool_name, self.conn) - pool.refresh() + StoragePoolModel.get_storagepool(pool_name, self.conn).refresh(0) cb('OK', True) def _create_volume_with_capacity(self, cb, params): @@ -209,7 +208,7 @@ class StorageVolumesModel(object): 'pool': pool_name, 'err': e.message}) - StoragePoolModel.get_storagepool(pool_name, self.conn).refresh() + StoragePoolModel.get_storagepool(pool_name, self.conn).refresh(0) cb('OK', True) def get_list(self, pool_name): -- 1.9.3

2 1

[PATCH] Bug 416 Fix
by huoyuxin＠linux.vnet.ibm.com 22 Sep '14

22 Sep '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_edit_main.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.repository_edit_main.js b/ui/js/src/kimchi.repository_edit_main.js index 20340a4..a9a0ca6 100644 --- a/ui/js/src/kimchi.repository_edit_main.js +++ b/ui/js/src/kimchi.repository_edit_main.js @@ -21,10 +21,10 @@ kimchi.repository_edit_main = function() { var saveButton = $('#repository-edit-button-save'); - if(kimchi.host.capabilities['repo_mngt_tool']=="yum") { + if(kimchi.capabilities['repo_mngt_tool']=="yum") { editForm.find('input.deb').prop('disabled', true); } - else if(kimchi.host.capabilities['repo_mngt_tool']=="deb") { + else if(kimchi.capabilities['repo_mngt_tool']=="deb") { editForm.find('input.yum').prop('disabled', true); } -- 1.7.1

2 1

[PATCH] Bug 418 Fix
by huoyuxin＠linux.vnet.ibm.com 22 Sep '14

22 Sep '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.template_add_main.js | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 2d60888..6223c96 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -338,10 +338,12 @@ kimchi.template_add_main = function() { $('#vm-image-local-box-back').click(function(){ kimchi.switchPage('vm-image-local-box', 'iso-type-box', 'right'); }); - $('input', '#vm-image-local-box').on('keyup', function(){ - var isValid = kimchi.template_check_path($(this).val()); - $(this).toggleClass('invalid-field', !isValid); - $('button', $('.body', '#vm-image-local-box')).button(isValid ? "enable" : "disable"); + $('input', '#vm-image-local-box').on('keyup cut paste', function(){ + setTimeout(function(){ + var isValid = kimchi.template_check_path($('input', '#vm-image-local-box').val()); + $('input', '#vm-image-local-box').toggleClass('invalid-field', !isValid); + $('button', $('.body', '#vm-image-local-box')).button(isValid ? "enable" : "disable"); + }, 0); }); $('button', $('.body', '#vm-image-local-box')).button({ disabled: true -- 1.7.1

2 1

[PATCH] Issue #421: Grid Column Header Issue
by Hongliang Wang 22 Sep '14

22 Sep '14

In IE, the grid header columns does not aligned with rows in "Debug Report" and "Software Update". Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index fe097cb..9e9cb01 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -216,7 +216,7 @@ .debug-report-name, .debug-report-time { - width: 200px; + width: 424px; } #id-debug-img { @@ -234,18 +234,14 @@ width: 850px; } -.software-update-id { - width: 30px; -} - .software-update-name, .software-update-repos { - width: 220px; + width: 224px; } .software-update-version, .software-update-arch { - width: 190px; + width: 200px; } .host-panel #software-updates-progress-textarea { @@ -274,7 +270,7 @@ } .host-panel #repositories-grid .repository-enabled { - width: 92px; + width: 88px; } .host-panel #repositories-grid .repository-baseurl.deb { -- 1.8.1.4

2 1

[PATCH 0/2 v4] guest-storage-add: removing 'Storage Name'
by Daniel Henrique Barboza 22 Sep '14

22 Sep '14

These patches removes the option to set the device name of the attached storage from the UI and backend. Daniel Henrique Barboza (2): guest-storage-add: removing "Storage Name" field guest-storage-add: removing "Storage Name" backend support docs/API.md | 1 - po/de_DE.po | 10 --------- po/en_US.po | 8 -------- po/es_ES.po | 10 --------- po/fr_FR.po | 10 --------- po/it_IT.po | 10 --------- po/ja_JP.po | 10 --------- po/kimchi.pot | 8 -------- po/ko_KR.po | 9 -------- po/pt_BR.po | 10 --------- po/ru_RU.po | 10 --------- po/zh_CN.po | 8 -------- po/zh_TW.po | 8 -------- src/kimchi/API.json | 6 ------ src/kimchi/i18n.py | 2 -- src/kimchi/mockmodel.py | 9 ++------ src/kimchi/model/vmstorages.py | 33 ++++++++++++------------------ tests/test_model.py | 5 ----- tests/test_rest.py | 14 ++++++------- ui/js/src/kimchi.guest_storage_add.main.js | 7 +++---- ui/pages/guest-storage-add.html.tmpl | 17 ++++----------- 21 files changed, 28 insertions(+), 177 deletions(-) -- 1.8.3.1

3 6

[PATCH 0/2] Fix unsupported config param for update manager
by lvroyce＠linux.vnet.ibm.com 22 Sep '14

22 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (2): Fix: Avoid passing unexpected config params to repository manager Fix testcases for repository config param src/kimchi/i18n.py | 1 + src/kimchi/repositories.py | 14 +++++++++++--- tests/test_model.py | 9 +++++---- 3 files changed, 17 insertions(+), 7 deletions(-) -- 1.8.3.2

3 10

[PATCH] Add ability to submit custom MAC address on VM network interfaces v2
by bbaude＠redhat.com 22 Sep '14

22 Sep '14

From: Brent Baude <bbaude(a)redhat.com> Resubmitting the custom mac address patch with peer review comments included --- docs/API.md | 1 + src/kimchi/API.json | 4 ++++ src/kimchi/i18n.py | 4 ++++ src/kimchi/model/vmifaces.py | 38 +++++++++++++++++++++++++++++-------- tests/test_model.py | 10 ++++++++++ ui/css/theme-default/guest-edit.css | 4 ++-- ui/js/src/kimchi.guest_edit_main.js | 18 ++++++++++++------ ui/pages/guest-edit.html.tmpl | 11 ++++++++--- 8 files changed, 71 insertions(+), 19 deletions(-) diff --git a/docs/API.md b/docs/API.md index b679ce7..4f92eaa 100644 --- a/docs/API.md +++ b/docs/API.md @@ -221,6 +221,7 @@ Represents all network interfaces attached to a Virtual Machine. interface type is network. * type: The type of VM network interface that libvirt supports. Now kimchi just supports 'network' type. + * custommac: A custom MAC address for the interface ### Sub-Resource: Virtual Machine Network Interface diff --git a/src/kimchi/API.json b/src/kimchi/API.json index b8604d2..cd100dd 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -334,6 +334,10 @@ "type": "string", "pattern": "^ne2k_pci|i82551|i82557b|i82559er|rtl8139|e1000|pcnet|virtio$", "error": "KCHVMIF0006E" + }, + "custommac": { + "description": "optional custom mac address for the network interface", + "type": "string" } } }, diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..da17c6f 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -105,6 +105,10 @@ messages = { "KCHVMIF0006E": _("Invalid network model card specified for virtual machine interface"), "KCHVMIF0007E": _("Specify type and network to add a new virtual machine interface"), "KCHVMIF0008E": _("Specify type and network to update a virtual machine interface"), + "KCHVMIF0009E": _("The custom MAC address %(custommac)s is not properly formatted as 12 character hexadecimal value separated by colons(:)"), + "KCHVMIF0010E": _("The custom MAC address %(custommac)s is already in use on this guest"), + "KCHVMIF0011E": _("Libvirt requires you use a unicast MAC address and %(custommac)s is not"), + "KCHTMPL0001E": _("Template %(name)s already exists"), "KCHTMPL0002E": _("Template %(name)s does not exist"), diff --git a/src/kimchi/model/vmifaces.py b/src/kimchi/model/vmifaces.py index 66b3827..b6de38f 100644 --- a/src/kimchi/model/vmifaces.py +++ b/src/kimchi/model/vmifaces.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import random +import re import libvirt from lxml import etree, objectify @@ -45,6 +46,20 @@ class VMIfacesModel(object): random.randint(0x00, 0xff)] return ':'.join(map(lambda x: "%02x" % x, mac)) + def checkduplicatemacs(vm, custommac): + macs = self.get_list(vm) + if custommac in macs: + raise NotFoundError("KCHVMIF0010E", {'custommac': mac}) + + def validMac(mymac): + pattern = r'^(?i)([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$' + if bool(re.match(pattern, mac)) is not True: + raise NotFoundError("KCHVMIF0009E", {'custommac': mac}) + else: + # Checking for multicast + if (int(mymac.split(":")[0], 16) & 0x1) == 1: + raise NotFoundError("KCHVMIF0011E", {'custommac': mac}) + conn = self.conn.get() networks = conn.listNetworks() + conn.listDefinedNetworks() @@ -56,14 +71,22 @@ class VMIfacesModel(object): if DOM_STATE_MAP[dom.info()[0]] != "shutoff": raise InvalidOperation("KCHVMIF0003E") - macs = (iface.mac.get('address') - for iface in self.get_vmifaces(vm, self.conn)) - - mac = randomMAC() - while True: - if mac not in macs: - break + if 'custommac' not in params: + macs = (iface.mac.get('address') + for iface in self.get_vmifaces(vm, self.conn)) mac = randomMAC() + while True: + if mac not in macs: + break + mac = randomMAC() + + else: + if len(params['custommac']) == 0: + mac = randomMAC() + else: + mac = params["custommac"] + validMac(mac) + checkduplicatemacs(vm, mac) children = [E.mac(address=mac)] ("network" in params.keys() and @@ -75,7 +98,6 @@ class VMIfacesModel(object): xml = etree.tostring(E.interface(*children, **attrib)) dom.attachDeviceFlags(xml, libvirt.VIR_DOMAIN_AFFECT_CURRENT) - return mac @staticmethod diff --git a/tests/test_model.py b/tests/test_model.py index ceedc6f..6a8c592 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -219,6 +219,16 @@ class ModelTests(unittest.TestCase): self.assertEquals("default", iface['network']) self.assertEquals("e1000", iface["model"]) + # custom MAC address test + iface_args = {"type": "network", + "network": "test-network", + "model": "virtio", + "custommac": "52:54:00:17:cd:e7"} + mac = inst.vmifaces_create('kimchi-ifaces', iface_args) + iface = inst.vmiface_lookup('kimchi-ifaces', mac) + self.assertEquals("52:54:00:17:cd:e7", iface['mac']) + rollback.prependDefer(inst.vmiface_delete, 'kimchi-ifaces', mac) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_disk(self): disk_path = '/tmp/existent2.iso' diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..f0e1bb0 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -112,7 +112,7 @@ #form-guest-edit-storage .cell, .guest-edit-interface .cell { display: inline-block; - width: 250px; + width: 150px; } #form-guest-edit-storage .cell.dev { @@ -130,7 +130,7 @@ } .guest-edit-interface .body select { - width: 180px; + width: 150px; padding: 0px; } diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index c281289..7baf296 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -176,7 +176,10 @@ kimchi.guest_edit_main = function() { var toggleEdit = function(item, on){ $("label", item).toggleClass("hide", on); $("select", item).toggleClass("hide", !on); - $(".action-area", item).toggleClass("hide"); + $("input", item).toggleClass("hide", !on); + $(".action-area#editmode", item).toggleClass("hide", !on); + $(".action-area#viewmode", item).toggleClass("hide", on); + }; var addItem = function(data) { var itemNode = $.parseHTML(kimchi.substitute($('#interface-tmpl').html(),data)); @@ -215,20 +218,23 @@ kimchi.guest_edit_main = function() { var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), - type: "network" + type: "network", + custommac: $("input",item).val().toLowerCase() }; - var postUpdate = function(){ + var postUpdate = function(mymac){ $("label", item).text(interface.network); - toggleEdit(item, false); + $("label#custommac", item).text(mymac); + toggleEdit(item.prop, false); }; if(item.prop("id")==""){ kimchi.createGuestInterface(kimchi.selectedGuest, interface, function(data){ item.prop("id", data.mac); - postUpdate(); + $("label#custommac", item).text(data.mac) + postUpdate(data.mac); }); }else{ kimchi.updateGuestInterface(kimchi.selectedGuest, item.prop("id"), interface, function(){ - postUpdate(); + postUpdate(data.mac); }); } }); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..0aa9f3b 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -108,7 +108,8 @@ <div class="header"> <span class="cell">$_("Network")</span> <span class="cell">$_("Type")</span> - <button class="add action-area"></button> + <span class="cell">$_("MAC")</span> + <button id="interfaceadd" class="add action-area"></button> </div> <div class="body"></div> </form> @@ -192,10 +193,14 @@ <span class="cell"> <span>{type}</span> </span> - <span class="action-area {editMode}"> + <span class="cell"> + <label class="{viewMode}" id="custommac">{mac}</label> + <input type="text" id="insertmac" class="{editMode}"/> + </span> + <span class="action-area {editMode}" id="editmode"> <button class="save"></button><button class="cancel"></button> </span> - <span class="action-area {viewMode}"> + <span class="action-area {viewMode}" id="viewmode"> <button class="edit"></button><button class="delete"></button> </span> <div> -- 1.9.3

2 1

[PATCH] Fix issue #419
by Aline Manera 19 Sep '14

19 Sep '14

Aline Manera (1): bug fix: Probe image file only during the template creation src/kimchi/vmtemplate.py | 52 ++++++++++++++++++++++++++---------------------- tests/test_rest.py | 2 +- 2 files changed, 29 insertions(+), 25 deletions(-) -- 1.9.3

2 3

[PATCH] Bug 446 Fix
by huoyuxin＠linux.vnet.ibm.com 19 Sep '14

19 Sep '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_edit_main.js | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 938dfd9..c281289 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -163,7 +163,8 @@ kimchi.guest_edit_main = function() { $(".add", "#form-guest-edit-interface").button({ icons: { primary: "ui-icon-plusthick" }, text: false - }).click(function(){ + }).click(function(evt){ + evt.preventDefault(); addItem({ mac: "", network: "", @@ -192,13 +193,15 @@ kimchi.guest_edit_main = function() { disabled: true, icons: { primary: "ui-icon-pencil" }, text: false - }).click(function(){ + }).click(function(evt){ + evt.preventDefault(); toggleEdit($(this).parent().parent(), true); }); $(".delete", itemNode).button({ icons: { primary: "ui-icon-trash" }, text: false - }).click(function(){ + }).click(function(evt){ + evt.preventDefault(); var item = $(this).parent().parent(); kimchi.deleteGuestInterface(kimchi.selectedGuest, item.prop("id"), function(){ item.remove(); @@ -207,7 +210,8 @@ kimchi.guest_edit_main = function() { $(".save", itemNode).button({ icons: { primary: "ui-icon-disk" }, text: false - }).click(function(){ + }).click(function(evt){ + evt.preventDefault(); var item = $(this).parent().parent(); var interface = { network: $("select", item).val(), @@ -231,7 +235,8 @@ kimchi.guest_edit_main = function() { $(".cancel", itemNode).button({ icons: { primary: "ui-icon-arrowreturnthick-1-w" }, text: false - }).click(function(){ + }).click(function(evt){ + evt.preventDefault(); var item = $(this).parent().parent(); $("label", item).text()==="" ? item.remove() : toggleEdit(item, false); }); @@ -332,7 +337,8 @@ kimchi.guest_edit_main = function() { filterNodes(key, $("#permission-sel-users")); filterNodes(key, $("#permission-sel-groups")); }); - $('#permissionGo').button().click(function() { + $('#permissionGo').button().click(function(evt) { + evt.preventDefault(); $("#permission-avail-users").children(".item-picked").appendTo("#permission-sel-users").removeClass("item-picked"); sortNodes($("#permission-sel-users"), true); $("#permission-avail-groups").children(".item-picked").appendTo("#permission-sel-groups").removeClass("item-picked"); @@ -341,7 +347,8 @@ kimchi.guest_edit_main = function() { filterNodes("", $("#permission-sel-users")); filterNodes("", $("#permission-sel-groups")); }); - $('#permissionBack').button().click(function() { + $('#permissionBack').button().click(function(evt) { + evt.preventDefault(); $("#permission-sel-users").children(".item-picked").appendTo("#permission-avail-users").removeClass("item-picked"); sortNodes($("#permission-avail-users"), true); $("#permission-sel-groups").children(".item-picked").appendTo("#permission-avail-groups").removeClass("item-picked"); -- 1.7.1

2 2

[PATCH] Bug 457 Fix
by huoyuxin＠linux.vnet.ibm.com 19 Sep '14

19 Sep '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.storagepool_add_main.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 618892d..4f1f943 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -351,9 +351,9 @@ kimchi.validateLogicalForm = function () { }; kimchi.addPool = function(event) { - $('#pool-doAdd').hide(); - $('#pool-loading').show(); if (kimchi.validateForm()) { + $('#pool-doAdd').hide(); + $('#pool-loading').show(); var formData = $('#form-pool-add').serializeObject(); delete formData.authname; var poolType = $('#poolTypeId').selectMenu('value'); -- 1.7.1

2 2

[PATCH] Bugfix#420 UI: Pop up errors when log out at "Host" tab
by Wen Wang 19 Sep '14

19 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> 1) This patch fix the error that kimchi cannot log out from "Host" page and log in again to "Host". 2) Fix the bug that UI popup error when loging out from kimchi. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- src/kimchi/root.py | 2 +- ui/js/src/kimchi.main.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kimchi/root.py b/src/kimchi/root.py index 96f551d..6f191eb 100644 --- a/src/kimchi/root.py +++ b/src/kimchi/root.py @@ -108,7 +108,7 @@ class Root(Resource): if page.endswith('.html'): context = template.render('tabs/' + page, data) cherrypy.response.cookie[ - "lastPage"] = "/#tabs/" + page.rstrip(".html") + "lastPage"] = "/#tabs/" + page[:-5] cherrypy.response.cookie['lastPage']['path'] = '/' return context raise cherrypy.HTTPError(404) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 21ffca7..a3305e9 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -39,6 +39,7 @@ kimchi.setupPeers = function(){ }; kimchi.main = function() { + kimchi.isLoggingOut = false; kimchi.popable(); var genTabs = function(tabs) { @@ -253,6 +254,7 @@ kimchi.main = function() { // Perform logging out via Ajax request. $('#btn-logout').on('click', function() { kimchi.logout(function() { + kimchi.isLoggingOut = true; document.location.href = "login.html"; }, function(err) { kimchi.message.error(err.responseJSON.reason); @@ -281,7 +283,7 @@ kimchi.main = function() { document.location.href= isSessionTimeout ? 'login.html?error=sessionTimeout' : 'login.html'; return; } - else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText)) { + else if((jqXHR['status'] == 0) && ("error"==jqXHR.statusText) && !kimchi.isLoggingOut) { kimchi.message.error(i18n['KCHAPI6007E'].replace("%1", jqXHR.state())); } if(ajaxSettings['originalError']) { -- 1.7.1

2 2

[PATCH 00/11] help i18n support
by Paulo Vital 19 Sep '14

19 Sep '14

This patch set adds new languages to improve Kimchi's Help pages i18n support. The new languages are: German (de_DE), Spanish (es_ES), French (fr_FR), Italian (it_IT), Japanese (ja_JP), Korean (ko_KR), Russian (ru_RU) and the Traditional Chinese (zh_TW). Paulo Vital (11): help i18n: Update Makefile to refeclt new languages. help i18n: Add German translation help i18n: Add Spanish translation help i18n: Add French translation help i18n: Add Italian translation help i18n: Add Japanese translation help i18n: Add Korean translation help i18n: Add Russian translation help i18n: Add Traditional Chinese translation help i18n: Update Portuguese (Brazil) translation help i18n: Update Simplified Chinese translation configure.ac | 8 ++ ui/pages/help/Makefile.am | 2 +- ui/pages/help/de_DE/Makefile.am | 23 +++++ ui/pages/help/de_DE/guests.dita | 127 +++++++++++++++++++++++++++ ui/pages/help/de_DE/host.dita | 49 +++++++++++ ui/pages/help/de_DE/network.dita | 62 +++++++++++++ ui/pages/help/de_DE/storage.dita | 86 +++++++++++++++++++ ui/pages/help/de_DE/templates.dita | 112 ++++++++++++++++++++++++ ui/pages/help/es_ES/Makefile.am | 23 +++++ ui/pages/help/es_ES/guests.dita | 120 ++++++++++++++++++++++++++ ui/pages/help/es_ES/host.dita | 49 +++++++++++ ui/pages/help/es_ES/network.dita | 61 +++++++++++++ ui/pages/help/es_ES/storage.dita | 86 +++++++++++++++++++ ui/pages/help/es_ES/templates.dita | 111 ++++++++++++++++++++++++ ui/pages/help/fr_FR/Makefile.am | 23 +++++ ui/pages/help/fr_FR/guests.dita | 130 ++++++++++++++++++++++++++++ ui/pages/help/fr_FR/host.dita | 68 +++++++++++++++ ui/pages/help/fr_FR/network.dita | 67 +++++++++++++++ ui/pages/help/fr_FR/storage.dita | 93 ++++++++++++++++++++ ui/pages/help/fr_FR/templates.dita | 120 ++++++++++++++++++++++++++ ui/pages/help/it_IT/Makefile.am | 23 +++++ ui/pages/help/it_IT/guests.dita | 123 ++++++++++++++++++++++++++ ui/pages/help/it_IT/host.dita | 51 +++++++++++ ui/pages/help/it_IT/network.dita | 63 ++++++++++++++ ui/pages/help/it_IT/storage.dita | 91 ++++++++++++++++++++ ui/pages/help/it_IT/templates.dita | 115 +++++++++++++++++++++++++ ui/pages/help/ja_JP/Makefile.am | 23 +++++ ui/pages/help/ja_JP/guests.dita | 172 +++++++++++++++++++++++++++++++++++++ ui/pages/help/ja_JP/host.dita | 70 +++++++++++++++ ui/pages/help/ja_JP/network.dita | 83 ++++++++++++++++++ ui/pages/help/ja_JP/storage.dita | 120 ++++++++++++++++++++++++++ ui/pages/help/ja_JP/templates.dita | 150 ++++++++++++++++++++++++++++++++ ui/pages/help/ko_KR/Makefile.am | 23 +++++ ui/pages/help/ko_KR/guests.dita | 119 +++++++++++++++++++++++++ ui/pages/help/ko_KR/host.dita | 47 ++++++++++ ui/pages/help/ko_KR/network.dita | 61 +++++++++++++ ui/pages/help/ko_KR/storage.dita | 86 +++++++++++++++++++ ui/pages/help/ko_KR/templates.dita | 111 ++++++++++++++++++++++++ ui/pages/help/pt_BR/guests.dita | 13 ++- ui/pages/help/pt_BR/storage.dita | 8 +- ui/pages/help/pt_BR/templates.dita | 7 +- ui/pages/help/ru_RU/Makefile.am | 23 +++++ ui/pages/help/ru_RU/guests.dita | 122 ++++++++++++++++++++++++++ ui/pages/help/ru_RU/host.dita | 48 +++++++++++ ui/pages/help/ru_RU/network.dita | 61 +++++++++++++ ui/pages/help/ru_RU/storage.dita | 88 +++++++++++++++++++ ui/pages/help/ru_RU/templates.dita | 111 ++++++++++++++++++++++++ ui/pages/help/zh_CN/guests.dita | 16 ++-- ui/pages/help/zh_CN/storage.dita | 6 +- ui/pages/help/zh_CN/templates.dita | 6 +- ui/pages/help/zh_TW/Makefile.am | 23 +++++ ui/pages/help/zh_TW/guests.dita | 120 ++++++++++++++++++++++++++ ui/pages/help/zh_TW/host.dita | 50 +++++++++++ ui/pages/help/zh_TW/network.dita | 61 +++++++++++++ ui/pages/help/zh_TW/storage.dita | 88 +++++++++++++++++++ ui/pages/help/zh_TW/templates.dita | 112 ++++++++++++++++++++++++ 56 files changed, 3885 insertions(+), 29 deletions(-) create mode 100644 ui/pages/help/de_DE/Makefile.am create mode 100644 ui/pages/help/de_DE/guests.dita create mode 100644 ui/pages/help/de_DE/host.dita create mode 100644 ui/pages/help/de_DE/network.dita create mode 100644 ui/pages/help/de_DE/storage.dita create mode 100644 ui/pages/help/de_DE/templates.dita create mode 100644 ui/pages/help/es_ES/Makefile.am create mode 100644 ui/pages/help/es_ES/guests.dita create mode 100644 ui/pages/help/es_ES/host.dita create mode 100644 ui/pages/help/es_ES/network.dita create mode 100644 ui/pages/help/es_ES/storage.dita create mode 100644 ui/pages/help/es_ES/templates.dita create mode 100644 ui/pages/help/fr_FR/Makefile.am create mode 100644 ui/pages/help/fr_FR/guests.dita create mode 100644 ui/pages/help/fr_FR/host.dita create mode 100644 ui/pages/help/fr_FR/network.dita create mode 100644 ui/pages/help/fr_FR/storage.dita create mode 100644 ui/pages/help/fr_FR/templates.dita create mode 100644 ui/pages/help/it_IT/Makefile.am create mode 100644 ui/pages/help/it_IT/guests.dita create mode 100644 ui/pages/help/it_IT/host.dita create mode 100644 ui/pages/help/it_IT/network.dita create mode 100644 ui/pages/help/it_IT/storage.dita create mode 100644 ui/pages/help/it_IT/templates.dita create mode 100644 ui/pages/help/ja_JP/Makefile.am create mode 100644 ui/pages/help/ja_JP/guests.dita create mode 100644 ui/pages/help/ja_JP/host.dita create mode 100644 ui/pages/help/ja_JP/network.dita create mode 100644 ui/pages/help/ja_JP/storage.dita create mode 100644 ui/pages/help/ja_JP/templates.dita create mode 100644 ui/pages/help/ko_KR/Makefile.am create mode 100644 ui/pages/help/ko_KR/guests.dita create mode 100644 ui/pages/help/ko_KR/host.dita create mode 100644 ui/pages/help/ko_KR/network.dita create mode 100644 ui/pages/help/ko_KR/storage.dita create mode 100644 ui/pages/help/ko_KR/templates.dita create mode 100644 ui/pages/help/ru_RU/Makefile.am create mode 100644 ui/pages/help/ru_RU/guests.dita create mode 100644 ui/pages/help/ru_RU/host.dita create mode 100644 ui/pages/help/ru_RU/network.dita create mode 100644 ui/pages/help/ru_RU/storage.dita create mode 100644 ui/pages/help/ru_RU/templates.dita create mode 100644 ui/pages/help/zh_TW/Makefile.am create mode 100644 ui/pages/help/zh_TW/guests.dita create mode 100644 ui/pages/help/zh_TW/host.dita create mode 100644 ui/pages/help/zh_TW/network.dita create mode 100644 ui/pages/help/zh_TW/storage.dita create mode 100644 ui/pages/help/zh_TW/templates.dita -- 1.9.3

2 14

[PATCH] guest_storage_add.main.js: fixing Storage Volume select
by Daniel Henrique Barboza 19 Sep '14

19 Sep '14

The select menu of Storage Volume didn't behave properly in the case where a storage pool with no eligible volumes is selected after a storage pool with valid volumes. The previous values remained in the select menu. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 7 ++++++- ui/js/widgets/select-menu.js | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..59b82e8 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -75,7 +75,12 @@ kimchi.guest_storage_add_main = function() { poolTextbox.change(function() { var options = []; kimchi.listStorageVolumes($(this).val(), function(result) { + if(typeof $('#guest-disk').selectMenu() !== "undefined") { + $('#guest-disk').selectMenu("destroy"); + $(volTextbox).val("").change(); + } $('#guest-disk').selectMenu(); + if (result.length) { $.each(result, function(index, value) { // Only unused volume can be attached @@ -89,9 +94,9 @@ kimchi.guest_storage_add_main = function() { if (options.length) { $(volTextbox).val(options[0].value); $(volTextbox).change(); + $('#guest-disk').selectMenu("setData", options); } } - $('#guest-disk').selectMenu("setData", options); }); }); diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..2b681b9 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -75,6 +75,7 @@ this.selectDiv.removeClass('btn dropdown popable'); this.target.removeClass('input'); this.label.removeClass('input'); + this.label.text(''); this.listControl.removeClass('select-list'); this.listControl.parent().removeClass('popover'); $.Widget.prototype.destroy.call(this); -- 1.8.3.1

3 3

[PATCH 0/2] Fix issue #430: Properly list packages update on openSUSE systems
by Aline Manera 19 Sep '14

19 Sep '14

Also remove useless variables assignment Aline Manera (2): Delete useless variables assignment Fix issue #430: Properly list packages update on openSUSE systems src/kimchi/model/host.py | 2 -- src/kimchi/swupdate.py | 9 +++------ 2 files changed, 3 insertions(+), 8 deletions(-) -- 1.9.3

2 4

[PATCH] Update openSUSE section in docs/README.md
by Aline Manera 19 Sep '14

19 Sep '14

Add nginx package in the dependency list for openSUSE systems. (It is already listed in the kimchi.spec.suse.in file) And also update the repositories section to guide user to get python-parted package. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index 3bdc914..19e8a68 100644 --- a/docs/README.md +++ b/docs/README.md @@ -93,16 +93,18 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml python-parted \ + libxslt-tools python-xml python-parted nginx \ python-libguestfs guestfs-tools python-requests Packages version requirement: python-psutil >= 0.6.0 -*Note for openSUSE users*: Some of the above packages are located in the -openSUSE Systems Management repository. See +*Note for openSUSE users*: Some of the above packages are located in different +openSUSE repositories. See +[this FAQ](http://download.opensuse.org/repositories/home:GRNET:synnefo/) for +python-parted; and [this FAQ](http://download.opensuse.org/repositories/systemsmanagement:/spacewalk… -to get the correct repository based on your openSUSE version. And +for python-ethtool to get the correct repository based on your openSUSE version. And [this FAQ](http://en.opensuse.org/SDB:Add_package_repositories) for more information on how configure your system to access this repository. -- 1.9.3

2 3

[PATCH] Bug 440 Fix
by huoyuxin＠linux.vnet.ibm.com 19 Sep '14

19 Sep '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/widgets/select-menu.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index ad53200..c4b0209 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -36,8 +36,10 @@ var selectedClass = 'active'; var itemTag = 'li'; var item; + that.listControl.find('li').remove(); + that.label.text(""); + that.target.val(""); if (options.length > 0) { - that.listControl.find('li').remove(); $.each(options, function(index, option) { item = $('<' + itemTag + '>' + option.label +'</' + itemTag + '>'); item.data('value', option.value); @@ -58,8 +60,6 @@ that.target.change(); } }); - } else { - kimchi.message.error.code('KCHAPI6006E'); } }, -- 1.7.1

2 1

[PATCH v3] guest-storage-add: removing "Storage Name" field
by Daniel Henrique Barboza 19 Sep '14

19 Sep '14

This specific field adds very little to the user experience in comparison with the effort required to mantain it. This patch removes it from the UI, making the "Add a Storage Device to VM" window simpler. Backend support of specifying dev name is left as is because it can be helpful in testing/debugging. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- po/de_DE.po | 10 ---------- po/en_US.po | 8 -------- po/es_ES.po | 10 ---------- po/fr_FR.po | 10 ---------- po/it_IT.po | 10 ---------- po/ja_JP.po | 10 ---------- po/kimchi.pot | 8 -------- po/ko_KR.po | 9 --------- po/pt_BR.po | 10 ---------- po/ru_RU.po | 10 ---------- po/zh_CN.po | 8 -------- po/zh_TW.po | 8 -------- ui/js/src/kimchi.guest_storage_add.main.js | 7 +++---- ui/pages/guest-storage-add.html.tmpl | 17 ++++------------- 14 files changed, 7 insertions(+), 128 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 06d8c38..3c8a3a9 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1183,16 +1183,6 @@ msgstr "Löschen" msgid "Add a Storage Device to VM" msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" -msgid "Device Name" -msgstr "Einheitenname" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"Der Name, mit dem die Einheit gekennzeichnet wird. Falls er ausgelassen " -"wird, wird automatisch ein Name gewählt." - msgid "Device Type" msgstr "Einheitentyp" diff --git a/po/en_US.po b/po/en_US.po index 11fcec9..bc851b2 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1057,14 +1057,6 @@ msgstr "" msgid "Add a Storage Device to VM" msgstr "" -msgid "Device Name" -msgstr "" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" - msgid "Device Type" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 4aec448..d966fd6 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1201,16 +1201,6 @@ msgstr "Suprimir" msgid "Add a Storage Device to VM" msgstr "Añadir un dispositivo de almacenamiento a VM" -msgid "Device Name" -msgstr "Nombre de dispositivo" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"El nombre que se utiliza para identificar el dispositivo. Si se omite, se " -"elegirá un nombre automáticamente" - msgid "Device Type" msgstr "Tipo de dispositivo" diff --git a/po/fr_FR.po b/po/fr_FR.po index 6b2bd2d..c4746d0 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1189,16 +1189,6 @@ msgstr "Supprimer" msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" -msgid "Device Name" -msgstr "Nom de Périphérique" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"Le nom utilisé pour identifier le périphérique. Si omis, un nom sera choisi " -"automatiquement." - msgid "Device Type" msgstr "Type de Périphérique" diff --git a/po/it_IT.po b/po/it_IT.po index 3293fa2..cb6ea0f 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1170,16 +1170,6 @@ msgstr "Elimina" msgid "Add a Storage Device to VM" msgstr "Aggiungi un dispositivo di memoria alla VM" -msgid "Device Name" -msgstr "Nome dispositivo" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"Il nome utilizzato per identificare il dispositivo. Se omesso, ne verrà " -"scelto uno automaticamente." - msgid "Device Type" msgstr "Tipo dispositivo" diff --git a/po/ja_JP.po b/po/ja_JP.po index a2740bf..fd419ce 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1182,16 +1182,6 @@ msgstr "削除" msgid "Add a Storage Device to VM" msgstr "VM にストレージ・デバイスを追加" -msgid "Device Name" -msgstr "デバイス名" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"名前はデバイスを識別するために使用されます。省略すると、名前は自動的に選択さ" -"れます。" - msgid "Device Type" msgstr "デバイス・タイプ" diff --git a/po/kimchi.pot b/po/kimchi.pot index cd0a1ac..53d32ef 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -1057,14 +1057,6 @@ msgstr "" msgid "Add a Storage Device to VM" msgstr "" -msgid "Device Name" -msgstr "" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" - msgid "Device Type" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 20e8a0f..0a7e8ac 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1113,15 +1113,6 @@ msgstr "삭제" msgid "Add a Storage Device to VM" msgstr "스토리지 장치를 VM에 추가" -msgid "Device Name" -msgstr "장치 이름" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"장치를 식별하는 데 사용되는 이름입니다. 생략 시 이름이 자동으로 선택됩니다." - msgid "Device Type" msgstr "장치 유형" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7d18a2d..d94cd11 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1189,16 +1189,6 @@ msgstr "Remover" msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" -msgid "Device Name" -msgstr "Nome do dispositivo" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"O nome usado para identificar o dispositivo. Se omitido, um nome será " -"escolhido automaticamente." - msgid "Device Type" msgstr "Tipo do Dispositivo" diff --git a/po/ru_RU.po b/po/ru_RU.po index 069e083..6e542b4 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1113,16 +1113,6 @@ msgstr "Удалить" msgid "Add a Storage Device to VM" msgstr "Добавить устройство хранения в VM" -msgid "Device Name" -msgstr "Имя устройства" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "" -"Имя для идентификации устройства. Если не указано, то имя будет выбрано " -"автоматически." - msgid "Device Type" msgstr "Тип устройства" diff --git a/po/zh_CN.po b/po/zh_CN.po index e6f9ac7..29a615b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1076,14 +1076,6 @@ msgstr "删除" msgid "Add a Storage Device to VM" msgstr "为虚拟机添加一个存储设备" -msgid "Device Name" -msgstr "设备名称" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "设备名称，如果留空系统会自动生成一个" - msgid "Device Type" msgstr "设备类型" diff --git a/po/zh_TW.po b/po/zh_TW.po index 69e1c9a..e084aa7 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1060,14 +1060,6 @@ msgstr "刪除" msgid "Add a Storage Device to VM" msgstr "將儲存裝置新增至 VM" -msgid "Device Name" -msgstr "裝置名稱" - -msgid "" -"The name used to identify the device. If omitted, a name will be chosen " -"automatically." -msgstr "用來識別裝置的名稱。如果省略，則將自動選擇一個名稱。" - msgid "Device Type" msgstr "裝置類型" diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..54ae748 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -28,7 +28,6 @@ kimchi.guest_storage_add_main = function() { var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); - var nameTextbox = $('input[name="dev"]', storageAddForm); var typeTextbox = $('input[name="type"]', storageAddForm); var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); @@ -139,7 +138,7 @@ kimchi.guest_storage_add_main = function() { }; $(submitButton).prop('disabled', true); - $.each([nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', true); val = $(c).val() if (val && val != '') { @@ -150,7 +149,7 @@ kimchi.guest_storage_add_main = function() { validateSpecifiedForm = validator[settings['type']]; if (!validateSpecifiedForm(settings)) { $(submitButton).prop('disabled', false); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); return false; @@ -167,7 +166,7 @@ kimchi.guest_storage_add_main = function() { result['responseJSON']['reason']; kimchi.message.error(errText); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); $(submitButton).removeClass('loading').text(i18n['KCHVMCD6002M']); diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index ca064fc..c991f42 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -29,16 +29,7 @@ <div class="content"> <form id="form-guest-storage-add"> <section class="form-section"> - <h2>1. $_("Device Name")</h2> - <div class="field"> - <p class="text-help"> - $_("The name used to identify the device. If omitted, a name will be chosen automatically.") - </p> - <input type="text" class="text" name="dev" /> - </div> - </section> - <section class="form-section"> - <h2>2. $_("Device Type")</h2> + <h2>1. $_("Device Type")</h2> <div class="field"> <p class="text-help"> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported.") @@ -55,7 +46,7 @@ </section> <div class="volume-section hidden"> <section class="form-section"> - <h2>4. $_("Storage Pool")</h2> + <h2>2. $_("Storage Pool")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage pool which volume located in") @@ -70,7 +61,7 @@ </div> </section> <section class="form-section"> - <h2>5. $_("Storage Volume")</h2> + <h2>3. $_("Storage Volume")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage volume to be attached") @@ -87,7 +78,7 @@ </div> <div class="path-section"> <section class="form-section"> - <h2>4. $_("File Path")</h2> + <h2>2. $_("File Path")</h2> <div class="field"> <p class="text-help"> $_("The ISO file path in the server for CDROM.") -- 1.8.3.1

6 7

[PATCHv2] issue#433: Fix fake url for repository test
by lvroyce＠linux.vnet.ibm.com 19 Sep '14

19 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When using apt, the base url needs to be validated, a fake url will be rejected by kimchi, causing: Traceback (most recent call last): File "../kimchi/tests/test_model.py", line 1443, in test_repository_disable_enable repo_id = inst.repositories_create(repo) File "../kimchi/src/kimchi/model/host.py", line 406, in create return self.host_repositories.addRepository(params) File "../kimchi/src/kimchi/repositories.py", line 54, in addRepository return self._pkg_mnger.addRepo(params) File "../kimchi/src/kimchi/repositories.py", line 426, in addRepo validate_repo_url(uri) File "../kimchi/src/kimchi/utils.py", line 307, in validate_repo_url raise InvalidParameter("KCHUTILS0001E", {'uri': url}) InvalidParameter: KCHUTILS0001E: Invalid URI http://br.archive.ubuntu.com/kimchi/fake So give a valid url in testcase instead of a fake one. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- tests/test_model.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 0a709a7..123f031 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1290,9 +1290,9 @@ class ModelTests(unittest.TestCase): {'mirrorlist': 'http://www.fedoraproject.org', 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}}] - deb_repos = [{'baseurl': 'http://br.archive.ubuntu.com/kimchi/fake', + deb_repos = [{'baseurl': 'http://br.archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}}, - {'baseurl': 'http://br.archive.kimchi.com/ubuntu/fake', + {'baseurl': 'http://br.archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal', 'comps': ['main']}}] repo_type = inst.capabilities_lookup()['repo_mngt_tool'] @@ -1361,9 +1361,9 @@ class ModelTests(unittest.TestCase): 'baseurl': 'http://www.fedora.org'} yum_new_repo = {'baseurl': 'http://www.fedoraproject.org'} - deb_repo = {'baseurl': 'http://br.archive.ubuntu.com/kimchi/fake', + deb_repo = {'baseurl': 'http://br.archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}} - deb_new_repo = {'baseurl': 'http://archive.canonical.com/kimchi'} + deb_new_repo = {'baseurl': 'http://archive.canonical.com/dist/'} repo_type = inst.capabilities_lookup()['repo_mngt_tool'] if repo_type == 'yum': @@ -1395,7 +1395,7 @@ class ModelTests(unittest.TestCase): repo_id, wrong_repo) # update repositories with invalid mirrorlist - for url in invalid_urls: + for url in invalid_urls and repo_type == 'yum': wrong_repo = {'config': {'mirrorlist': url}} self.assertRaises(InvalidParameter, inst.repository_update, repo_id, wrong_repo) @@ -1416,7 +1416,7 @@ class ModelTests(unittest.TestCase): yum_repo = {'repo_id': 'fedora-fake', 'baseurl': 'http://www.fedora.org'} - deb_repo = {'baseurl': 'http://br.archive.ubuntu.com/kimchi/fake', + deb_repo = {'baseurl': 'http://br.archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}} repo_type = inst.capabilities_lookup()['repo_mngt_tool'] -- 1.8.3.2

3 2

Take over bugs in a self-service way
by Yu Xin Huo 19 Sep '14

19 Sep '14

Aline, can you grant team authority to assign defect to themselves?

1 0

[PATCH V2] Bugfix#426: When no interface available, creating network popup error
by Wen Wang 19 Sep '14

19 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: Add an indicator "(No interfaces found)" in "bridged" option under Network tab when there exists no bridged interface. This patch fix the the issue when creating a network that lack of interface options pops up errors Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/network.css | 6 ++++++ ui/js/src/kimchi.network.js | 11 ++++++----- ui/pages/tabs/network.html.tmpl | 9 +++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/network.css b/ui/css/theme-default/network.css index 6f690ed..5d07468 100644 --- a/ui/css/theme-default/network.css +++ b/ui/css/theme-default/network.css @@ -170,6 +170,12 @@ height: 200px; } +.network-config .section-container .bridged-inline { + display: inline-block; + vertical-align: top; + max-width: 520px; +} + .network-config .section-header { font-weight: bold; font-size: 14px; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 4ee7249..9e2e3aa 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -247,17 +247,16 @@ kimchi.openNetworkDialog = function(okCallback) { kimchi.getInterfaces(function(result) { var options = []; $('#networkDestinationID').selectMenu(); - $("#networkDestinationID").on('click',function(){ - }); var nics = {}; for (var i = 0; i < result.length; i++) { options.push({label:result[i].name,value:result[i].name}); nics[result[i].name] = result[i]; } - $("#networkDestinationID").selectMenu("setData", options); + result.length>0 && $("#networkDestinationID").selectMenu("setData", options); onChange = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); - if (nics[$("#networkDestinationLabel").text()].type === "bridge") { + $("#networkDestinationID li:first-child").addClass("active"); + if (result.length>0 && nics[$("#networkDestinationLabel").text()].type === "bridge") { $("#enableVlan").prop("checked", false); $("#enableVlan").prop("disabled", true); $("#networkVlanID").val(""); @@ -268,8 +267,8 @@ kimchi.openNetworkDialog = function(okCallback) { } }; $("#networkDestinationLabel").on("change", onChange); - onChange(); kimchi.setDefaultNetworkType(result.length!==0); + onChange(); }); $("#networkConfig").dialog({ title : i18n.KCHNET6003M @@ -318,10 +317,12 @@ kimchi.setDefaultNetworkType = function(isInterfaceAvail) { $("#networkTypeNat").prop("checked", !isInterfaceAvail); if (!isInterfaceAvail) { kimchi.enableBridgeOptions(false); + $("#networkBriDisabledLabel").prop("style","display"); } else { $("#bridgeOptions").slideDown(100); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); + $("#networkBriDisabledLabel").attr("style","display:none"); } }; diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 214fb01..b82d15f 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -65,8 +65,13 @@ <label for="networkTypeNat">$_("NAT: outbound physical network connection only")</label> </div> <div class="input-container"> - <input type="radio" id="networkTypeBri" name="networkType" value="bridged" /> - <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> + <div class="bridged-inline"> + <input type="radio" id="networkTypeBri" name="networkType" value="bridged" /> + </div> + <div class="bridged-inline"> + <label for="networkTypeBri">$_("Bridged: Virtual machines are connected to physical network directly")</label> + <label id="networkBriDisabledLabel" style="display:none">$_("(No interfaces found)")</label> + </div> </div> <div id="bridgeOptions"> <div> -- 1.7.1

2 2

[PATCH] issue#433: Fix fake url for repository test
by lvroyce＠linux.vnet.ibm.com 18 Sep '14

18 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When using apt, the base url needs to be validated, a fake url will be rejected by kimchi, causing: Traceback (most recent call last): File "../kimchi/tests/test_model.py", line 1443, in test_repository_disable_enable repo_id = inst.repositories_create(repo) File "../kimchi/src/kimchi/model/host.py", line 406, in create return self.host_repositories.addRepository(params) File "../kimchi/src/kimchi/repositories.py", line 54, in addRepository return self._pkg_mnger.addRepo(params) File "../kimchi/src/kimchi/repositories.py", line 426, in addRepo validate_repo_url(uri) File "../kimchi/src/kimchi/utils.py", line 307, in validate_repo_url raise InvalidParameter("KCHUTILS0001E", {'uri': url}) InvalidParameter: KCHUTILS0001E: Invalid URI http://br.archive.ubuntu.com/kimchi/fake So give a valid url in testcase instead of a fake one. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- tests/test_model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 0a709a7..81fa062 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1290,9 +1290,9 @@ class ModelTests(unittest.TestCase): {'mirrorlist': 'http://www.fedoraproject.org', 'gpgkey': 'file:///tmp/KEY-fedora-updates-fake-19'}}] - deb_repos = [{'baseurl': 'http://br.archive.ubuntu.com/kimchi/fake', + deb_repos = [{'baseurl': 'http://br.archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal'}}, - {'baseurl': 'http://br.archive.kimchi.com/ubuntu/fake', + {'baseurl': 'http://br.archive.ubuntu.com/ubuntu/', 'config': {'dist': 'quantal', 'comps': ['main']}}] repo_type = inst.capabilities_lookup()['repo_mngt_tool'] -- 1.8.3.2

1 0

[PATCH v2] guest-storage-add: removing "Storage Name" field
by Daniel Henrique Barboza 17 Sep '14

17 Sep '14

This specific field adds very little to the user experience in comparison with the effort required to mantain it. This patch removes it from the UI, making the "Add a Storage Device to VM" window simpler. Backend support of specifying dev name is left as is because it can be helpful in testing/debugging. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- po/de_DE.po | 3 --- po/en_US.po | 3 --- po/es_ES.po | 3 --- po/fr_FR.po | 3 --- po/it_IT.po | 3 --- po/ja_JP.po | 3 --- po/kimchi.pot | 3 --- po/ko_KR.po | 3 --- po/pt_BR.po | 3 --- po/ru_RU.po | 3 --- po/zh_CN.po | 3 --- po/zh_TW.po | 3 --- ui/js/src/kimchi.guest_storage_add.main.js | 7 +++---- ui/pages/guest-storage-add.html.tmpl | 17 ++++------------- 14 files changed, 7 insertions(+), 53 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 06d8c38..da6fe9d 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1183,9 +1183,6 @@ msgstr "Löschen" msgid "Add a Storage Device to VM" msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" -msgid "Device Name" -msgstr "Einheitenname" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/en_US.po b/po/en_US.po index 11fcec9..459af07 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1057,9 +1057,6 @@ msgstr "" msgid "Add a Storage Device to VM" msgstr "" -msgid "Device Name" -msgstr "" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/es_ES.po b/po/es_ES.po index 4aec448..96027dc 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1201,9 +1201,6 @@ msgstr "Suprimir" msgid "Add a Storage Device to VM" msgstr "Añadir un dispositivo de almacenamiento a VM" -msgid "Device Name" -msgstr "Nombre de dispositivo" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/fr_FR.po b/po/fr_FR.po index 6b2bd2d..35de2b5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1189,9 +1189,6 @@ msgstr "Supprimer" msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" -msgid "Device Name" -msgstr "Nom de Périphérique" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/it_IT.po b/po/it_IT.po index 3293fa2..672ba1b 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1170,9 +1170,6 @@ msgstr "Elimina" msgid "Add a Storage Device to VM" msgstr "Aggiungi un dispositivo di memoria alla VM" -msgid "Device Name" -msgstr "Nome dispositivo" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/ja_JP.po b/po/ja_JP.po index a2740bf..2915b2a 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1182,9 +1182,6 @@ msgstr "削除" msgid "Add a Storage Device to VM" msgstr "VM にストレージ・デバイスを追加" -msgid "Device Name" -msgstr "デバイス名" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/kimchi.pot b/po/kimchi.pot index cd0a1ac..5421615 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -1057,9 +1057,6 @@ msgstr "" msgid "Add a Storage Device to VM" msgstr "" -msgid "Device Name" -msgstr "" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/ko_KR.po b/po/ko_KR.po index 20e8a0f..b9f8268 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1113,9 +1113,6 @@ msgstr "삭제" msgid "Add a Storage Device to VM" msgstr "스토리지 장치를 VM에 추가" -msgid "Device Name" -msgstr "장치 이름" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/pt_BR.po b/po/pt_BR.po index 7d18a2d..4661585 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1189,9 +1189,6 @@ msgstr "Remover" msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" -msgid "Device Name" -msgstr "Nome do dispositivo" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/ru_RU.po b/po/ru_RU.po index 069e083..d10ed6c 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1113,9 +1113,6 @@ msgstr "Удалить" msgid "Add a Storage Device to VM" msgstr "Добавить устройство хранения в VM" -msgid "Device Name" -msgstr "Имя устройства" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/zh_CN.po b/po/zh_CN.po index e6f9ac7..636dd46 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1076,9 +1076,6 @@ msgstr "删除" msgid "Add a Storage Device to VM" msgstr "为虚拟机添加一个存储设备" -msgid "Device Name" -msgstr "设备名称" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/po/zh_TW.po b/po/zh_TW.po index 69e1c9a..5994802 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1060,9 +1060,6 @@ msgstr "刪除" msgid "Add a Storage Device to VM" msgstr "將儲存裝置新增至 VM" -msgid "Device Name" -msgstr "裝置名稱" - msgid "" "The name used to identify the device. If omitted, a name will be chosen " "automatically." diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..54ae748 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -28,7 +28,6 @@ kimchi.guest_storage_add_main = function() { var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); - var nameTextbox = $('input[name="dev"]', storageAddForm); var typeTextbox = $('input[name="type"]', storageAddForm); var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); @@ -139,7 +138,7 @@ kimchi.guest_storage_add_main = function() { }; $(submitButton).prop('disabled', true); - $.each([nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', true); val = $(c).val() if (val && val != '') { @@ -150,7 +149,7 @@ kimchi.guest_storage_add_main = function() { validateSpecifiedForm = validator[settings['type']]; if (!validateSpecifiedForm(settings)) { $(submitButton).prop('disabled', false); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); return false; @@ -167,7 +166,7 @@ kimchi.guest_storage_add_main = function() { result['responseJSON']['reason']; kimchi.message.error(errText); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); $(submitButton).removeClass('loading').text(i18n['KCHVMCD6002M']); diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index ca064fc..c991f42 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -29,16 +29,7 @@ <div class="content"> <form id="form-guest-storage-add"> <section class="form-section"> - <h2>1. $_("Device Name")</h2> - <div class="field"> - <p class="text-help"> - $_("The name used to identify the device. If omitted, a name will be chosen automatically.") - </p> - <input type="text" class="text" name="dev" /> - </div> - </section> - <section class="form-section"> - <h2>2. $_("Device Type")</h2> + <h2>1. $_("Device Type")</h2> <div class="field"> <p class="text-help"> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported.") @@ -55,7 +46,7 @@ </section> <div class="volume-section hidden"> <section class="form-section"> - <h2>4. $_("Storage Pool")</h2> + <h2>2. $_("Storage Pool")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage pool which volume located in") @@ -70,7 +61,7 @@ </div> </section> <section class="form-section"> - <h2>5. $_("Storage Volume")</h2> + <h2>3. $_("Storage Volume")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage volume to be attached") @@ -87,7 +78,7 @@ </div> <div class="path-section"> <section class="form-section"> - <h2>4. $_("File Path")</h2> + <h2>2. $_("File Path")</h2> <div class="field"> <p class="text-help"> $_("The ISO file path in the server for CDROM.") -- 1.8.3.1

2 1

[PATCH] guest-storage-add: removing "Storage Name" field
by Daniel Henrique Barboza 17 Sep '14

17 Sep '14

This specific field adds very little to the user experience in comparison with the effort required to mantain it. This patch removes it from the UI, making the "Add a Storage Device to VM" window simpler. Backend support of specifying dev name is left as is because it can be helpful in testing/debugging. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 7 +++---- ui/pages/guest-storage-add.html.tmpl | 17 ++++------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index a8c5acb..54ae748 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -28,7 +28,6 @@ kimchi.guest_storage_add_main = function() { var storageAddForm = $('#form-guest-storage-add'); var submitButton = $('#guest-storage-button-add'); - var nameTextbox = $('input[name="dev"]', storageAddForm); var typeTextbox = $('input[name="type"]', storageAddForm); var pathTextbox = $('input[name="path"]', storageAddForm); var poolTextbox = $('input[name="pool"]', storageAddForm); @@ -139,7 +138,7 @@ kimchi.guest_storage_add_main = function() { }; $(submitButton).prop('disabled', true); - $.each([nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', true); val = $(c).val() if (val && val != '') { @@ -150,7 +149,7 @@ kimchi.guest_storage_add_main = function() { validateSpecifiedForm = validator[settings['type']]; if (!validateSpecifiedForm(settings)) { $(submitButton).prop('disabled', false); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); return false; @@ -167,7 +166,7 @@ kimchi.guest_storage_add_main = function() { result['responseJSON']['reason']; kimchi.message.error(errText); - $.each([submitButton, nameTextbox, pathTextbox, poolTextbox, volTextbox], function(i, c) { + $.each([submitButton, pathTextbox, poolTextbox, volTextbox], function(i, c) { $(c).prop('disabled', false); }); $(submitButton).removeClass('loading').text(i18n['KCHVMCD6002M']); diff --git a/ui/pages/guest-storage-add.html.tmpl b/ui/pages/guest-storage-add.html.tmpl index ca064fc..c991f42 100644 --- a/ui/pages/guest-storage-add.html.tmpl +++ b/ui/pages/guest-storage-add.html.tmpl @@ -29,16 +29,7 @@ <div class="content"> <form id="form-guest-storage-add"> <section class="form-section"> - <h2>1. $_("Device Name")</h2> - <div class="field"> - <p class="text-help"> - $_("The name used to identify the device. If omitted, a name will be chosen automatically.") - </p> - <input type="text" class="text" name="dev" /> - </div> - </section> - <section class="form-section"> - <h2>2. $_("Device Type")</h2> + <h2>1. $_("Device Type")</h2> <div class="field"> <p class="text-help"> $_("The device type. Currently, \"cdrom\" and \"disk\" are supported.") @@ -55,7 +46,7 @@ </section> <div class="volume-section hidden"> <section class="form-section"> - <h2>4. $_("Storage Pool")</h2> + <h2>2. $_("Storage Pool")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage pool which volume located in") @@ -70,7 +61,7 @@ </div> </section> <section class="form-section"> - <h2>5. $_("Storage Volume")</h2> + <h2>3. $_("Storage Volume")</h2> <div class="field storage-field"> <p class="text-help"> $_("Storage volume to be attached") @@ -87,7 +78,7 @@ </div> <div class="path-section"> <section class="form-section"> - <h2>4. $_("File Path")</h2> + <h2>2. $_("File Path")</h2> <div class="field"> <p class="text-help"> $_("The ISO file path in the server for CDROM.") -- 1.8.3.1

3 2

[PATCH] vmstorages changes for Power: allow SCSI devs, block IDE devs
by Daniel Henrique Barboza 17 Sep '14

17 Sep '14

Kimchi does not allow scsi devices to be attached in a VM (devices with names sdb,sdc ...). A simple change in API.json regex of vmstorages_create fixes it. At the same time, Power systems does not support IDE devices and adding devices with 'hd[b-z]' name have unpredictable results. This patch also adds a backend verification to avoid this scenario. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 1 + src/kimchi/model/vmstorages.py | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 1319531..4a3cd03 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -489,7 +489,7 @@ "dev": { "description": "The storage device name", "type": "string", - "pattern": "^h|vd[b-z]$", + "pattern": "^h|s|vd[b-z]$", "error": "KCHVMSTOR0001E" }, "type": { diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 9e66c68..0839007 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -259,6 +259,7 @@ messages = { "KCHVMSTOR0015E": _("Cannot retrieve disk path information for given pool/volume: %(error)s"), "KCHVMSTOR0016E": _("Volume already in use by other virtual machine."), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), + "KCHVMSTOR0018E": _("Device name %(dev_name)s is not allowed because Power systems does not support IDE devices"), "KCHREPOS0001E": _("YUM Repository ID must be one word only string."), "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."), diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 40856d3..c302709 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -18,6 +18,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os +import platform +import re import socket import stat import string @@ -188,6 +190,11 @@ class VMStoragesModel(object): string.ascii_lowercase.index(last_dev[2]) + 1 params['dev'] =\ bus_prefix + string.ascii_lowercase[next_dev_letter_pos] + # Power systems does not support IDE devices + elif platform.machine().startswith('ppc') and \ + re.match('^hd[b-z]', params.get('dev')): + raise OperationFailed('KCHVMSTOR0018E', + {'dev_name': params['dev']}) devices = self.get_list(vm_name) if params['dev'] in devices: -- 1.8.3.1

5 7

[PATCH] Bugfix#426: When no interface available, creating network popup error
by Wen Wang 17 Sep '14

17 Sep '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch fix the the issue when creating a network that lack of interface options pops up errors Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 4ee7249..7b0743f 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -247,17 +247,16 @@ kimchi.openNetworkDialog = function(okCallback) { kimchi.getInterfaces(function(result) { var options = []; $('#networkDestinationID').selectMenu(); - $("#networkDestinationID").on('click',function(){ - }); var nics = {}; for (var i = 0; i < result.length; i++) { options.push({label:result[i].name,value:result[i].name}); nics[result[i].name] = result[i]; } - $("#networkDestinationID").selectMenu("setData", options); + result.length>0 && $("#networkDestinationID").selectMenu("setData", options); onChange = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); - if (nics[$("#networkDestinationLabel").text()].type === "bridge") { + $("#networkDestinationID li:first-child").addClass("active"); + if (result.length>0 && nics[$("#networkDestinationLabel").text()].type === "bridge") { $("#enableVlan").prop("checked", false); $("#enableVlan").prop("disabled", true); $("#networkVlanID").val(""); @@ -268,8 +267,8 @@ kimchi.openNetworkDialog = function(okCallback) { } }; $("#networkDestinationLabel").on("change", onChange); - onChange(); kimchi.setDefaultNetworkType(result.length!==0); + onChange(); }); $("#networkConfig").dialog({ title : i18n.KCHNET6003M -- 1.7.1

2 2

[PATCH] Disk image type in vm template - backend
by Daniel Henrique Barboza 17 Sep '14

17 Sep '14

A new parameter called "type" is now allowed in the backend to choose the image type of the VM template. The default image type, if this parameter isn't used, is "qcow2". Examples: - creates a VM template called "opensuse_disktype" with 2 disks, one of them is of type "raw": $ curl -u user:passwd -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/templates -X POST -d'{"name": "opensuse_disktype", "cdrom":"/home/danielhb/Downloads/openSUSE-13.1-DVD-x86_64.iso", "disks":[{"index":0,"size":3}, {"index":1, "size":4, "type":"raw"}]}' - changing the disk types of the template: $ curl -u user:passwd -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/templates/opensuse_disktype -X PUT -d'{"disks":[{"index":0,"size":3, "type":"raw"}, {"index":1, "size":4}]}' Daniel Henrique Barboza (1): Choose disk image type in vm template - backend docs/API.md | 1 + src/kimchi/API.json | 12 ++++++++++++ src/kimchi/i18n.py | 1 + src/kimchi/vmtemplate.py | 5 ++++- 4 files changed, 18 insertions(+), 1 deletion(-) -- 1.8.3.1

4 6

[PATCH] Fix cdrom eject
by lvroyce＠linux.vnet.ibm.com 17 Sep '14

17 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Cdrom eject intended to use POST "/vms/vm-name/vmstorages/hdc" to eject cdrom, while UI used PUT "/vms/vm-name/vmstorages/hdc" to implement this, which makes cdrom eject not working. Adjust backend code to fix this and delete eject action. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/API.md | 2 -- src/kimchi/API.json | 2 +- src/kimchi/control/vm/storages.py | 1 - src/kimchi/model/vmstorages.py | 8 +++----- tests/test_model.py | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/docs/API.md b/docs/API.md index ca64af6..50ed321 100644 --- a/docs/API.md +++ b/docs/API.md @@ -168,8 +168,6 @@ Represents a snapshot of the Virtual Machine's primary monitor. **Actions (POST):** -* eject: Eject cdrom from device. - ### Collection: Templates diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 2e2f9b0..47bc05b 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -522,7 +522,7 @@ "path": { "description": "Path of iso image file or disk mount point", "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", + "pattern": "^(|(/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", "required": true, "error": "KCHVMSTOR0003E" } diff --git a/src/kimchi/control/vm/storages.py b/src/kimchi/control/vm/storages.py index a8a037a..984c4d2 100644 --- a/src/kimchi/control/vm/storages.py +++ b/src/kimchi/control/vm/storages.py @@ -39,7 +39,6 @@ class VMStorage(Resource): self.info = {} self.model_args = [self.vm, self.ident] self.uri_fmt = '/vms/%s/storages/%s' - self.eject = self.generate_action_handler('eject') self.update_params = ['path'] @property diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index 40856d3..54e2685 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -232,8 +232,9 @@ class VMStorageModel(object): raise OperationFailed("KCHVMSTOR0010E", {'error': e.message}) def update(self, vm_name, dev_name, params): - if params.get('path'): - params['src_type'] = _check_path(params['path']) + path = params.get('path') + if path and len(path) != 0: + params['src_type'] = _check_path(path) ignore_source = False else: params['src_type'] = 'file' @@ -251,6 +252,3 @@ class VMStorageModel(object): except Exception as e: raise OperationFailed("KCHVMSTOR0009E", {'error': e.message}) return dev_name - - def eject(self, vm_name, dev_name): - return self.update(vm_name, dev_name, dict()) diff --git a/tests/test_model.py b/tests/test_model.py index 5ee824d..27f5b80 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -382,7 +382,7 @@ class ModelTests(unittest.TestCase): self.assertEquals(iso_path, cdrom_info['path']) # eject cdrom - cdrom_dev = inst.vmstorage_eject(vm_name, cdrom_dev) + cdrom_dev = inst.vmstorage_update(vm_name, cdrom_dev, {'path': ''}) cdrom_info = inst.vmstorage_lookup(vm_name, cdrom_dev) self.assertEquals('', cdrom_info['path']) inst.vm_poweroff(vm_name) -- 1.8.3.2

5 5

Changing graphics type, passwd and validto params
by Brent Baude 17 Sep '14

17 Sep '14

Hi Folks, I have a patch ready that deals with the graphics elements in kimchi. First, I have added serial console as a graphics type along with the existing vnc and spice options. Secondly, I have added the ability to edit the graphics type on a cold guest. You can switch between the platform appropriate options and the next time you boot the vm, it will take effect. One issue I am hitting in completing this function is the recently added options for password and validto time parameters. Neither of these are in the UI but can be set via a curl request evidently. Where I would like some input from the team is around how to handle these in the case of changing the graphics type. The passwd and validto options are only applicable to vnc and spice, so these options will not be preserved if the user changes to serial console. That said, what are people's expectations on saving these values (if they are set) when switching between spice and vnc? I believe the current function will set the validto to 30 seconds if the passwd is set but no validto is provided. Given that the validto is intended to be a short time, should I just set the new validto to 30 seconds as well? Should I just take the current validto and set it the same in the new graphics definition? Since the function is not in the GUI, should I discard both? And finally, is there a value for "never" for validto? Right now, my current line of thinking is this: Because the passwd and validto is not in the GUI, I should discard the values when switching the graphics type unless there is a 'never' value already set. Then I would set both passwd and valueto in the new graphics type. My justification for this line of thinking is that if people know to set these options, then they would know their validto value has probably expired and both would need to be reset. Thoughts and input welcome please. Brent

2 1

Call for translations!
by Aline Manera 16 Sep '14

16 Sep '14

Hi team, It is time to complete the translations for Kimchi 1.3 release. You can do that on Transifex (https://www.transifex.com/projects/p/kimchi/) or by sending patches to the mailing list. Thanks in advance, Aline Manera

1 0

[PATCH v2 0/4] UI: Download Remote Image Feature
by Hongliang Wang 16 Sep '14

16 Sep '14

Implemented download remote image feature. v1 -> v2: 2a) Disabled add volume for inactive and iscsi/scsi pools (Aline's comment) 2b) Removed progress bar after upload/download finished (Aline & Cristian's comment) 2c) Changed the button label to "Add" from "OK" (Cristian's comment) 2d) Made add volume button behave correctly (enabled/disabled) (Cristian's comment) 2e) Removed some code redundent (Aline & Cristian's comment) Hongliang Wang (4): Storage Pool Add Volume UI: Add APIs to kimchi.api.js Storage Pool Add Volume UI: Add i18n Strings Storage Pool Add Volume UI: Implement Download/Upload Volume Function Storage Pool Add Volume UI: Connect the Feature in Storage Tab ui/css/theme-default/storage.css | 31 ++- ui/css/theme-default/storagepool-add-volume.css | 36 ++++ ui/js/src/kimchi.api.js | 37 ++++ ui/js/src/kimchi.storage_main.js | 116 ++++++++++- ui/js/src/kimchi.storagepool_add_volume_main.js | 243 ++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 4 + ui/pages/storagepool-add-volume.html.tmpl | 80 ++++++++ ui/pages/tabs/storage.html.tmpl | 12 +- 8 files changed, 549 insertions(+), 10 deletions(-) create mode 100644 ui/css/theme-default/storagepool-add-volume.css create mode 100644 ui/js/src/kimchi.storagepool_add_volume_main.js create mode 100644 ui/pages/storagepool-add-volume.html.tmpl -- 1.8.1.4

2 18

[PATCH 0/5 V3] Download and upload UI
by Aline Manera 16 Sep '14

16 Sep '14

- Set dataType (dataType: 'json') instead of add Accept header - Use .show() and .hide() to display or not the "Add Volume button" - Allow any type of file to be uploaded - Change upload/download handlers to query for running Tasks while listing storage volumes in a pool That way all users get the same view when a storage volume is being downloaded or uploaded - Disable upload option until we get all issues fixed Aline Manera (1): Disable upload option while adding a volume to a pool Hongliang Wang (4): Storage Pool Add Volume UI: Add APIs to kimchi.api.js Storage Pool Add Volume UI: Add i18n Strings Storage Pool Add Volume UI: Implement Download/Upload Volume Function Storage Pool Add Volume UI: Connect the Feature in Storage Tab ui/css/theme-default/storage.css | 31 +++- ui/css/theme-default/storagepool-add-volume.css | 36 +++++ ui/js/src/kimchi.api.js | 35 +++++ ui/js/src/kimchi.storage_main.js | 196 +++++++++++++++++++++--- ui/js/src/kimchi.storagepool_add_volume_main.js | 107 +++++++++++++ ui/pages/i18n.json.tmpl | 2 + ui/pages/storagepool-add-volume.html.tmpl | 80 ++++++++++ ui/pages/tabs/storage.html.tmpl | 12 +- 8 files changed, 473 insertions(+), 26 deletions(-) create mode 100644 ui/css/theme-default/storagepool-add-volume.css create mode 100644 ui/js/src/kimchi.storagepool_add_volume_main.js create mode 100644 ui/pages/storagepool-add-volume.html.tmpl -- 1.9.3

2 12

[PATCH] API.json: allow scsi storage devices
by Daniel Henrique Barboza 16 Sep '14

16 Sep '14

Kimchi does not allow scsi devices to be attached in a VM (devices with names sdb,sdc ...). A simple change in API.json regex of vmstorages_create fixes it. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 1319531..4a3cd03 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -489,7 +489,7 @@ "dev": { "description": "The storage device name", "type": "string", - "pattern": "^h|vd[b-z]$", + "pattern": "^h|s|vd[b-z]$", "error": "KCHVMSTOR0001E" }, "type": { -- 1.8.3.1

3 3

[PATCH] Adjustments on upload/download UI
by Aline Manera 12 Sep '14

12 Sep '14

- Set dataType (dataType: 'json') instead of add Accept header - Use .show() and .hide() to display or not the "Add Volume button" - Allow any type of file to be uploaded - Change upload/download handlers to query for running Tasks while listing storage volumes in a pool That way all users get the same view when a storage volume is being downloaded or uploaded This patch set was made based on: [Kimchi-devel] [PATCH v2 0/4] UI:Download Remote Image Feature Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.api.js | 4 +- ui/js/src/kimchi.storage_main.js | 195 +++++++++++++++--------- ui/js/src/kimchi.storagepool_add_volume_main.js | 154 ++----------------- 3 files changed, 131 insertions(+), 222 deletions(-) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 0e27987..3398bd4 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1156,9 +1156,7 @@ var kimchi = { data : fd, processData : false, contentType : false, - headers : { - Accept : 'application/json; charset=utf-8' - }, + dataType: 'json', success : suc, error : err }); diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 6c1aade..910f08d 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -42,7 +42,6 @@ kimchi.doListStoragePools = function() { }, function(err) { kimchi.message.error(err.responseJSON.reason); }); - } kimchi.storageBindClick = function() { @@ -85,10 +84,10 @@ kimchi.storageBindClick = function() { $(this).data('type') !== 'iscsi' && $(this).data('type') !== 'scsi'; if(canAddVolume) { - $(this).removeClass('hidden'); + $(this).show(); } else { - $(this).addClass('hidden'); + $(this).hide(); } }); @@ -198,33 +197,80 @@ kimchi._generateVolumeHTML = function(volume) { return kimchi.substitute(volumeHtml, volume); }; -kimchi._updateVolumeBoxUI = function(box, volume) { - var html = kimchi._generateVolumeHTML(volume); - $(box).replaceWith(html); -}; - kimchi.doListVolumes = function(poolObj) { - var volumeDiv = $('#volume' + poolObj.data('name')); + var poolName = poolObj.data('name') + + var getOngoingVolumes = function() { + var result = {} + var filter = 'status=running&target_uri=' + encodeURIComponent('^/storagepools/' + poolName + '/*') + kimchi.getTasksByFilter(filter, function(tasks) { + for(var i = 0; i < tasks.length; i++) { + var volumeName = tasks[i].target_uri.split('/').pop(); + result[volumeName] = tasks[i]; + + if(kimchi.trackingTasks.indexOf(tasks[i].id) >= 0) { + continue; + } + + kimchi.trackTask(tasks[i].id, function(result) { + kimchi.topic('kimchi/volumeTransferFinished').publish(result); + }, function(result) { + kimchi.topic('kimchi/volumeTransferError').publish(result); + }, function(result) { + kimchi.topic('kimchi/volumeTransferProgress').publish(result); + }); + } + }, null, true); + return result; + }; + + var volumeDiv = $('#volume' + poolName); $(volumeDiv).empty(); var slide = poolObj.next('.volumes'); var handleArrow = poolObj.children().last().children(); - kimchi.listStorageVolumes(poolObj.data('name'), function(result) { - var volumeHtml = $('#volumeTmpl').html(); - if (result) { - if (result.length) { - var listHtml = ''; - $.each(result, function(index, value) { - value.poolname = poolObj.data('name'); - listHtml += kimchi._generateVolumeHTML(value); - }); - volumeDiv.html(listHtml); - } else { - volumeDiv.html("<div class='pool-empty'>" + i18n['KCHPOOL6002M'] + "</div>"); + + kimchi.listStorageVolumes(poolName, function(result) { + var listHtml = ''; + var ongoingVolumes = []; + var ongoingVolumesMap = getOngoingVolumes(); + $.each(ongoingVolumesMap, function(volumeName, task) { + ongoingVolumes.push(volumeName) + var volume = { + poolName: poolName, + ref_cnt: 0, + capacity: 0, + name: volumeName, + format: '', + bootable: null, + os_distro: '', + allocation: 0, + os_version: '', + path: '', + type: 'file' + }; + listHtml += kimchi._generateVolumeHTML(volume); + }); + + $.each(result, function(index, value) { + if (ongoingVolumes.indexOf(value.name) == -1) { + value.poolname = poolName; + listHtml += kimchi._generateVolumeHTML(value); } - poolObj.removeClass('in'); - kimchi.changeArrow(handleArrow); - slide.slideDown('slow'); + }); + + if (listHtml.length > 0) { + volumeDiv.html(listHtml); + } else { + volumeDiv.html("<div class='pool-empty'>" + i18n['KCHPOOL6002M'] + "</div>"); } + + $.each(ongoingVolumesMap, function(volumeName, task) { + kimchi.topic('kimchi/volumeTransferProgress').publish(task); + }); + + poolObj.removeClass('in'); + kimchi.changeArrow(handleArrow); + slide.slideDown('slow'); }, function(err) { kimchi.message.error(err.responseJSON.reason); }); @@ -285,74 +331,75 @@ kimchi.storage_main = function() { kimchi.doListStoragePools(); kimchi.initLogicalPoolExtend(); - kimchi.topic('kimchi/allVolumeTasksFinished').subscribe(function(data) { - var sp = data['sp']; - var poolNode = $('.storage-li[data-name="' + sp + '"]'); + kimchi.topic('kimchi/storageVolumeAdded').subscribe(function() { + pool = kimchi.selectedSP; + var poolNode = $('.storage-li[data-name="' + pool + '"]'); kimchi.doListVolumes(poolNode); }); - kimchi.topic('kimchi/volumeTransferStarted').subscribe(function(data) { - var sp = data['sp'], - type = data['type'], - volumeName = data['volume']; - var volumesContainer = $('#volume' + sp); - var volume = { - poolName: sp, - ref_cnt: 0, - capacity: 0, - name: volumeName, - format: '', - bootable: true, - os_distro: '', - allocation: 0, - os_version: '', - path: '', - type: 'file' + kimchi.topic('kimchi/volumeTransferProgress').subscribe(function(result) { + var extractProgressData = function(data) { + var sizeArray = /(\d+)\/(\d+)/g.exec(data) || [0, 0, 0]; + var downloaded = sizeArray[1]; + var percent = 0; + if(downloaded) { + var total = sizeArray[2]; + if(!isNaN(total)) { + percent = downloaded / total * 100; + } + } + var formatted = kimchi.formatMeasurement(downloaded); + var size = (1.0 * formatted['v']).toFixed(1) + formatted['s']; + return { + size: size, + percent: percent + }; }; - if($('.volume-box', volumesContainer).length === 0) { - volumesContainer.empty(); - } - volumesContainer.prepend(kimchi._generateVolumeHTML(volume)); - var volumeBox = $('#volume' + sp + ' [data-volume-name="' + volumeName + '"]'); - $('.volume-progress', volumeBox).removeClass('hidden'); - $('.progress-status', volumeBox).text( - type === 'download' ? i18n['KCHPOOL6014M'] : i18n['KCHPOOL6017M'] - ); - }); - kimchi.topic('kimchi/volumeTransferProgress').subscribe(function(data) { - var sp = data['sp'], - type = data['type'], - volumeName = data['volume'], - size = data['size'], - percent = data['percent']; - volumeBox = $('#volume' + sp + ' [data-volume-name="' + volumeName + '"]'); + var uriElements = result.target_uri.split('/'); + var poolName = uriElements[2]; + var volumeName = uriElements.pop(); + var progress = extractProgressData(result['message']); + var size = progress['size']; + var percent = progress['percent']; + + volumeBox = $('#volume' + poolName + ' [data-volume-name="' + volumeName + '"]'); $('.progress-bar-inner', volumeBox).css({ width: percent + '%' }); - $('.progress-status', volumeBox).text( - type === 'download' ? i18n['KCHPOOL6014M'] : i18n['KCHPOOL6017M'] - ); $('.progress-transferred', volumeBox).text(size); $('.volume-progress', volumeBox).removeClass('hidden'); }); - kimchi.topic('kimchi/volumeTransferFinished').subscribe(function(data) { - var sp = data['sp'], - volumeName = data['volume'], - volumeBox = $('#volume' + sp + ' [data-volume-name="' + volumeName + '"]'); + kimchi.topic('kimchi/volumeTransferFinished').subscribe(function(result) { + var uriElements = result.target_uri.split('/'); + var poolName = uriElements[2]; + var volumeName = uriElements.pop(); + var volumeBox = $('#volume' + poolName + ' [data-volume-name="' + volumeName + '"]'); $('.volume-progress', volumeBox).addClass('hidden'); - kimchi.getStoragePoolVolume(sp, volumeName, function(volume) { - kimchi._updateVolumeBoxUI(volumeBox, volume); + kimchi.getStoragePoolVolume(poolName, volumeName, function(volume) { + var html = kimchi._generateVolumeHTML(volume); + $(volumeBox).replaceWith(html); }, function(err) { kimchi.message.error(err.responseJSON.reason); }); }); - kimchi.topic('kimchi/volumeTransferError').subscribe(function(data) { - var sp = data['sp'], - volumeName = data['volume'], - volumeBox = $('#volume' + sp + ' [data-volume-name="' + volumeName + '"]'); + kimchi.topic('kimchi/volumeTransferError').subscribe(function(result) { + // Error message from Async Task status + if (result['message']) { + var errText = result['message']; + } + // Error message from standard kimchi exception + else { + var errText = result['responseJSON']['reason']; + } + result && kimchi.message.error(errText); + + var uriElements = result.target_uri.split('/'); + var poolName = uriElements[2]; + var volumeName = uriElements.pop(); + volumeBox = $('#volume' + poolName + ' [data-volume-name="' + volumeName + '"]'); $('.progress-status', volumeBox).text(i18n['KCHPOOL6016M']); }); }; diff --git a/ui/js/src/kimchi.storagepool_add_volume_main.js b/ui/js/src/kimchi.storagepool_add_volume_main.js index 9435e28..590ccde 100644 --- a/ui/js/src/kimchi.storagepool_add_volume_main.js +++ b/ui/js/src/kimchi.storagepool_add_volume_main.js @@ -31,8 +31,7 @@ kimchi.sp_add_volume_main = function() { var isValidFile = function() { var fileName = $(localFileBox).val(); - return fileName && - /[Ii][Ss][Oo]/g.test(fileName.split('.').pop()); + return fileName.length > 0; }; $(typeRadios).change(function(event) { @@ -55,142 +54,6 @@ kimchi.sp_add_volume_main = function() { $(addButton).prop('disabled', !isValidFile()); }); - if(!kimchi.volumeTransferTracker) { - kimchi.volumeTransferTracker = (function() { - var tasks = {}, - sps = {}; - var addTask = function(task) { - var taskID = task['id']; - tasks[taskID] = task; - var sp = task['sp']; - if(sps[sp] === undefined) { - sps[sp] = 1; - } - else { - sps[sp]++; - } - }; - var getTask = function(taskID) { - return tasks[taskID]; - }; - var removeTask = function(task) { - var taskID = task['id']; - var sp = tasks[taskID]['sp']; - delete tasks[taskID]; - if(--sps[sp] === 0) { - delete sps[sp]; - kimchi.topic('kimchi/allVolumeTasksFinished').publish({ - sp: sp - }); - } - }; - return { - add: addTask, - get: getTask, - remove: removeTask - }; - })(); - } - var taskTracker = kimchi.volumeTransferTracker; - - var makeCallback = function(trackType, sp, transType, callback) { - return function(resp) { - var taskID = resp['id']; - var volumeName = resp['target_uri'].split('/').pop(); - if(trackType === 'add') { - taskTracker.add({ - id: taskID, - sp: sp, - volume: volumeName - }); - } - callback(transType, resp); - }; - }; - - var extractProgressData = function(data) { - var sizeArray = /(\d+)\/(\d+)/g.exec(data) || [0, 0, 0]; - var downloaded = sizeArray[1]; - var percent = 0; - if(downloaded) { - var total = sizeArray[2]; - if(!isNaN(total)) { - percent = downloaded / total * 100; - } - } - var formatted = kimchi.formatMeasurement(downloaded); - var size = (1.0 * formatted['v']).toFixed(1) + formatted['s']; - return { - size: size, - percent: percent - }; - }; - - var onFinished = function(type, result) { - var progress = extractProgressData(resp['message']); - var task = taskTracker.get([result['id']]); - kimchi.topic('kimchi/volumeTransferFinished').publish($.extend(progress, { - sp: task['sp'], - type: type, - volume: task['volume'] - })); - taskTracker.remove({ - id: result['id'] - }); - }; - - var onProgress = function(type, resp) { - var progress = extractProgressData(resp['message']); - var task = taskTracker.get([resp['id']]); - kimchi.topic('kimchi/volumeTransferProgress').publish($.extend(progress, { - sp: task['sp'], - type: type, - volume: task['volume'] - })); - }; - - var onTransferError = function(type, result) { - if(!result) { - return; - } - var msg = result && (result['message'] || ( - result['responseJSON'] && result['responseJSON']['reason']) - ); - kimchi.message.error(msg); - - if(!result['target_uri']) { - return; - } - var task = taskTracker.get(result['id']); - kimchi.topic('kimchi/volumeTransferError').publish({ - sp: task['sp'], - type: type, - volume: task['volume'] - }); - taskTracker.remove({ - id: result['id'] - }); - }; - - var onAccepted = function(type, resp) { - var taskID = resp['id']; - var task = taskTracker.get(taskID); - kimchi.window.close(); - kimchi.topic('kimchi/volumeTransferStarted').publish({ - sp: task['sp'], - type: type, - volume: task['volume'] - }); - - kimchi.trackTask(taskID, function(resp) { - onFinished(type, resp); - }, function(resp) { - onTransferError(type, resp); - }, function(resp) { - onProgress(type, resp); - }); - }; - var onError = function(result) { $(this).prop('disabled', false); $(typeRadios).prop('disabled', false); @@ -208,11 +71,11 @@ kimchi.sp_add_volume_main = function() { var volumeName = volumeURL.split(/(\\|\/)/g).pop(); kimchi.downloadVolumeToSP({ sp: kimchi.selectedSP, - name: volumeName, url: volumeURL - }, makeCallback('add', kimchi.selectedSP, 'download', onAccepted), - onError - ); + }, function(result) { + kimchi.window.close(); + kimchi.topic('kimchi/storageVolumeAdded').publish(); + }, onError); }; var uploadFile = function() { @@ -224,9 +87,10 @@ kimchi.sp_add_volume_main = function() { kimchi.uploadVolumeToSP({ sp: kimchi.selectedSP, formData: fd - }, makeCallback('add', kimchi.selectedSP, 'upload', onAccepted), - onError - ); + }, function(result) { + kimchi.window.close(); + kimchi.topic('kimchi/storageVolumeAdded').publish(); + }, onError); }; $(addButton).on('click', function(event) { -- 1.9.3

1 0

[PATCH] bug fix: Pass the right data format to run_command()
by Aline Manera 12 Sep '14

12 Sep '14

run_command() expects a list of command and arguments instead of a string. Fix it to avoid error on Kimchi start up on openSUSE systems: [Errno 2] No such file or directory Failed to run command: z y p p e r - - h e l p. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/swupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 5ea36f1..5b24ce0 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -56,7 +56,7 @@ class SoftwareUpdate(object): kimchi_log.info("Loading AptUpdate features.") self._pkg_mnger = AptUpdate() except ImportError: - zypper_help = "zypper --help" + zypper_help = ["zypper", "--help"] (stdout, stderr, returncode) = run_command(zypper_help) if returncode == 0: kimchi_log.info("Loading ZypperUpdate features.") -- 1.9.3

2 2

[PATCH] python 2.6 compatibility: Use 'with' statement only with one context
by Aline Manera 12 Sep '14

12 Sep '14

python 2.6 does not allow specifying multiple contexts in one 'with' statement. And it is used by RHEL6.5 Fix it by specifying just one context per 'with' statement. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index 4d0c231..50055a3 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -168,24 +168,24 @@ class StorageVolumesModel(object): pool = pool_model.lookup(pool_name) file_path = os.path.join(pool['path'], name) - with contextlib.closing(urllib2.urlopen(url)) as response,\ - open(file_path, 'w') as volume_file: - remote_size = response.info().getheader('Content-Length', '-') - downloaded_size = 0 + with contextlib.closing(urllib2.urlopen(url)) as response: + with open(file_path, 'w') as volume_file: + remote_size = response.info().getheader('Content-Length', '-') + downloaded_size = 0 - try: - while True: - chunk_data = response.read(READ_CHUNK_SIZE) - if not chunk_data: - break - - volume_file.write(chunk_data) - downloaded_size += len(chunk_data) - cb('%s/%s' % (downloaded_size, remote_size)) - except Exception, e: - raise OperationFailed('KCHVOL0007E', {'name': name, - 'pool': pool_name, - 'err': e.message}) + try: + while True: + chunk_data = response.read(READ_CHUNK_SIZE) + if not chunk_data: + break + + volume_file.write(chunk_data) + downloaded_size += len(chunk_data) + cb('%s/%s' % (downloaded_size, remote_size)) + except Exception, e: + raise OperationFailed('KCHVOL0007E', {'name': name, + 'pool': pool_name, + 'err': e.message}) StoragePoolModel.get_storagepool(pool_name, self.conn).refresh() cb('OK', True) -- 1.9.3

3 3

[PATCH 0/4] UI: Download Remote Image Feature
by Hongliang Wang 12 Sep '14

12 Sep '14

Implemented download remote image feature. Seems something wrong with /tasks response. The "message" is always "OK" and I can't retrieve the progress information. Dependancies: * [PATCH] storagevolume: Use default value for param 'name' when appropriate Hongliang Wang (4): Download Remote Image UI: Add Common API to kimchi.api.js Download Remote Image UI: Add Corresponding Window Download Remote Image UI: Updated i18n Strings Download Remote Image UI: Implemented the Feature ui/css/theme-default/storage.css | 31 ++++++- ui/css/theme-default/storagepool-add-volume.css | 36 ++++++++ ui/js/src/kimchi.api.js | 49 +++++++++++ ui/js/src/kimchi.storage_main.js | 77 +++++++++++++++-- ui/js/src/kimchi.storagepool_add_volume_main.js | 110 ++++++++++++++++++++++++ ui/pages/i18n.json.tmpl | 3 + ui/pages/storagepool-add-volume.html.tmpl | 80 +++++++++++++++++ ui/pages/tabs/storage.html.tmpl | 12 ++- 8 files changed, 388 insertions(+), 10 deletions(-) create mode 100644 ui/css/theme-default/storagepool-add-volume.css create mode 100644 ui/js/src/kimchi.storagepool_add_volume_main.js create mode 100644 ui/pages/storagepool-add-volume.html.tmpl -- 1.8.1.4

3 18

[PATCH 0/2 V2] Update messages and po files
by Aline Manera 11 Sep '14

11 Sep '14

2 4

[PATCH v2] storagevolume: Use default value for param 'name' when appropriate
by Crístian Viana 11 Sep '14

11 Sep '14

The changelog from the previous patchset (v1) is: - Update the default name method when uploading a file. - Add a default name method for an unexpected operation based on the current time. - Rebase to the latest commit. Crístian Viana (1): storagevolume: Use default value for param 'name' when appropriate src/kimchi/API.json | 2 -- src/kimchi/mockmodel.py | 24 ++++++++++++++++++----- src/kimchi/model/storagevolumes.py | 32 ++++++++++++++++++++++++++----- tests/test_model.py | 18 ++++++++++++------ tests/test_rest.py | 39 +++++++++++++++++++++----------------- 5 files changed, 80 insertions(+), 35 deletions(-) -- 1.9.3

2 2

[PATCH] storagevolume: Use default value for param 'name' when appropriate
by Crístian Viana 11 Sep '14

11 Sep '14

The parameter 'name' is only required when creating storage volumes with the parameter 'capacity' (i.e. an empty volume). When creating volumes with 'url' or 'file', the volume name will have a default value if 'name' is not specified. Use a default name when creating storage volumes from a file or from a URL. The default name will be the file's or the URL's basename. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 2 -- src/kimchi/mockmodel.py | 19 ++++++++++++++----- src/kimchi/model/storagevolumes.py | 26 +++++++++++++++++++++----- tests/test_model.py | 17 +++++++++++------ tests/test_rest.py | 16 ++++++++++++---- 5 files changed, 58 insertions(+), 22 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 8a95804..1319531 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -156,13 +156,11 @@ }, "storagevolumes_create": { "type": "object", - "error": "KCHVOL0016E", "properties": { "name": { "description": "The name of the Storage Volume", "type": "string", "minLength": 1, - "required": true, "error": "KCHVOL0013E" }, "capacity": { diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 15a75af..ef09a5b 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -482,8 +482,9 @@ class MockModel(object): def storagevolumes_create(self, pool_name, params): vol_source = ['file', 'url', 'capacity'] + require_name_params = ['capacity'] - name = params['name'] + name = params.get('name') index_list = list(i for i in range(len(vol_source)) if vol_source[i] in params) @@ -491,12 +492,20 @@ class MockModel(object): raise InvalidParameter("KCHVOL0018E", {'param': ",".join(vol_source)}) + create_param = vol_source[index_list[0]] + + if name is None: + if create_param in require_name_params: + raise InvalidParameter('KCHVOL0016E') + + name = os.path.basename(create_param) + params['name'] = name + try: - create_func = getattr(self, "_create_volume_with_" + - vol_source[index_list[0]]) + create_func = getattr(self, '_create_volume_with_%s' % + create_param) except AttributeError: - raise InvalidParameter("KCHVOL0019E", - {'param': vol_source[index_list[0]]}) + raise InvalidParameter("KCHVOL0019E", {'param': create_param}) pool = self._get_storagepool(pool_name) if pool.info['type'] in READONLY_POOL_TYPE: diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index ef8e684..ec610ac 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -44,6 +44,9 @@ VOLUME_TYPE_MAP = {0: 'file', DOWNLOAD_CHUNK_SIZE = 1048576 # 1 MiB +REQUIRE_NAME_PARAMS = ['capacity'] + + class StorageVolumesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] @@ -53,7 +56,7 @@ class StorageVolumesModel(object): def create(self, pool_name, params): vol_source = ['file', 'url', 'capacity'] - name = params['name'] + name = params.get('name') index_list = list(i for i in range(len(vol_source)) if vol_source[i] in params) @@ -61,12 +64,25 @@ class StorageVolumesModel(object): raise InvalidParameter("KCHVOL0018E", {'param': ",".join(vol_source)}) + create_param = vol_source[index_list[0]] + + if name is None: + # the methods listed in 'REQUIRE_NAME_PARAMS' cannot have + # 'name' == None + if create_param in REQUIRE_NAME_PARAMS: + raise InvalidParameter('KCHVOL0016E') + + # if 'name' is omitted - except for the methods listed in + # 'REQUIRE_NAME_PARAMS' - the default volume name will be the + # file/URL basename. + name = os.path.basename(create_param) + params['name'] = name + try: - create_func = getattr(self, "_create_volume_with_" + - vol_source[index_list[0]]) + create_func = getattr(self, '_create_volume_with_%s' % + create_param) except AttributeError: - raise InvalidParameter("KCHVOL0019E", - {'param': vol_source[index_list[0]]}) + raise InvalidParameter("KCHVOL0019E", {'param': create_param}) pool_info = StoragePoolModel(conn=self.conn, objstore=self.objstore).lookup(pool_name) diff --git a/tests/test_model.py b/tests/test_model.py index 4e9ba97..ecb0a8a 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -526,10 +526,13 @@ class ModelTests(unittest.TestCase): vols = inst.storagevolumes_get_list(pool) num = len(vols) + 2 - params = {'name': vol, - 'capacity': 1024, + params = {'capacity': 1024, 'allocation': 512, 'format': 'raw'} + # 'name' is required for this type of volume + self.assertRaises(InvalidParameter, inst.storagevolumes_create, + pool, params) + params['name'] = vol task_id = inst.storagevolumes_create(pool, params)['id'] self._wait_task(inst, task_id) self.assertEquals('finished', inst.task_lookup(task_id)['status']) @@ -560,20 +563,22 @@ class ModelTests(unittest.TestCase): # download remote volume # 1) try an invalid URL - params = {'name': 'foo', 'url': 'http://www.invalid.url'} + params = {'url': 'http://www.invalid.url'} taskid = inst.storagevolumes_create(pool, params)['id'] self._wait_task(inst, taskid) self.assertEquals('failed', inst.task_lookup(taskid)['status']) # 2) download Kimchi's "COPYING" from Github and compare its # content to the corresponding local file's url = 'https://github.com/kimchi-project/kimchi/raw/master/COPYING' - params = {'name': 'copying', 'url': url} - taskid = inst.storagevolumes_create(pool, params)['id'] + params = {'url': url} + task_response = inst.storagevolumes_create(pool, params) + taskid = task_response['id'] + vol_name = task_response['target_uri'].split('/')[-1] self._wait_task(inst, taskid) self.assertEquals('finished', inst.task_lookup(taskid)['status']) rollback.prependDefer(inst.storagevolume_delete, pool, params['name']) - vol_path = os.path.join(args['path'], params['name']) + vol_path = os.path.join(args['path'], vol_name) self.assertTrue(os.path.isfile(vol_path)) with open(vol_path) as vol_file: vol_content = vol_file.read() diff --git a/tests/test_rest.py b/tests/test_rest.py index ae1c971..a3dcf87 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -489,6 +489,14 @@ class RestTests(unittest.TestCase): resp = self.request('/storagepools/tmp/activate', req, 'POST') self.assertEquals(200, resp.status) + # 'name' is required for this type of volume + req = json.dumps({'capacity': 1024, + 'allocation': 512, + 'type': 'disk', + 'format': 'raw'}) + resp = self.request('/storagepools/tmp/storagevolumes', + req, 'POST') + self.assertEquals(400, resp.status) req = json.dumps({'name': "attach-volume", 'capacity': 1024, 'allocation': 512, @@ -1027,16 +1035,16 @@ class RestTests(unittest.TestCase): self.assertEquals('/var/lib/libvirt/images/volume-1', storagevolume['path']) - req = json.dumps({'name': 'downloaded', - 'url': 'https://anyurl.wor.kz'}) + req = json.dumps({'url': 'https://anyurl.wor.kz'}) resp = self.request('/storagepools/pool-1/storagevolumes', req, 'POST') self.assertEquals(202, resp.status) task = json.loads(resp.read()) self._wait_task(task['id']) task = json.loads(self.request('/tasks/%s' % task['id']).read()) self.assertEquals('finished', task['status']) - resp = self.request('/storagepools/pool-1/storagevolumes/downloaded', - '{}', 'GET') + vol_name = task['target_uri'].split('/')[-1] + resp = self.request('/storagepools/pool-1/storagevolumes/%s' % + vol_name, '{}', 'GET') self.assertEquals(200, resp.status) # Now remove the StoragePool from mock model -- 1.9.3

3 5

Re: [Kimchi-devel] [kimchi] Kimchi failed to start on rhel 6 (#412)
by Yu Xin Huo 11 Sep '14

11 Sep '14

Still fail to start with new error below, updated #412, please fix it and apply the fix asap. Loaded plugins: ibm-check-lotus-updates, ibm-repository, refresh-packagekit, : versionlock Traceback (most recent call last): File "./src/kimchid", line 95, in <module> sys.exit(main(sys.argv[1:])) File "./src/kimchid", line 92, in main kimchi.server.main(options) File "/root/codebase-kimchi/test/kimchi/src/kimchi/server.py", line 179, in main srv = Server(options) File "/root/codebase-kimchi/test/kimchi/src/kimchi/server.py", line 128, in __init__ model_instance = model.Model() File "/root/codebase-kimchi/test/kimchi/src/kimchi/model/model.py", line 58, in __init__ module = import_module('model.' + mod_name) File "/root/codebase-kimchi/test/kimchi/src/kimchi/utils.py", line 139, in import_module return __import__(module_name, globals(), locals(), ['']) File "/root/codebase-kimchi/test/kimchi/src/kimchi/model/storagevolumes.py", line 171 with contextlib.closing(urllib2.urlopen(url)) as response,\ ^ SyntaxError: invalid syntax On 9/11/2014 1:52 AM, Aline Manera wrote: > > Closed #412 <https://github.com/kimchi-project/kimchi/issues/412>. > > — > Reply to this email directly or view it on GitHub > <https://github.com/kimchi-project/kimchi/issues/412#event-163779687>. >

2 1

[PATCH 0/2] Update messages and po files
by Aline Manera 11 Sep '14

11 Sep '14

2 3

[PATCH] Adding ability to switch graphics devices on a cold vm, adds serial console option as well
by bbaude＠redhat.com 11 Sep '14

11 Sep '14

From: Brent Baude <bbaude(a)redhat.com> This patch allows you to change the graphics type for a cold guest. It will also allow a serial choice for ppc64 machines where a user can then run virsh console to deal with low-bandwidth issues. --- src/kimchi/API.json | 5 +- src/kimchi/model/config.py | 2 + src/kimchi/model/vms.py | 177 +++++++++++++++++++++++++++------ src/kimchi/vmtemplate.py | 9 ++ ui/css/theme-default/guest-edit.css | 6 ++ ui/css/theme-default/storage.css | 58 ----------- ui/js/src/kimchi.guest_edit_main.js | 30 +++++- ui/js/src/kimchi.guest_main.js | 23 ++++- ui/js/src/kimchi.template_edit_main.js | 4 + ui/pages/guest-edit.html.tmpl | 21 ++++ ui/pages/guest.html.tmpl | 5 +- ui/pages/i18n.json.tmpl | 1 + ui/pages/tabs/storage.html.tmpl | 4 +- 13 files changed, 246 insertions(+), 99 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 8a95804..335f1fd 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -9,7 +9,7 @@ "type": "object", "properties": { "type": { - "enum": ["spice", "vnc"], + "enum": ["spice", "vnc", "serial"], "error": "KCHVM0014E" }, "listen": { @@ -274,7 +274,8 @@ "type": "integer", "minimum": 512, "error": "KCHTMPL0013E" - } + }, + "graphics": { "$ref": "#/kimchitype/graphics" } } }, "networks_create": { diff --git a/src/kimchi/model/config.py b/src/kimchi/model/config.py index 1c00cfe..0b7ecc3 100644 --- a/src/kimchi/model/config.py +++ b/src/kimchi/model/config.py @@ -20,6 +20,7 @@ from multiprocessing.pool import ThreadPool import cherrypy +import platform from kimchi.basemodel import Singleton from kimchi.config import config as kconfig @@ -106,6 +107,7 @@ class CapabilitiesModel(object): return {'libvirt_stream_protocols': self.libvirt_stream_protocols, 'qemu_spice': self._qemu_support_spice(), 'qemu_stream': self.qemu_stream, + 'hostarch': platform.machine(), 'screenshot': VMScreenshot.get_stream_test_result(), 'system_report_tool': bool(report_tool), 'update_tool': update_tool, diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 58686cd..8f69cef 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -20,10 +20,12 @@ from lxml.builder import E import lxml.etree as ET from lxml import etree, objectify +import platform import os import random import string import time +from datetime import datetime,timedelta import uuid from xml.etree import ElementTree @@ -247,8 +249,13 @@ class VMModel(object): self.groups = import_class('kimchi.model.host.GroupsModel')(**kargs) def update(self, name, params): + if 'ticket' in params: + password = params['ticket'].get("passwd") + password = password if password is not None else "".join( + random.sample(string.ascii_letters + string.digits, 8)) + params['ticket']['passwd'] = password dom = self.get_vm(name, self.conn) - dom = self._static_vm_update(dom, params) + dom = self._static_vm_update(dom, params, name) self._live_vm_update(dom, params) return dom.name().decode('utf-8') @@ -305,41 +312,107 @@ class VMModel(object): os_elem = E.os({"distro": distro, "version": version}) set_metadata_node(dom, os_elem) - def _update_graphics(self, dom, xml, params): - root = objectify.fromstring(xml) - graphics = root.devices.find("graphics") - if graphics is None: + def _update_graphics(self, dom, xml, params, name): +## root = objectify.fromstring(xml) +## graphics = root.devices.find("graphics") + + curgraphics = self._vm_get_graphics(name) + graphics_type, graphics_listen, graphics_port, graphics_password, graphics_validto = curgraphics + + if graphics_type is None : return xml + + if graphics_password != None : params['graphics']['passwd'] = graphics_password + if graphics_validto != None : + params['graphics']['passwdValidTo'] = graphics_validto - password = params['graphics'].get("passwd") - if password is not None and len(password.strip()) == 0: - password = "".join(random.sample(string.ascii_letters + + try: + ## Determine if a change in graphics type has been submitted + if ('graphics' in params) and (params['graphics']['type'] != None): + hasGraphicTypeChange = True + except: + hasGraphicTypeChange = False + + if hasGraphicTypeChange: + newGraphicsType=params['graphics']['type'] + + ## Remove current graphics implementations by node + newxml=xml + root = etree.fromstring(newxml) + devices = root.find("devices") + if graphics_type == 'vnc': + nodeDelete=[devices.find("graphics"),devices.find("video")] + elif graphics_type == 'spice': + nodeDelete=[devices.find("graphics"),devices.find("channel"), devices.find("video")] + elif graphics_type == 'serial': + nodeDelete=[devices.find("serial"),devices.find("console")] + else: + nodeDelete='' + if nodeDelete: + for i in nodeDelete: + devices.remove(i) + ## Add new graphics information back in by node + if newGraphicsType == 'spice': + newchannel=etree.SubElement(devices,'channel',type='spicevmc') + newtarget=etree.SubElement(newchannel,'target',type='virtio',name='com.redhat.spice.0') + newgraphics=etree.SubElement(devices,'graphics',type='spice', listen='127.0.0.1', autoport='yes') + if 'passwd' in params['graphics']: newgraphics.attrib['passwd'] = graphics_password + if 'passwdValidTo' in params['graphics']: newgraphics.attrib['passwdValidTo'] = self._convert_datetime(str(graphics_validto)) + newlisten=etree.SubElement(newgraphics,'listen',type='address',address='127.0.0.1') + elif newGraphicsType == 'vnc': + newgraphics=etree.SubElement(devices,'graphics',type='vnc', listen='127.0.0.1', autoport='yes', port='-1') + newlisten=etree.SubElement(newgraphics,'listen',type='address',address='127.0.0.1') + if 'passwd' in params['graphics']: newgraphics.attrib['passwd'] = graphics_password + if 'passwdValidTo' in params['graphics']: newgraphics.attrib['passwdValidTo'] = self._convert_datetime(str(graphics_validto)) + + elif newGraphicsType == 'serial': + newconsole=etree.SubElement(devices,'console',type='pty') + newtarget=etree.SubElement(newconsole,'target',type='serial', port='0') + newaddress=etree.SubElement(newconsole,'address',type='spapr-vio', reg='0x30000000') + xml = etree.tostring(root) + if ('passwd' in params['graphics']) or ('passwdValidTo' in params['graphics']): + root = objectify.fromstring(xml) + graphics = root.devices.find("graphics") + + password = params['graphics'].get("passwd") + if password is not None and len(password.strip()) == 0: + password = "".join(random.sample(string.ascii_letters + string.digits, 8)) - if password is not None: - graphics.attrib['passwd'] = password + if password is not None: + graphics.attrib['passwd'] = password - expire = params['graphics'].get("passwdValidTo") - to = graphics.attrib.get('passwdValidTo') - if to is not None: - if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) - - time.time() <= 0): - expire = expire if expire is not None else 30 + expire = params['graphics'].get("passwdValidTo") + to = graphics.attrib.get('passwdValidTo') + if to is not None: + if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) + - time.time() <= 0): + expire = expire if expire is not None else 30 - if expire is not None: - expire_time = time.gmtime(time.time() + float(expire)) - valid_to = time.strftime('%Y-%m-%dT%H:%M:%S', expire_time) - graphics.attrib['passwdValidTo'] = valid_to + if expire is not None: + expire_time = time.gmtime(time.time() + float(expire)) + valid_to = time.strftime('%Y-%m-%dT%H:%M:%S', expire_time) + graphics.attrib['passwdValidTo'] = valid_to - if not dom.isActive(): - return ET.tostring(root, encoding="utf-8") + if not dom.isActive(): + return ET.tostring(root, encoding="utf-8") - xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) - dom.updateDeviceFlags(etree.tostring(graphics), + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) + dom.updateDeviceFlags(etree.tostring(graphics), libvirt.VIR_DOMAIN_AFFECT_LIVE) return xml - def _static_vm_update(self, dom, params): + def _convert_datetime(self,deltaseconds): + deltaseconds = int(deltaseconds) + # takes the delta (in seconds) between the current time + # and the expiration time for the vnc password + mycur = datetime.strptime((time.strftime('%Y-%m-%dT%H:%M:%S',time.gmtime())),'%Y-%m-%dT%H:%M:%S') + expiredate = time.strptime((str(mycur + timedelta(seconds=deltaseconds))),'%Y-%m-%d %H:%M:%S') + + return time.strftime('%Y-%m-%dT%H:%M:%S',expiredate) + + + def _static_vm_update(self, dom, params, name): state = DOM_STATE_MAP[dom.info()[0]] old_xml = new_xml = dom.XMLDesc(0) @@ -355,7 +428,7 @@ class VMModel(object): new_xml = xmlutils.xml_item_update(new_xml, xpath, val) if 'graphics' in params: - new_xml = self._update_graphics(dom, new_xml, params) + new_xml = self._update_graphics(dom, new_xml, params, name) conn = self.conn.get() try: @@ -383,15 +456,35 @@ class VMModel(object): dom = ElementTree.fromstring(dom.XMLDesc(0)) return dom.find('devices/video') is not None + def _get_ticket(self, dom): + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) + root = objectify.fromstring(xml) + graphic = root.devices.find("graphics") + if graphic is None: + return {"passwd": None, "expire": None} + passwd = graphic.attrib.get('passwd') + ticket = {"passwd": passwd} + valid_to = graphic.attrib.get('passwdValidTo') + ticket['expire'] = None + if valid_to is not None: + to = time.mktime(time.strptime(valid_to, '%Y-%m-%dT%H:%M:%S')) + ticket['expire'] = to - time.mktime(time.gmtime()) + + return ticket + def lookup(self, name): dom = self.get_vm(name, self.conn) info = dom.info() state = DOM_STATE_MAP[info[0]] screenshot = None - # (type, listen, port, passwd, passwdValidTo) graphics = self._vm_get_graphics(name) + graphics_type = graphics[0] graphics_port = graphics[2] graphics_port = graphics_port if state == 'running' else None + if graphics_type is None and platform.machine() == "ppc64": + ## Checking for ppc64 serial console + graphics_type = "serial" + try: if state == 'running' and self._has_video(dom): screenshot = self.vmscreenshot.lookup(name) @@ -539,8 +632,21 @@ class VMModel(object): expr = "/domain/devices/graphics/@type" res = xmlutils.xpath_get_text(xml, expr) - graphics_type = res[0] if res else None - + if res: + graphics_type = res[0] + else: + ## Checking for serial console, if not + ## returning None + expr = "/domain/devices/console/@type" + res = xmlutils.xpath_get_text(xml, expr) + if res: + if res[0] == "pty": + graphics_type = "serial" + else: + graphics_type = None + else: + graphics_type = None + expr = "/domain/devices/graphics/@listen" res = xmlutils.xpath_get_text(xml, expr) graphics_listen = res[0] if res else None @@ -558,8 +664,15 @@ class VMModel(object): expr = "/domain/devices/graphics[@type='%s']/@passwdValidTo" res = xmlutils.xpath_get_text(xml, expr % graphics_type) if res: - to = time.mktime(time.strptime(res[0], '%Y-%m-%dT%H:%M:%S')) - graphics_passwdValidTo = to - time.mktime(time.gmtime()) + currdate = datetime.strptime((time.strftime('%Y-%m-%dT%H:%M:%S',time.gmtime())),'%Y-%m-%dT%H:%M:%S') + graphics_expiredate = (datetime.strptime(res[0],'%Y-%m-%dT%H:%M:%S')) + mymax = max((currdate, graphics_expiredate)) + expirediff = currdate - graphics_expiredate + if mymax == currdate: + ## time has expired + graphics_passwdValidTo = abs(expirediff).seconds * -1 + else: + graphics_passwdValidTo = abs(expirediff).seconds return (graphics_type, graphics_listen, graphics_port, graphics_passwd, graphics_passwdValidTo) @@ -567,6 +680,8 @@ class VMModel(object): def connect(self, name): # (type, listen, port, passwd, passwdValidTo) graphics_port = self._vm_get_graphics(name)[2] + graphics = self._vm_get_graphics(name) + graphics_type, graphics_listen, graphics_port = graphics if graphics_port is not None: vnc.add_proxy_token(name, graphics_port) else: diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index c5bb7b3..f735d14 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -217,12 +217,21 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> <target type='virtio' name='com.redhat.spice.0'/> </channel> """ + + serial_xml = """ + <console type='pty'> + <target type='serial' port='0'/> + <address type='spapr-vio' reg='0x30000000'/> + </console> + """ graphics = dict(self.info['graphics']) if params: graphics.update(params) graphics_xml = graphics_xml % graphics if graphics['type'] == 'spice': graphics_xml = graphics_xml + spicevmc_xml + elif graphics['type'] == 'serial' : + graphics_xml = serial_xml return graphics_xml def _get_scsi_disks_xml(self): diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 74c2237..8515cda 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -63,6 +63,12 @@ width: 470px; } +.guest-edit-wrapper-controls > .dropdown { + margin: 5px 0 0 1px; + width: 440px; +} + + #form-guest-edit-storage .guest-edit-wrapper-controls { width: 486px; } diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index f635c2f..eeb783c 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -222,64 +222,6 @@ width: 13px; } -.toolable { - position: relative; -} - -.toolable .tooltip { - display: none; - border: 2px solid #0B6BAD; - background: #fff; - padding: 6px; - position: absolute; - color: #666666; - font-weight: bold; - font-size: 11px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - z-index: 100; - top: -300%; - left: -140%; - white-space: nowrap; -} - -.toolable:hover .tooltip { - display: block; -} - -.toolable .tooltip:after { - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - border-color: #fff transparent transparent; - border-image: none; - border-style: solid; - border-width: 7px; - content: ""; - display: block; - left: 15px; - position: absolute; - bottom: -14px; -} - -.toolable .tooltip:before { - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - border-color: #0B6BAD transparent transparent; - border-image: none; - border-style: solid; - border-width: 8px; - content: ""; - display: block; - left: 14px; - position: absolute; - bottom: -18px; -} - .inactive { background: #E80501; background: linear-gradient(to bottom, #E88692 0%, #E84845 50%, diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 938dfd9..2e71736 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -386,6 +386,7 @@ kimchi.guest_edit_main = function() { }; initStorageListeners(); + setupInterface(); setupPermission(); @@ -398,6 +399,31 @@ kimchi.guest_edit_main = function() { kimchi.topic('kimchi/vmCDROMReplaced').unsubscribe(onReplaced); kimchi.topic('kimchi/vmCDROMDetached').unsubscribe(onDetached); }; + + graphics_type = guest.graphics.type + + var graphicsForm = $('#form-guest-edit-general'); + $('input[name="graphics"]', graphicsForm).val(graphics_type); + + + var vncOpt = [{label: 'VNC', value: 'vnc'}]; + kimchi.select('guest-edit-general-graphics-list', vncOpt); + + var enableSpice = function() { + if (kimchi.capabilities == undefined) { + setTimeout(enableSpice, 2000); + return; + } + if (kimchi.capabilities.qemu_spice == true) { + spiceOpt = [{label: 'Spice', value: 'spice'}] + kimchi.select('guest-edit-general-graphics-list', spiceOpt); + } + if (kimchi.capabilities.hostarch == 'ppc64') { + serialOpt = [{label: 'Serial', value: 'serial'}] + kimchi.select('guest-edit-general-graphics-list', serialOpt); + } + }; + enableSpice(); }; kimchi.retrieveVM(kimchi.selectedGuest, initContent); @@ -405,13 +431,15 @@ kimchi.guest_edit_main = function() { var generalSubmit = function(event) { $(saveButton).prop('disabled', true); var data=$('#form-guest-edit-general').serializeObject(); + graphics_type=data.graphics if(data['memory']!=undefined) { data['memory'] = Number(data['memory']); } if(data['cpus']!=undefined) { data['cpus'] = Number(data['cpus']); } - + data['graphics'] = {} + data['graphics']['type'] = graphics_type kimchi.updateVM(kimchi.selectedGuest, data, function() { kimchi.listVmsAuto(); kimchi.window.close(); diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index dbe8753..5731634 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -266,11 +266,26 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { } var consoleActions=guestActions.find("[name=vm-console]"); + if ((vmObject.graphics['type'] == 'vnc') || (vmObject.graphics['type'] == 'spice')) { + if (vmRunningBool) { + consoleActions.on("click", kimchi.openVmConsole); + consoleActions.show(); + } + else { + consoleActions.hide(); + consoleActions.off("click",kimchi.openVmConsole); - if ((vmObject.graphics['type'] == 'vnc') || (vmObject.graphics['type'] == 'spice')) { - consoleActions.on("click", kimchi.openVmConsole); - consoleActions.show(); - } else { //we don't recognize the VMs supported graphics, so hide the menu choice + } + + } + else if ((vmObject.graphics['type'] == 'serial') && (vmRunningBool)) { + consoleActions.prop('disabled', true); + tooltip = $("#connectserial label") + tooltip.show() + tooltip.addClass("tooltip") + consoleActions.show(); + } + else { //we don't recognize the VMs supported graphics, so hide the menu choice consoleActions.hide(); consoleActions.off("click",kimchi.openVmConsole); } diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index cb43091..68d1a07 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -48,6 +48,10 @@ kimchi.template_edit_main = function() { var vncOpt = [{label: 'VNC', value: 'vnc'}]; kimchi.select('template-edit-graphics-list', vncOpt); + if (kimchi.capabilities.hostarch == 'ppc64') { + serialOpt = [{label: 'Serial', value: 'serial'}] + kimchi.select('template-edit-graphics-list', serialOpt); + } var enableSpice = function() { if (kimchi.capabilities == undefined) { setTimeout(enableSpice, 2000); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 0b7dad3..1e5e2b4 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -41,6 +41,7 @@ <li> <a href="#form-guest-edit-permission">$_("Permission")</a> </li> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -93,6 +94,26 @@ type="text" disabled="disabled" /> </div> + + + <div> + <div class="guest-edit-wrapper-label"> + <label for="guest-edit-graphics-textbox"> + $_("Graphics") + </label> + </div> + + <div class="guest-edit-wrapper-controls"> + <div class="btn dropdown popable"> + <input id="guest-edit-general-graphics" name="graphics" type="hidden"/> + + <span class="text" id="guest-edit-general-graphics-label"></span><span class="arrow"></span> + <div class="popover" style="width: 100%"> + <ul class="select-list" id="guest-edit-general-graphics-list" data-target="guest-edit-general-graphics" data-label="guest-edit-general-graphics-label"> + </ul> + </div> + </div> + </div> </div> </fieldset> </form> diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 43fb350..de3b6bd 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -55,7 +55,10 @@ <div name="actionmenu" class="btn dropdown popable vm-action" style="width: 70px"> <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> - <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> + <button class="button-big toolable shutoff-disabled" name="vm-console"><span class="text">$_("Connect")</span><label name="connectserial" class="tooltip connectserial" display="hidden">$_("Use virsh console to connect to this guest")</label></button> +  + + <button class="button-big shutoff-disabled" name="vm-media"><span class="text">$_("Manage Media")</span></button> <button class="button-big running-disabled" name="vm-edit"><span class="text">$_("Edit")</span></button> <button class="button-big shutoff-hidden" name="vm-reset"><span class="text">$_("Reset")</span></button> <button class="button-big shutoff-hidden" name="vm-shutdown"><span class="text">$_("Shut Down")</span></button> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index d920ae2..f25c6bb 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -172,4 +172,5 @@ "KCHVMSTOR0001E": "$_("CDROM path need to be a valid local path and cannot be blank.")", "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")" + } diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 87205bd..563504d 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -58,10 +58,10 @@ </div> <div class="storage-state"> <div class="status-dot toolable active" data-state="{state}"> - <label class="tooltip">$_("active")</label> + <label class="tooltip storage">$_("active")</label> </div> <div class="status-dot toolable inactive" data-state="{state}"> - <label class="tooltip">$_("inactive")</label> + <label class="tooltip storage">$_("inactive")</label> </div> </div> <div class="storage-location"> -- 1.9.3

2 1

[PATCH] i18n support: Update help Makefile with new languages.
by Paulo Vital 10 Sep '14

10 Sep '14

This patch adds the new languages list in ui/pages/help/Makefile.am file to be recursively compiled/built/archived. The new languages are: German (de_DE), Spanish (es_ES), Franch (fr_FR), Italian (it_IT), Japanese (ja_JP), Korean (ko_KR), Russian (ru_RU) and the Traditional Chinese (zh_TW). Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- ui/pages/help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index fa9786b..ca6b3f7 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -14,7 +14,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -SUBDIRS = en_US pt_BR zh_CN +SUBDIRS = en_US pt_BR zh_CN de_DE es_ES fr_FR it_IT ja_JP ko_KR ru_RU zh_TW DITA_HTML_FILES = $(patsubst %.dita,%.html,$(wildcard */*.dita)) HTML_FILES = $(if $(DITA_HTML_FILES), $(DITA_HTML_FILES), $(wildcard */*.html)) -- 1.9.3

4 5

[PATCH] bug fix: Properly set max body size to nginx proxy
by Aline Manera 10 Sep '14

10 Sep '14

Depends on: - [Kimchi-devel] [PATCH] Fix: Use "max_request_body_size" value as int instead of string Aline Manera (1): bug fix: Properly set max body size to nginx proxy src/kimchi/proxy.py | 28 ++++++++++------------- src/nginx.conf.in | 2 ++ tests/test_rest.py | 64 ++++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 65 insertions(+), 29 deletions(-) -- 1.9.3

2 6

[PATCH 0/2 V2] bug fix: Properly set max body size to nginx proxy
by Aline Manera 10 Sep '14

10 Sep '14

V1 -> V2: - Close file descriptors in test cases - Set max body size unit on nginx config file. For it add {} around Kimchi variables Aline Manera (2): Identify Kimchi variables from nginx config variables in nginx.conf.in file bug fix: Properly set max body size to nginx proxy src/kimchi/proxy.py | 25 +++++++------------ src/nginx.conf.in | 18 ++++++++------ tests/test_rest.py | 71 ++++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 73 insertions(+), 41 deletions(-) -- 1.9.3

2 4

[PATCH] model.host: considering older libvirt versions
by Daniel Henrique Barboza 10 Sep '14

10 Sep '14

The last changes in the file didn't consider the case where the fc_host capability isn't implemented by libvirt < 1.0.5 (such as RHEL6 distros). This patch fixes a crash that occurs in such ocasions. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 553ad7c..4637b1c 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -279,8 +279,7 @@ class DevicesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] self.cap_map = \ - {'fc_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST, - 'net': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET, + {'net': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET, 'pci': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_PCI_DEV, 'scsi': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI, 'scsi_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_HOST, @@ -288,6 +287,15 @@ class DevicesModel(object): 'usb_device': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_DEV, 'usb': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_INTERFACE} + # TODO: when no longer supporting Libvirt < 1.0.5 distros + # (like RHEL6) remove this verification and insert the + # key 'fc_host' with the libvirt variable in the hash + # declaration above. + try: + self.cap_map['fc_host'] = \ + libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST + except AttributeError: + self.cap_map['fc_host'] = None def get_list(self, _cap=None): if _cap == 'fc_host': @@ -316,6 +324,12 @@ class DevicesModel(object): if 'fc_host' in xmlutils.xpath_get_text(xml, path): ret.append(host) return ret + # Double verification to catch the case where the libvirt + # supports fc_host but does not, for some reason, recognize + # the libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST + # attribute. + if not self.cap_map['fc_host']: + return conn.listDevices('fc_host', 0) return self._get_devices_with_capability('fc_host') -- 1.8.3.1

2 1

[PATCH] Increase read chunk size to 1MB while uploading file
by Aline Manera 10 Sep '14

10 Sep '14

With a small chunk size (the previous chunk size was 8k), the server needs to make many read/write operations which was consuming a lot of memory from Kimchi server for larger files. So increase it to 1MB to do not overload the server. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/storagevolumes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kimchi/model/storagevolumes.py b/src/kimchi/model/storagevolumes.py index ef8e684..4d0c231 100644 --- a/src/kimchi/model/storagevolumes.py +++ b/src/kimchi/model/storagevolumes.py @@ -41,7 +41,7 @@ VOLUME_TYPE_MAP = {0: 'file', 3: 'network'} -DOWNLOAD_CHUNK_SIZE = 1048576 # 1 MiB +READ_CHUNK_SIZE = 1048576 # 1 MiB class StorageVolumesModel(object): @@ -97,7 +97,7 @@ class StorageVolumesModel(object): size = 0 with open(file_path, 'wb') as f: while True: - data = upload_file.file.read(8192) + data = upload_file.file.read(READ_CHUNK_SIZE) if not data: break size += len(data) @@ -175,7 +175,7 @@ class StorageVolumesModel(object): try: while True: - chunk_data = response.read(DOWNLOAD_CHUNK_SIZE) + chunk_data = response.read(READ_CHUNK_SIZE) if not chunk_data: break -- 1.9.3

2 2

[PATCH 0/5] List pending debug reports to all users
by Aline Manera 10 Sep '14

10 Sep '14

Today only the user who started the debug report creation is able to get the view of a pending debug report. But while switching tabs, this information is lost. This patch set gets the pending debug reports by filtering running tasks by target_uri=^/debugreports and list them among to the exinting debug reports. That way all users will get the same view of which debug reports are being generated. Aline Manera (5): Add function to get pending tasks according to filter Add common function to track Task Add function to list all pending debug reports List pending debug reports while loading report grid Only disable report buttons when the selected report is pending ui/js/src/kimchi.api.js | 34 ++++++++++++------- ui/js/src/kimchi.host.js | 65 ++++++++++++++++++++++++++++++++----- ui/js/src/kimchi.report_add_main.js | 42 ++---------------------- 3 files changed, 83 insertions(+), 58 deletions(-) -- 1.9.3

2 7

[PATCH] Fix: Use "max_request_body_size" value as int instead of string
by Crístian Viana 10 Sep '14

10 Sep '14

The CherryPy variable "max_request_body_size" should be a number value, in bytes. The current code runs something like "eval('max_body_size' * 1024)", where 'max_body_size' is the value read from the external configuration file, in kilobytes. Multiplying a string by a number in Python creates a new string repeating the original string a number of times. We expect a multiplication, not a string repetition. This bug was introduced by commit e3b79e3. Multiply the number 1024 by another number (i.e. the "eval" result), not a string. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/server.py | 4 +++- src/kimchid.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 1c3b360..775313c 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -87,7 +87,9 @@ class Server(object): # directly. You must go through the proxy. cherrypy.server.socket_host = '127.0.0.1' cherrypy.server.socket_port = options.cherrypy_port - cherrypy.server.max_request_body_size = eval(options.max_body_size) + + max_body_size_in_bytes = eval(options.max_body_size) * 1024 + cherrypy.server.max_request_body_size = max_body_size_in_bytes cherrypy.log.screen = True cherrypy.log.access_file = options.access_log diff --git a/src/kimchid.in b/src/kimchid.in index 075b744..0746ba6 100644 --- a/src/kimchid.in +++ b/src/kimchid.in @@ -87,7 +87,7 @@ def main(options): setattr(options, 'ssl_cert', config.config.get('server', 'ssl_cert')) setattr(options, 'ssl_key', config.config.get('server', 'ssl_key')) setattr(options, 'max_body_size', - config.config.get('server', 'max_body_size')*1024) + config.config.get('server', 'max_body_size')) kimchi.server.main(options) -- 1.9.3

2 2

[WIP PATCH] Storage DL/UL
by Hongliang Wang 10 Sep '14

10 Sep '14

Volume. Known kssues: after add a remote URL and click "OK" button, manual click on the storage pool to refresh the volumes. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 2 +- ui/css/theme-default/sp-add-volume.css | 36 ++++++++ ui/css/theme-default/storage.css | 34 +++++++- ui/js/src/kimchi.api.js | 38 +++++++++ ui/js/src/kimchi.sp_add_volume_main.js | 152 +++++++++++++++++++++++++++++++++ ui/js/src/kimchi.storage_main.js | 19 ++++- ui/pages/i18n.json.tmpl | 3 + ui/pages/sp-add-volume.html.tmpl | 80 +++++++++++++++++ ui/pages/tabs/storage.html.tmpl | 12 ++- 9 files changed, 369 insertions(+), 7 deletions(-) create mode 100644 ui/css/theme-default/sp-add-volume.css create mode 100644 ui/js/src/kimchi.sp_add_volume_main.js create mode 100644 ui/pages/sp-add-volume.html.tmpl diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 933a142..2052f58 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -280,7 +280,7 @@ class DevicesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] self.cap_map = \ - {'fc_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST, + {#'fc_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST, 'net': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET, 'pci': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_PCI_DEV, 'scsi': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI, diff --git a/ui/css/theme-default/sp-add-volume.css b/ui/css/theme-default/sp-add-volume.css new file mode 100644 index 0000000..2c31b9a --- /dev/null +++ b/ui/css/theme-default/sp-add-volume.css @@ -0,0 +1,36 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013-2014 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#sp-add-volume-window { + height: 400px; + width: 500px; +} + +#sp-add-volume-window .textbox-wrapper input[type="text"] { + box-sizing: border-box; + width: 100%; +} + +#sp-add-volume-window .textbox-wrapper label { + vertical-align: middle; +} + +#sp-add-volume-window input[type="text"][disabled] { + color: #bbb; + background-color: #fafafa; + cursor: not-allowed; +} diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index f635c2f..02c92e9 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -336,7 +336,6 @@ float: left; padding: 4px; margin-bottom: 5px; - height: 40px; width: 130px; } @@ -622,3 +621,36 @@ #iSCSITarget input { width: 493px; } + +/* Progress bar */ +.volume-progress { + clear: both; + width: 140px; +} + +.volume-progress .progress-bar-outer { + background: #ccc; + height: 4px; + overflow: hidden; + width: 100%; +} + +.volume-progress .progress-bar-inner { + background: #090; + height: 100%; + width: 0%; +} + +.volume-progress .progress-label { + color: #999; + font-size: 10px; + line-height: 16px; +} + +.volume-progress .progress-status { +} + +.volume-progress .progress-downloaded { + float: right; +} +/* End of Progress bar */ diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 5fc456d..766df6a 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1130,5 +1130,43 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + /** + * Add a volume to a given storage pool. + */ + uploadVolumeToSP: function(settings, suc, err) { + var fd = settings['formData']; + var sp = encodeURIComponent(settings['sp']); + kimchi.requestJSON({ + url : kimchi.url + 'storagepools/' + sp + '/storagevolumes', + type : 'POST', + data : fd, + processData : false, + contentType : false, + success : suc, + error : err + }); + }, + + /** + * Add a volume to a given storage pool by URL. + */ + downloadVolumeToSP: function(settings, suc, err) { + var url = settings['url']; + var name = settings['name']; + var sp = encodeURIComponent(settings['sp']); + kimchi.requestJSON({ + url : kimchi.url + 'storagepools/' + sp + '/storagevolumes', + type : 'POST', + data : JSON.stringify({ + name: name, + url: url + }), + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err + }); } }; diff --git a/ui/js/src/kimchi.sp_add_volume_main.js b/ui/js/src/kimchi.sp_add_volume_main.js new file mode 100644 index 0000000..e4f25fc --- /dev/null +++ b/ui/js/src/kimchi.sp_add_volume_main.js @@ -0,0 +1,152 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2013-2014 + * + * Licensed under the Apache License, Version 2.0 (the 'License'); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an 'AS IS' BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +kimchi.sp_add_volume_main = function() { + // download from remote server or upload from local file + var type = 'download'; + + var addButton = $('#sp-add-volume-button'); + + $('input.volume-type').change(function(e) { + $('.volume-input').prop('disabled', true); + $('.volume-input.' + this.value).prop('disabled', false); + type = this.value; + }); + + var volumeName; + var taskID = -1; + + var onAccepted = function() { + if(inited[taskID]) { + return; + } + inited[taskID] = true; + kimchi.window.close(); + + kimchi.topic('kimchi/volumeDownloadStarted').publish({ + sp: kimchi.selectedSP + }); + }; + var inited = {}; + + var onError = function(result) { + if (result['message']) { + var errText = result['message']; + } + else { + var errText = result['responseJSON']['reason']; + } + result && kimchi.message.error(errText); + var volumeName = result['target_uri'].split('/').pop(); + var volumeBox = $('#volume' + kimchi.selectedSP + ' [data-volume-name="' + volumeName + '"]'); + $('.progress-status', volumeBox).text(i18n['KCHPOOL6016M']); + }; + + var fetchRemoteFile = function() { + var volumeURL = $('#volume-remote-url').val(); + volumeName = volumeURL.split(/(\\|\/)/g).pop(); + kimchi.downloadVolumeToSP({ + sp: kimchi.selectedSP, + name: volumeName, + url: volumeURL + }, function(resp) { + taskID = resp['id']; + onAccepted(); + }, onError); + }; + + var onProgress = function(resp) { + var sizeArray = resp['message'].split('/'); + var downloaded = sizeArray[0]; + var percent = 0; + if(isNaN(downloaded)) { + downloaded = 0; + } + else { + var total = sizeArray[1]; + percent = downloaded / total * 100; + } + var formatted = kimchi.formatMeasurement(downloaded); + var size = formatted['v'].toFixed(1) + formatted['s']; + var volumeBox = $('#volume' + kimchi.selectedSP + ' [data-volume-name="' + volumeName + '"]'); + $('.volume-progress', volumeBox).removeClass('hidden'); + $('.progress-bar-inner', volumeBox).css({ + width: percent + '%' + }); + $('.progress-status', volumeBox).text(i18n['KCHPOOL6014M']); + $('.progress-downloaded', volumeBox).text(size); + }; + + var onTaskResponse = function(result) { + var taskStatus = result['status']; + switch(taskStatus) { + case 'running': + onProgress(result); + setTimeout(function() { + trackTask(result['id']); + }, 1500); + break; + case 'finished': + taskID = -1; + var volumeName = result['target_url'].split('/').pop(); + var volumeBox = $('#volume' + kimchi.selectedSP + ' [data-volume-name="' + volumeName + '"]'); + $('.progress-status', volumeBox).text(i18n['KCHPOOL6015M']); + break; + case 'failed': + taskID = -1; + onError(result); + break; + default: + break; + } + }; + + var trackTask = function(task) { + kimchi.getTask(task, onTaskResponse, function(resp) {}); + }; + + var uploadFile = function() { + var blobFile = $('#volume-input-file')[0].files[0]; + var fileName = blobFile.name; + var fd = new FormData(); + fd.append('name', fileName); + fd.append('file', blobFile); + kimchi.uploadVolumeToSP({ + sp: kimchi.selectedSP, + formData: fd + }, function(resp) { + }); + }; + + $(addButton).on('click', function(event) { + $(this).prop('disabled', true); + if(type === 'download') { + fetchRemoteFile(); + } + else { + uploadFile(); + } + event.preventDefault(); + }); + + kimchi.topic('kimchi/volumesListed').subscribe(function() { + var volumeBox = $('#volume' + kimchi.selectedSP + ' [data-volume-name="' + volumeName + '"]'); + $(volumeBox).removeClass('hidden'); + $('.progress-status', volumeBox).text(i18n['KCHPOOL6014M']); + taskID > -1 && trackTask(taskID); + }); +}; diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index ae3f963..56252a8 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -135,6 +135,12 @@ kimchi.storageBindClick = function() { } }); + $('.pool-add-volume').on('click', function(event) { + var poolName = $(this).data('name'); + kimchi.selectedSP = poolName; + kimchi.window.open('sp-add-volume.html'); + }); + $('.storage-action').on('click', function() { var storage_action = $(this); var deleteButton = storage_action.find('.pool-delete'); @@ -149,10 +155,6 @@ kimchi.storageBindClick = function() { $("#logicalPoolExtend").dialog("option", "poolName", $(this).data('name')); $("#logicalPoolExtend").dialog("open"); }); - - $('#volume-doAdd').on('click', function() { - kimchi.window.open('storagevolume-add.html'); - }); } $('.storage-li').on('click', function(event) { @@ -195,6 +197,9 @@ kimchi.doListVolumes = function(poolObj) { poolObj.removeClass('in'); kimchi.changeArrow(handleArrow); slide.slideDown('slow'); + setTimeout(function() { + kimchi.topic('kimchi/volumesListed').publish(); + }, 1500); } }, function(err) { kimchi.message.error(err.responseJSON.reason); @@ -255,6 +260,12 @@ kimchi.storage_main = function() { } kimchi.doListStoragePools(); kimchi.initLogicalPoolExtend(); + + kimchi.topic('kimchi/volumeDownloadStarted').subscribe(function(data) { + var sp = data['sp']; + var poolNode = $('.storage-li[data-name="' + sp + '"]'); + kimchi.doListVolumes(poolNode); + }); } kimchi.changeArrow = function(obj) { diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index d920ae2..b3bca53 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -169,6 +169,9 @@ "KCHPOOL6011M": "$_("No available partitions found.")", "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", + "KCHPOOL6014M": "$_("Downloading...")", + "KCHPOOL6015M": "$_("Done!")", + "KCHPOOL6016M": "$_("Failed!")", "KCHVMSTOR0001E": "$_("CDROM path need to be a valid local path and cannot be blank.")", "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")" diff --git a/ui/pages/sp-add-volume.html.tmpl b/ui/pages/sp-add-volume.html.tmpl new file mode 100644 index 0000000..148a17b --- /dev/null +++ b/ui/pages/sp-add-volume.html.tmpl @@ -0,0 +1,80 @@ +#* + * Project Kimchi + * + * Copyright IBM, Corp. 2014 + * + * Authors: + * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *# +#unicode UTF-8 +#import gettext +#from kimchi.cachebust import href +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent _ = t.gettext +#silent _t = t.gettext +<div id="sp-add-volume-window" class="window"> + <form id="form-sp-add-volume"> + <header class="window-header"> + <h1 class="title">$_("Add a Volume to Storage Pool")</h1> + <div class="close">X</div> + </header> + <section> + <div class="content"> + <div class="form-section"> + <h2> + <input type="radio" id="volume-type-download" class="volume-type" name="volumeType" value="download" checked="checked" /> + <label for="volume-type-download"> + $_("Fetch from remote URL") + </label> + </h2> + <div class="field"> + <p class="text-help"> + $_("Enter the remote URL here.") + </p> + <div class="textbox-wrapper"> + <input type="text" id="volume-remote-url" class="text volume-input download" name="volumeRemoteURL" /> + </div> + </div> + </div> + <div class="form-section"> + <h2> + <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload"/> + <label for="volume-type-upload"> + $_("Upload an file") + </label> + </h2> + <div class="field"> + <p class="text-help"> + $_("Choose the file you want to upload.") + </p> + <div class="textbox-wrapper"> + <input type="file" class="volume-input upload" id="volume-input-file" name="volumeLocalFile" disabled="disabled" /> + </div> + </div> + </div> + </div> + </section> + <footer> + <div class="btn-group"> + <button type="submit" id="sp-add-volume-button" class="btn-normal"> + <span class="text">$_("OK")</span> + </button> + </div> + </footer> + </form> +</div> +<script type="text/javascript"> + kimchi.sp_add_volume_main(); +</script> diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 87205bd..d5aceef 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -82,6 +82,7 @@ <div class="popover actionsheet right-side" style="width: 250px"> <button class="button-big pool-deactivate" data-stat="{state}" data-name="{name}" data-persistent="{persistent}"><span class="text">$_("Deactivate")</span></button> <button class="button-big pool-activate" data-stat="{state}" data-name="{name}"><span class="text">$_("Activate")</span></button> + <button class="button-big pool-add-volume" data-stat="{state}" data-name="{name}"><span class="text">$_("Add Volume")</span></button> <button class="button-big pool-extend {enableExt}" data-stat="{state}" data-name="{name}"><span class="text">$_("Extend")</span></button> <button class="button-big red pool-delete" data-stat="{state}" data-name="{name}"><span class="text">$_("Undefine")</span></button> </div> @@ -98,11 +99,20 @@ </li> </script> <script id="volumeTmpl" type="html/text"> - <div class="volume-box white-box"> + <div class="volume-box white-box" data-volume-name="{name}"> <div class="storage-icon volume-default icon-{format} "> </div> <div class="volume-title"> <div class="volume-name" title="{name}">{name}</div> + <div class="volume-progress hidden"> + <div class="progress-bar-outer"> + <div class="progress-bar-inner"></div> + </div> + <div class="progress-label"> + <span class="progress-status"></span> + <span class="progress-downloaded"></span> + </div> + </div> </div> <div class="volume-setting"> </div> -- 1.8.1.4

3 4

Test matrix for Kimchi 1.3 release
by Aline Manera 08 Sep '14

08 Sep '14

Hi all, I've just updated the test matrix for Kimchi 1.3 release: https://github.com/kimchi-project/kimchi/wiki/Testing-1.3 Please, update it according to your tests. I suggest to go thorough all the tests first and fill it with PASS (when the test passed) or with the bug # (when it failed). And once finished all tests, focus on bug fixes. Thanks, Aline Manera

1 0

[PATCH 0/3] UI: Create Template with VM Image
by huoyuxin＠linux.vnet.ibm.com 08 Sep '14

08 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (3): UI: Template with VM Image - Create UI: Template with VM Image - Edit UI: Template with VM Image - List ui/css/theme-default/form.css | 13 ++++++++----- ui/css/theme-default/template_add.css | 18 ++++++++++++++++++ ui/js/src/kimchi.template_add_main.js | 17 +++++++++++++++++ ui/js/src/kimchi.template_edit_main.js | 8 ++++++++ ui/js/src/kimchi.template_main.js | 12 +++++++++++- ui/pages/template-add.html.tmpl | 13 +++++++++++++ ui/pages/template-edit.html.tmpl | 6 +++++- 7 files changed, 80 insertions(+), 7 deletions(-)

3 6

[PATCH 0/3] UI: Create Template with Image File
by huoyuxin＠linux.vnet.ibm.com 08 Sep '14

08 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (3): UI: Template with VM Image - Create UI: Template with VM Image - Edit UI: Template with VM Image - List ui/css/theme-default/form.css | 13 ++++++++----- ui/css/theme-default/template_add.css | 21 +++++++++++++++++++++ ui/js/src/kimchi.template_add_main.js | 32 +++++++++++++++++++++++++++++++- ui/js/src/kimchi.template_edit_main.js | 8 ++++++++ ui/js/src/kimchi.template_main.js | 12 +++++++++++- ui/pages/template-add.html.tmpl | 13 +++++++++++++ ui/pages/template-edit.html.tmpl | 6 +++++- 7 files changed, 97 insertions(+), 8 deletions(-)

2 4

[PATCH v2 0/3] Download remote image to storage pool
by Crístian Viana 05 Sep '14

05 Sep '14

Changelog from previous version (v1): - Remove the text "downloading" from the download task status message. Now it only contains the data: <downloaded size>/<total size>. Crístian Viana (3): storagevolume: Download remote images to a storage pool storagevolume: Check storage pool before adding a volume storagevolume: Add download progress to task docs/API.md | 1 + src/kimchi/mockmodel.py | 39 ++++++++++++++++++++++----- src/kimchi/model/storagevolumes.py | 54 +++++++++++++++++++++++++++++++++++--- tests/test_model.py | 24 +++++++++++++++++ tests/test_rest.py | 14 +++++++++- 5 files changed, 120 insertions(+), 12 deletions(-) -- 1.9.3

3 7

[PATCH v5 0/7] Support image upload
by Crístian Viana 05 Sep '14

05 Sep '14

I'm sending a new version of Royce's patchset because she's currently on vacation. The changelog from the previous patchset (v4) is: - Use the same file body size in "src/kimchi.config" as in "src/kimchi.conf". - Make sure the file handler will be closed when reading the upload file content. - Fix the Task status message describing the upload progress. - Remove the pool refresh operation from the upload loop. - Add the package "python-requests" as a project requirement. - Fix a formatting issue. Royce Lv (7): Storage volume upload: Update API.md Fix mockmodel reset for objectstore Storage volume upload: Parse params for upload formdata Storage volume upload: Control request body size of kimchi Storage volume upload: Support file based upload Storage volume upload: Adding progress to task message Storage volume upload: Change mockmodel and test contrib/DEBIAN/control.in | 3 ++- contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 2 ++ docs/README.md | 7 ++++--- src/kimchi.conf.in | 3 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/utils.py | 4 +++- src/kimchi/mockmodel.py | 24 ++++++++++++++++++++++++ src/kimchi/model/storagevolumes.py | 31 +++++++++++++++++++++++++++++++ src/kimchi/server.py | 1 + src/kimchid.in | 2 ++ tests/test_rest.py | 38 +++++++++++++++++++++++++++++++++++++- tests/utils.py | 2 +- 14 files changed, 113 insertions(+), 7 deletions(-) -- 1.9.3

2 8

[PATCH 0/4] WIP: Download remote image to storage pool
by Crístian Viana 05 Sep '14

05 Sep '14

This patchset is a work in progress. I'm sending it now so we can get early feedback. The following problems are known: - The previous "create" function (which is now called "_create_volume_with_capacity") should be updated to the Task API. This will cause errors in existing tests. - There is one unfinished error message. - The tests and mockmodel are missing. Any feedback is welcome. Crístian Viana (4): storagevolume: Split "create" function based on the parameters storagevolume: Use a Task to create a new volume storagevolume: Download remote images to a storage pool storagevolume: Add download progress to task src/kimchi/control/storagevolumes.py | 4 +- src/kimchi/model/storagevolumes.py | 71 +++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 3 deletions(-) -- 1.9.3

2 5

[PATCH v3 0/4] Download remote image to storage pool
by Crístian Viana 05 Sep '14

05 Sep '14

Changelog from the previous version (v2): - Update src/kimchi/API.json with the new parameter "url" in function "storagevolumes_create". - New commit: "storagevolume: Set target URI when creating Task". Crístian Viana (4): storagevolume: Download remote images to a storage pool storagevolume: Check storage pool before adding a volume storagevolume: Add download progress to task storagevolume: Set target URI when creating Task docs/API.md | 1 + src/kimchi/API.json | 6 ++++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 42 ++++++++++++++++++++++------ src/kimchi/model/storagevolumes.py | 57 ++++++++++++++++++++++++++++++++++---- tests/test_model.py | 24 ++++++++++++++++ tests/test_rest.py | 14 +++++++++- 7 files changed, 131 insertions(+), 14 deletions(-) -- 1.9.3

2 5

[PATCHv4 0/7] Support image upload
by lvroyce＠linux.vnet.ibm.com 04 Sep '14

04 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v2>v3, Add mockmodel and tests v3>v4, Update progress presentation, update max_body_size control Royce Lv (7): Storage volume upload: Update API.md Fix mockmodel reset for objectstore Storage volume upload: Parse params for upload formdata Storage volume upload: Control request body size of kimchi Storage volume upload: Support file based upload Storage volume upload: Adding progress to task message Storage volume upload: Change mockmodel and test docs/API.md | 2 ++ src/kimchi.conf.in | 3 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/utils.py | 4 +++- src/kimchi/mockmodel.py | 26 +++++++++++++++++++++-- src/kimchi/model/storagevolumes.py | 32 ++++++++++++++++++++++++++++ src/kimchi/server.py | 1 + src/kimchid.in | 1 + tests/test_rest.py | 43 +++++++++++++++++++++++++++++++++++++- tests/utils.py | 2 +- 10 files changed, 110 insertions(+), 5 deletions(-) -- 1.8.3.2

3 16

[PATCH 0/2 V2] Support async task query classification
by Aline Manera 04 Sep '14

04 Sep '14

V1 -> V2: - Allow using a regex when querying the target_uri parameter This patch set allows querying Tasks by their target_uri which is a resource URI. That way every user can get the same view from that one who started the Task. Aline Manera (2): Expose target_uri on Task resource Update current code to report target_uri while creating a Task docs/API.md | 1 + src/kimchi/control/base.py | 4 +++- src/kimchi/control/tasks.py | 4 +--- src/kimchi/mockmodel.py | 6 ++++-- src/kimchi/model/debugreports.py | 3 ++- src/kimchi/model/host.py | 3 ++- src/kimchi/model/storagepools.py | 4 ++-- tests/test_rest.py | 14 +++++++++++--- 8 files changed, 26 insertions(+), 13 deletions(-) -- 1.9.3

3 5

[PATCH 0/3] Download remote image to storage pool
by Crístian Viana 04 Sep '14

04 Sep '14

Crístian Viana (3): storagevolume: Download remote images to a storage pool storagevolume: Check storage pool before adding a volume storagevolume: Add download progress to task docs/API.md | 1 + src/kimchi/mockmodel.py | 39 ++++++++++++++++++++++----- src/kimchi/model/storagevolumes.py | 54 +++++++++++++++++++++++++++++++++++--- tests/test_model.py | 24 +++++++++++++++++ tests/test_rest.py | 14 +++++++++- 5 files changed, 120 insertions(+), 12 deletions(-) -- 1.9.3

2 5

[PATCHv3 0/7] Support volume upload
by lvroyce0210＠gmail.com 04 Sep '14

04 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v2>v3, Add mockmodel and testcases. Royce Lv (7): Storage volume upload: Update API.md Fix mockmodel reset for objectstore Storage volume upload: Parse params for upload formdata Storage volume upload: Control request body size of kimchi Storage volume upload: Support file based upload Storage volume upload: Adding progress to task message Storage volume upload: Change mockmodel and test docs/API.md | 2 ++ src/kimchi.conf.in | 3 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/utils.py | 4 +++- src/kimchi/mockmodel.py | 25 +++++++++++++++++++++-- src/kimchi/model/storagevolumes.py | 31 ++++++++++++++++++++++++++++ src/kimchi/server.py | 1 + src/kimchid.in | 3 +++ tests/test_rest.py | 41 +++++++++++++++++++++++++++++++++++++- tests/utils.py | 2 +- 10 files changed, 108 insertions(+), 5 deletions(-) -- 1.8.3.2

3 15

[PATCH] Update License Statement
by Hongliang Wang 04 Sep '14

04 Sep '14

Removed "Authors" section. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/repository-add.css | 5 +---- ui/css/theme-default/repository-edit.css | 5 +---- ui/js/src/kimchi.repository_add_main.js | 5 +---- ui/pages/repository-add.html.tmpl | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ui/css/theme-default/repository-add.css b/ui/css/theme-default/repository-add.css index ab28ee1..f97f8dd 100644 --- a/ui/css/theme-default/repository-add.css +++ b/ui/css/theme-default/repository-add.css @@ -1,10 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 - * - * Authors: - * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * Copyright IBM, Corp. 2013-2014 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/repository-edit.css b/ui/css/theme-default/repository-edit.css index 98995a9..16342d7 100644 --- a/ui/css/theme-default/repository-edit.css +++ b/ui/css/theme-default/repository-edit.css @@ -1,10 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 - * - * Authors: - * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * Copyright IBM, Corp. 2013-2014 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/kimchi.repository_add_main.js b/ui/js/src/kimchi.repository_add_main.js index d0e1121..9197b7b 100644 --- a/ui/js/src/kimchi.repository_add_main.js +++ b/ui/js/src/kimchi.repository_add_main.js @@ -1,10 +1,7 @@ /* * Project Kimchi * - * Copyright IBM, Corp. 2014 - * - * Authors: - * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * Copyright IBM, Corp. 2013-2014 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/pages/repository-add.html.tmpl b/ui/pages/repository-add.html.tmpl index 73ff415..522043d 100644 --- a/ui/pages/repository-add.html.tmpl +++ b/ui/pages/repository-add.html.tmpl @@ -1,10 +1,7 @@ #* * Project Kimchi * - * Copyright IBM, Corp. 2014 - * - * Authors: - * Hongliang Wang <hlwang(a)linux.vnet.ibm.com> + * Copyright IBM, Corp. 2013-2014 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- 1.8.1.4

2 1

[PATCH] model.templates: setting ISO ACL in template creation
by Daniel Henrique Barboza 03 Sep '14

03 Sep '14

Sometimes after a deep scan the template creation fails due to permission issues with the selected ISO. This patch sets the ACL (if necessary) of the ISO to avoid this scenario. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/model/templates.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index 9278cdc..a792a17 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -27,7 +27,7 @@ from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed from kimchi.kvmusertests import UserTests from kimchi.utils import pool_name_from_uri -from kimchi.utils import probe_file_permission_as_user +from kimchi.utils import probe_file_permission_as_user, run_setfacl_set_attr from kimchi.vmtemplate import VMTemplate @@ -44,9 +44,7 @@ class TemplatesModel(object): user = UserTests().probe_user() ret, excp = probe_file_permission_as_user(iso, user) if ret is False: - raise InvalidParameter('KCHISO0008E', - {'filename': iso, 'user': user, - 'err': excp}) + run_setfacl_set_attr(iso) conn = self.conn.get() pool_uri = params.get(u'storagepool', '') -- 1.8.3.1

2 1

[PATCH 0/2] Support async task query classification
by Aline Manera 03 Sep '14

03 Sep '14

This patch set allows querying Tasks by their target_uri which is a resource URI. That way every user can get the same view from that one who started the Task. Aline Manera (2): Expose target_uri on Task resource Update current code to report target_uri while creating a Task docs/API.md | 1 + src/kimchi/control/tasks.py | 4 +--- src/kimchi/mockmodel.py | 6 ++++-- src/kimchi/model/debugreports.py | 3 ++- src/kimchi/model/host.py | 3 ++- src/kimchi/model/storagepools.py | 4 ++-- tests/test_rest.py | 14 +++++++++++--- 7 files changed, 23 insertions(+), 12 deletions(-) -- 1.9.3

1 2

[PATCH 0/2] Change storage volume creation to async tasks
by lvroyce＠linux.vnet.ibm.com 03 Sep '14

03 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, Change according to Aline's comments, Use list to track param index to avoid iteration. This is inspired by Cristian's patch. Royce Lv (2): Storage volume upload: Dispatch volume create to right handler Storage volume upload: Change storagevolumes to AsyncCollection src/kimchi/control/storagevolumes.py | 4 ++-- src/kimchi/i18n.py | 2 ++ src/kimchi/model/storagevolumes.py | 22 ++++++++++++++++++++-- tests/test_model.py | 8 ++++++-- tests/test_rest.py | 9 ++++++--- 5 files changed, 36 insertions(+), 9 deletions(-) -- 1.8.3.2

3 6

[PATCH 0/2 V2] Change storage volume creation to async tasks
by Aline Manera 03 Sep '14

03 Sep '14

V1 -> V2: - Fix "make check-local" issues - Update mockmodel to also return a Task while creating a storage volume - Update the jsonschema and API.md Royce Lv (2): Storage volume upload: Dispatch volume create to right handler Storage volume upload: Change storagevolumes to AsyncCollection docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ src/kimchi/control/storagevolumes.py | 4 ++-- src/kimchi/i18n.py | 3 +++ src/kimchi/mockmodel.py | 22 +++++++++++++++++++++- src/kimchi/model/storagevolumes.py | 26 ++++++++++++++++++++++++-- tests/test_model.py | 8 ++++++-- tests/test_rest.py | 28 ++++++++++++++++------------ 8 files changed, 79 insertions(+), 19 deletions(-) -- 1.9.3

2 4

[PATCH V2] UI bug fix: Properly display storage volumes on Storage tab
by Aline Manera 02 Sep '14

02 Sep '14

While selecting an active storage pool, the storage volumes in it should be listed. But commit 1fb4257f changed "hide-content" CSS class to "display: none!important" which is preveting the storage volumes to be displayed through .slideDown() function. Set "style=display:none" to the volumes div to fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 2 +- ui/pages/tabs/storage.html.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index ab92de2..f635c2f 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -309,7 +309,7 @@ .volumes { background: #73716F; width: 1004px; - display: inline-block; + display: none; margin-top: 10px; border: 1px solid rgb(204, 204, 204); } diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 34ccd21..87205bd 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -91,7 +91,7 @@ <div class="arrow-down"></div> </div> </div> - <div class="volumes hide-content"> + <div class="volumes"> <div id="volume{name}" class="volumeslist" data-name="{name}" ></div> <div class="clear"></div> </div> -- 1.9.3

2 2

[PATCH] UI bug fix: Properly display storage volumes on Storage tab
by Aline Manera 02 Sep '14

02 Sep '14

While selecting an active storage pool, the storage volumes in it should be listed. But commit 1fb4257f changed "hide-content" CSS class to "display: none!important" which is preveting the storage volumes to be displayed through .slideDown() function. Set "style=display:none" to the volumes div to fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/pages/tabs/storage.html.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index 34ccd21..f46632a 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -91,7 +91,7 @@ <div class="arrow-down"></div> </div> </div> - <div class="volumes hide-content"> + <div class="volumes" style="display:none"> <div id="volume{name}" class="volumeslist" data-name="{name}" ></div> <div class="clear"></div> </div> -- 1.9.3

3 3

[PATCH 0/5] Discover Kimchi peers using openSLP
by Aline Manera 02 Sep '14

02 Sep '14

I haven't add the federation info to /config/capabilities because I thought in always display the same message when any peers were found. "No peers found. More information at: <federation-help-page>" Then we can use README-federation as the federation help page. What do you think? Aline Manera (5): Update kimchi.config values according to command line input Delete http_port from /config API as it is not in use anymore Add federation option to Kimchi config file Discover Kimchi peers using openSLP Add documentation on how to enable federation on Kimchi docs/API.md | 1 - docs/README-federation.md | 27 +++++++++++++++++++++ src/kimchi.conf.in | 4 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/peers.py | 29 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 11 ++++++--- src/kimchi/model/config.py | 3 +-- src/kimchi/model/peers.py | 59 +++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/server.py | 1 - src/kimchid.in | 36 +++++++++++++++++---------- tests/test_rest.py | 7 +++++- 11 files changed, 158 insertions(+), 21 deletions(-) create mode 100644 docs/README-federation.md create mode 100644 src/kimchi/control/peers.py create mode 100644 src/kimchi/model/peers.py -- 1.9.3

3 17

[PATCH V2] Guest storage: fix volume format overwrite
by Aline Manera 02 Sep '14

02 Sep '14

V1 -> V2: - Add qcow and vmdk as supported format to storage volume Royce Lv (1): Guest storage: fix volume format overwrite src/kimchi/model/vmstorages.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 1.9.3

4 5

Mechanism for guest edits
by Brent Baude 02 Sep '14

02 Sep '14

Folks, I'm about to send a patch to you guys that: 1) adds "serial" as a graphics type 2) allows you to edit the graphics type on a cold guest In doing so and talking with Adam and Aline, it seems that a rework of how the guest's xml is edited is in order. When you edit a template, for example, the whole templates xml is basically re-instantiated and only the values that kimchi cares about is added. The rest libvirt fills in. The editing of guest xmls differs from that mechanism. Right now the actual xml is edited and resubmitted. If you think about editing components of a guest (think about changing graphics types), you can see where long-term there is an increased opportunity for the xml to become complicated and maybe even incorrect. XML creep if you will. So, we are thinking that the cold guest edition should more closely follow how the template works, where critical parts that kimchi has fields for is inserted and libvirt does the rest of the work. This will also allow for future growth/change where new components are added. I'll likely start a branch for it and get started on this. In the meanwhile, I'll submit my graphics patches for a start. Brent

2 1

[PATCHv1 0/5] Storagevolume upload
by lvroyce0210＠gmail.com 02 Sep '14

02 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Change storage volumes create to return task so that upload and download can fit in this frame. Limit upload size to 4GB, update uploading progress in task message during writing. Royce Lv (5): Storage volume upload: Dispatch volume create to right handler Storage volume upload: Change storagevolumes to AsyncCollection Storage volume upload: Parse params for upload formdata Storage volume upload: Support file based upload Storage volume upload: Adding progress to task message src/kimchi/control/storagevolumes.py | 4 +-- src/kimchi/control/utils.py | 4 ++- src/kimchi/i18n.py | 3 ++ src/kimchi/model/storagevolumes.py | 63 ++++++++++++++++++++++++++++++++++-- tests/test_model.py | 8 +++-- tests/test_rest.py | 9 ++++-- 6 files changed, 81 insertions(+), 10 deletions(-) -- 1.8.3.2

3 12

[V2] UI: List Kimchi Peers
by huoyuxin＠linux.vnet.ibm.com 01 Sep '14

01 Sep '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/topbar.css | 36 +++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.main.js | 14 ++++++++++++++ ui/pages/kimchi-ui.html.tmpl | 10 ++++++++++ 4 files changed, 73 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index bed4e19..127c56a 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -114,7 +114,7 @@ cursor: pointer; display: block; position: relative; - height: 48px; + height: 52px; margin: 0 12px; } @@ -174,3 +174,37 @@ a#btn-logout:hover { display: none; } } + +.peers { + color: white; + cursor: pointer; + height: 52px; + margin: 0 12px; +} + +.peers span { + margin-top: 25px; +} + +.peers .arrow { + border: 6px solid transparent; + border-bottom: none; + border-top-color: white; + display: inline-block; + width: 0; +} + +.peers .drowdown { + top: 45px; + right: 110px; + color: black; + padding: 10px 15px; + white-space: nowrap; + line-height: 12px; + width: inherit; +} + +.peers .drowdown a { + display: block; + padding: 10px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..8966cff 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,19 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getPeers : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'peers', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index ba54b26..21ffca7 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -20,10 +20,24 @@ kimchi.tabMode = {}; kimchi.capabilities = undefined; kimchi.getCapabilities(function(result) { kimchi.capabilities = result; + kimchi.setupPeers(); }, function() { kimchi.capabilities = {}; }); +kimchi.setupPeers = function(){ + if(kimchi.capabilities.federation=="on"){ + $('#peers').removeClass('hide-content'); + kimchi.getPeers(function(data){ + var hints = $('p', $('.drowdown', '#peers')); + data.length==0 ? hints.toggleClass('hide-content'): hints.addClass('hide-content'); + for(var i=0; i<data.length; i++){ + $('.drowdown', '#peers').append("<a href='"+data[i]+"' target='_blank'>"+data[i]+"</a>"); + } + }); + } +}; + kimchi.main = function() { kimchi.popable(); diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 7bdf441..867ee36 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -71,6 +71,16 @@ <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1> <ul class="nav-top"> <li> + <div id="peers" class="peers hide-content popable"> + <span>$_("Peers")</span> + <span class="arrow"></span> + <div class="drowdown popover right-side"> + <p>$_("Searching")...</p> + <p class="hide-content">$_("No peers found.")</p> + </div> + </div> + </li> + <li> <div id="user" class="popable"> <span id="user-icon"></span> <span id="user-name" class="empty-when-logged-off"></span> -- 1.7.1

2 2

[PATCH 0/6 V3] Discover Kimchi peers using openSLP
by Aline Manera 01 Sep '14

01 Sep '14

V2 -> V3: - Use self.url while registering server on openSLP V1 -> V2: - Update docs/API.md - Expose federation on /config/capabilities Aline Manera (6): Update kimchi.config values according to command line input Delete http_port from /config API as it is not in use anymore Add federation option to Kimchi config file Discover Kimchi peers using openSLP Add documentation on how to enable federation on Kimchi Expose federation on /config/capabilities docs/API.md | 11 ++++++++- docs/README-federation.md | 27 +++++++++++++++++++++ src/kimchi.conf.in | 4 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/peers.py | 29 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 14 ++++++++--- src/kimchi/model/config.py | 6 ++--- src/kimchi/model/peers.py | 59 +++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/server.py | 1 - src/kimchid.in | 36 +++++++++++++++++---------- tests/test_rest.py | 19 +++++++++------ 11 files changed, 177 insertions(+), 30 deletions(-) create mode 100644 docs/README-federation.md create mode 100644 src/kimchi/control/peers.py create mode 100644 src/kimchi/model/peers.py -- 1.9.3

2 8

[PATCH 0/2] Fix attaching iscsi storage volume
by lvroyce＠linux.vnet.ibm.com 01 Sep '14

01 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Iscsi volume fails to attach to vm because of its path is rejected by previous cdrom validate logic, and type 'unknown' forms wrong vm xml This patchset fix the above bugs and form right vm xml in order to start vm. Royce Lv (2): Guest storage: Fix attaching type judgement Guest storage: fix volume format overwrite src/kimchi/model/vmstorages.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) -- 1.8.3.2

3 8

[PATCH] Fix sample plugin configuration
by Aline Manera 01 Sep '14

01 Sep '14

Since the authorization method changed, kimchiauth() does not accept any parameter. The admin methods should be listed on Collection and Resource elements. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- plugins/sample/__init__.py | 2 ++ plugins/sample/sample.conf.in | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py index 4aca4e0..10c244c 100644 --- a/plugins/sample/__init__.py +++ b/plugins/sample/__init__.py @@ -64,12 +64,14 @@ class Circles(Collection): def __init__(self, model): super(Circles, self).__init__(model) self.resource = Circle + self.admin_methods = ['POST', 'PUT'] class Rectangles(Collection): def __init__(self, model): super(Rectangles, self).__init__(model) self.resource = Rectangle + self.admin_methods = ['POST', 'PUT'] class Circle(Resource): diff --git a/plugins/sample/sample.conf.in b/plugins/sample/sample.conf.in index 6e0908b..cf42467 100644 --- a/plugins/sample/sample.conf.in +++ b/plugins/sample/sample.conf.in @@ -17,8 +17,6 @@ tools.kimchiauth.on = True [/rectangles] tools.kimchiauth.on = True -tools.kimchiauth.admin_methods = ['POST', 'PUT'] [/circles] tools.kimchiauth.on = True -tools.kimchiauth.admin_methods = ['POST', 'PUT'] -- 1.9.3

2 2

[V4] UI: List iSCSI Servers & Targets
by huoyuxin＠linux.vnet.ibm.com 01 Sep '14

01 Sep '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/form.css | 2 +- ui/css/theme-default/storage.css | 31 +++++++++- ui/js/src/kimchi.api.js | 20 ++++++- ui/js/src/kimchi.storagepool_add_main.js | 95 +++++++++++++++++++++++++++++- ui/pages/i18n.json.tmpl | 3 + ui/pages/storagepool-add.html.tmpl | 12 +++- 6 files changed, 156 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/form.css b/ui/css/theme-default/form.css index d98cf9e..9a442fb 100644 --- a/ui/css/theme-default/form.css +++ b/ui/css/theme-default/form.css @@ -45,7 +45,7 @@ .form-section input.invalid-field[type="text"] { - border-color: #FF4444; + border-color: #FF4444!important; } .text-help { diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index 4f439e8..ab92de2 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -315,7 +315,7 @@ } .hide-content { - display: none; + display: none!important; } .volumeslist { @@ -593,3 +593,32 @@ center no-repeat; padding: 0 20px 0 26px; } + +.storage-admin .filter-select { + display: inline-block; + position: relative; +} + +#iscsiportId, .storage-admin .filter-select input { + border: 1px solid #CCCCCC; + border-radius: 1px; + font-size: 14px; + padding: 3px 3px 3px 10px; + height: 30px; +} + +.storage-admin .filter-select input::-ms-clear { + display: none; +} + +#iSCSIServer input { + width: 410px; +} + +#iscsiportId { + width: 60px; +} + +#iSCSITarget input { + width: 493px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..bc43881 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -774,7 +774,9 @@ var kimchi = { contentType : 'application/json', dataType : 'json', success : suc, - error : err + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } }); }, @@ -1098,5 +1100,21 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getISCSITargets : function(server, port, suc, err) { + server = encodeURIComponent(server); + port = port ? '&_server_port='+encodeURIComponent(port) : ''; + kimchi.requestJSON({ + url : kimchi.url + 'storageservers/'+server+'/storagetargets?_target_type=iscsi'+port, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ecbc682..618892d 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -34,6 +34,93 @@ kimchi.storagepool_add_main = function() { }); }; +kimchi.storageFilterSelect = function(id, isUpdate) { + var input = $('input', '#'+id); + var options = $(".option", '#'+id); + var filter = function(container, key){ + container.children().each(function(){ + $(this).css("display", $(this).text().indexOf(key)==-1 ? "none" : ""); + }); + }; + if(!isUpdate){ + input.on("keyup", function(){ + filter(options, input.val()); + }); + } + options.children().each(function(){ + $(this).click(function(){ + options.children().removeClass("active"); + input.val($(this).text()); + input.trigger("change"); + $(this).addClass("active"); + filter(options, ""); + }); + }); +}; + +kimchi.setupISCSI = function(){ + var loadTargets = function(server, port, callback){ + var isUpdate = $(".option", "#iSCSITarget").children().length > 0; + $(".option", "#iSCSITarget").empty(); + $('input', "#iSCSITarget").attr("placeholder", i18n['KCHPOOL6006M']); + kimchi.getISCSITargets(server, port, function(data){ + if(data.length==0){ + $('input', "#iSCSITarget").attr("placeholder", i18n['KCHPOOL6007M']); + }else{ + for(var i=0; i<data.length; i++){ + var itemNode = $.parseHTML("<li>"+data[i].target+"</li>"); + $(".option", "#iSCSITarget").append(itemNode); + } + $('input', "#iSCSITarget").attr("placeholder", ""); + $(".popover", "#iSCSITarget").css("display", "block"); + } + kimchi.storageFilterSelect('iSCSITarget', isUpdate); + $('input', "#iSCSITarget").trigger("focus"); + callback(); + }, function(data){ + $('input', "#iSCSITarget").attr("placeholder", i18n['KCHPOOL6008M']); + callback(); + kimchi.message.error(data.responseJSON.reason); + }); + }; + var triggerLoadTarget = function(){ + $('input', "#iSCSITarget").val(""); + var server = $("#iscsiserverId").val().trim(); + var port = $("#iscsiportId").val().trim(); + if(server!="" && !$("#iscsiserverId").hasClass("invalid-field") && !$("#iscsiportId").hasClass("invalid-field")){ + $("#iscsiserverId").attr("disabled", true); + $("#iscsiportId").attr("disabled", true); + loadTargets(server, port, function(){ + $("#iscsiserverId").attr("disabled", false); + $("#iscsiportId").attr("disabled", false); + }); + } + }; + $("#iscsiserverId").change(function(){ + $('input', "#iSCSITarget").off('focus', triggerLoadTarget); + $('input', "#iSCSITarget").one('focus', triggerLoadTarget); + }); + $("#iscsiportId").change(function(){ + $('input', "#iSCSITarget").off('focus', triggerLoadTarget); + $('input', "#iSCSITarget").one('focus', triggerLoadTarget); + }); + var initISCSIServers = function(){ + kimchi.getStorageServers("iscsi", function(data){ + for(var i=0;i<data.length;i++){ + var itemNode = $.parseHTML("<li>"+data[i].host+"</li>"); + $(".option", "#iSCSIServer").append(itemNode); + $(itemNode).click(function(){ + $("#iscsiportId").val($(this).prop("port")); + $("#iscsiserverId").val($(this).text()); + triggerLoadTarget(); + }).prop("port", data[i].port); + } + kimchi.storageFilterSelect('iSCSIServer', false); + }); + }; + initISCSIServers(); +}; + kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { @@ -158,8 +245,14 @@ kimchi.initStorageAddPage = function() { } }); $('#iscsiportId').keyup(function(event) { - $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); + $(this).toggleClass("invalid-field",!/^[0-9]*$/.test($(this).val())); + }); + $('#iscsiserverId').keyup(function(event) { + $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim())); + }).change(function(event) { + $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim())); }); + kimchi.setupISCSI(); }; /* Returns 'true' if all form fields were filled, 'false' if diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index fc5d5e4..d920ae2 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -152,6 +152,9 @@ "KCHPOOL6003M": "$_("It will format your disk and you will loose any data in there, are you sure to continue? ")", "KCHPOOL6004M": "$_("SCSI Fibre Channel")", "KCHPOOL6005M": "$_("No SCSI adapters found.")", + "KCHPOOL6006M": "$_("loading targets...")", + "KCHPOOL6007M": "$_("no targets is got, please input one.")", + "KCHPOOL6008M": "$_("failed to load targets.")", "KCHPOOL6001E": "$_("The storage pool name can not be blank.")", "KCHPOOL6002E": "$_("The storage pool path can not be blank.")", diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 1eb2029..6f1861b 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -23,7 +23,7 @@ <!DOCTYPE html> <html> <body> - <div class="window storage-window"> + <div class="window storage-window storage-admin"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -111,7 +111,10 @@ <div class="field"> <p class="text-help"> $_("iSCSI server IP or hostname. It should not be empty.")</p> - <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text storage-base-input-width"> + <span class="filter-select popable" id="iSCSIServer"> + <input id="iscsiserverId" type="text" placeholder="$_("Server")"> + <div class="popover"><ul class="option select-list"></ul></div> + </span> <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text storage-port-width" maxlength="4"> </div> </section> @@ -119,7 +122,10 @@ <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text storage-base-input-width"> + <span class="filter-select popable" id="iSCSITarget"> + <input id="iscsiTargetId" type="text"> + <div class="popover"><ul class="option select-list"></ul></div> + </span> </div> </section> <section class="form-section"> -- 1.7.1

2 1

[PATCH 0/6 V2] Discover Kimchi peers using openSLP
by Aline Manera 01 Sep '14

01 Sep '14

v1 -> V2: - Update docs/API.md - Expose federation on /config/capabilities Aline Manera (6): Update kimchi.config values according to command line input Delete http_port from /config API as it is not in use anymore Add federation option to Kimchi config file Discover Kimchi peers using openSLP Add documentation on how to enable federation on Kimchi Expose federation on /config/capabilities docs/API.md | 11 ++++++++- docs/README-federation.md | 27 +++++++++++++++++++++ src/kimchi.conf.in | 4 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/peers.py | 29 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 14 ++++++++--- src/kimchi/model/config.py | 6 ++--- src/kimchi/model/peers.py | 59 +++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/server.py | 1 - src/kimchid.in | 36 +++++++++++++++++---------- tests/test_rest.py | 19 +++++++++------ 11 files changed, 177 insertions(+), 30 deletions(-) create mode 100644 docs/README-federation.md create mode 100644 src/kimchi/control/peers.py create mode 100644 src/kimchi/model/peers.py -- 1.9.3

2 8

[PATCH] bug fix: Properly get the graphics expiration time
by Aline Manera 01 Sep '14

01 Sep '14

The data structure to graphics is: { graphics: {'passwd': '12345', 'passwdValidTo': 30} } Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index fb4cf22..8045b1e 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -321,7 +321,7 @@ class VMModel(object): if password is not None: graphics.attrib['passwd'] = password - expire = params.get("passwdValidTo") + expire = params['graphics'].get("passwdValidTo") to = graphics.attrib.get('passwdValidTo') if to is not None: if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) -- 1.9.3

3 3

[PATCH] model.host: changing listDevices() to listAllDevices()
by Daniel Henrique Barboza 01 Sep '14

01 Sep '14

The method listDevices() has unexpected behavior in certain situations and architectures. According the libvirt API, listAllDevices() delivers more control over the results and it does not present the same problems. For those reasons, this commit changes all the occurences of listDevices() to use listAllDevices() instead. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 39f45d8..553ad7c 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import grp +import libvirt import os import time import platform @@ -277,31 +278,45 @@ class PartitionModel(object): class DevicesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] + self.cap_map = \ + {'fc_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST, + 'net': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET, + 'pci': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_PCI_DEV, + 'scsi': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI, + 'scsi_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_HOST, + 'storage': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_STORAGE, + 'usb_device': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_DEV, + 'usb': + libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_INTERFACE} def get_list(self, _cap=None): + if _cap == 'fc_host': + return self._get_devices_fc_host() + return self._get_devices_with_capability(_cap) + + def _get_devices_with_capability(self, cap): conn = self.conn.get() - if _cap is None: - dev_names = [name.name() for name in conn.listAllDevices(0)] - elif _cap == 'fc_host': - dev_names = self._get_devices_fc_host() + if cap is None: + cap_flag = 0 else: - # Get devices with required capability - dev_names = conn.listDevices(_cap, 0) - return dev_names + cap_flag = self.cap_map.get(cap) + if cap_flag is None: + return [] + return [name.name() for name in conn.listAllDevices(cap_flag)] def _get_devices_fc_host(self): conn = self.conn.get() # Libvirt < 1.0.5 does not support fc_host capability if not CapabilitiesModel().fc_host_support: ret = [] - scsi_hosts = conn.listDevices('scsi_host', 0) + scsi_hosts = self._get_devices_with_capability('scsi_host') for host in scsi_hosts: xml = conn.nodeDeviceLookupByName(host).XMLDesc(0) path = '/device/capability/capability/@type' if 'fc_host' in xmlutils.xpath_get_text(xml, path): ret.append(host) return ret - return conn.listDevices('fc_host', 0) + return self._get_devices_with_capability('fc_host') class DeviceModel(object): -- 1.8.3.1

3 2

[PATCH] bug fix: Auto-generate guest console password when the passed value is an empty string
by Aline Manera 01 Sep '14

01 Sep '14

As the password will be an empty string we need to check if its value is not None, otherwise the password will not be generated. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index e91c0ed..d8a02cd 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -312,7 +312,7 @@ class VMModel(object): return xml password = params['graphics'].get("passwd") - if password and len(password.strip()) == 0: + if password is not None and len(password.strip()) == 0: password = "".join(random.sample(string.ascii_letters + string.digits, 8)) -- 1.9.3

2 2

[V3] UI: List iSCSI Servers & Targets
by huoyuxin＠linux.vnet.ibm.com 01 Sep '14

01 Sep '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/storage.css | 31 ++++++++++- ui/js/src/kimchi.api.js | 20 +++++++- ui/js/src/kimchi.storagepool_add_main.js | 88 ++++++++++++++++++++++++++++++ ui/pages/storagepool-add.html.tmpl | 12 +++- 4 files changed, 146 insertions(+), 5 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index 4f439e8..ab92de2 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -315,7 +315,7 @@ } .hide-content { - display: none; + display: none!important; } .volumeslist { @@ -593,3 +593,32 @@ center no-repeat; padding: 0 20px 0 26px; } + +.storage-admin .filter-select { + display: inline-block; + position: relative; +} + +#iscsiportId, .storage-admin .filter-select input { + border: 1px solid #CCCCCC; + border-radius: 1px; + font-size: 14px; + padding: 3px 3px 3px 10px; + height: 30px; +} + +.storage-admin .filter-select input::-ms-clear { + display: none; +} + +#iSCSIServer input { + width: 410px; +} + +#iscsiportId { + width: 60px; +} + +#iSCSITarget input { + width: 493px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..b657aeb 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -774,7 +774,9 @@ var kimchi = { contentType : 'application/json', dataType : 'json', success : suc, - error : err + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } }); }, @@ -1098,5 +1100,21 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getISCSITargets : function(server, port, suc, err) { + server = encodeURIComponent(server); + port = encodeURIComponent(port); + kimchi.requestJSON({ + url : kimchi.url + 'storageservers/'+server+'/storagetargets?_target_type=iscsi&_server_port='+port, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ecbc682..dc1b1c6 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -34,6 +34,90 @@ kimchi.storagepool_add_main = function() { }); }; +kimchi.storageFilterSelect = function(id, isUpdate) { + var input = $('input', '#'+id); + var options = $(".option", '#'+id); + var filter = function(container, key){ + container.children().each(function(){ + $(this).css("display", $(this).text().indexOf(key)==-1 ? "none" : ""); + }); + }; + if(!isUpdate){ + input.on("keyup", function(){ + filter(options, input.val()); + }); + } + options.children().each(function(){ + $(this).click(function(){ + options.children().removeClass("active"); + input.val($(this).text()); + $(this).addClass("active"); + filter(options, ""); + }); + }); +}; + +kimchi.setupISCSI = function(){ + var loadTargets = function(server, port, callback){ + var isUpdate = $(".option", "#iSCSITarget").children().length > 0; + $(".option", "#iSCSITarget").empty(); + $('input', "#iSCSITarget").attr("placeholder", "loading targets..."); + kimchi.getISCSITargets(server, port, function(data){ + if(data.length==0){ + $('input', "#iSCSITarget").attr("placeholder", "no targets is got, please input one."); + }else{ + for(var i=0; i<data.length; i++){ + var itemNode = $.parseHTML("<li>"+data[i].target+"</li>"); + $(".option", "#iSCSITarget").append(itemNode); + } + $('input', "#iSCSITarget").attr("placeholder", ""); + $(".popover", "#iSCSITarget").css("display", "block"); + } + kimchi.storageFilterSelect('iSCSITarget', isUpdate); + $('input', "#iSCSITarget").trigger("focus"); + callback(); + }, function(data){ + $('input', "#iSCSITarget").attr("placeholder","failed to load targets."); + callback(); + kimchi.message.error(data.responseJSON.reason); + }); + }; + var triggerLoadTarget = function(){ + $('input', "#iSCSITarget").val(""); + var server = $("#iscsiserverId").val().trim(); + var port = $("#iscsiportId").val().trim(); + if(server!="" && port!="" && !$("#iscsiserverId").hasClass("invalid-field") && !$("#iscsiportId").hasClass("invalid-field")){ + $("#iscsiserverId").attr("disabled", true); + $("#iscsiportId").attr("disabled", true); + loadTargets(server, port, function(){ + $("#iscsiserverId").attr("disabled", false); + $("#iscsiportId").attr("disabled", false); + }); + } + }; + $("#iscsiserverId").change(function(){ + triggerLoadTarget(); + }); + $("#iscsiportId").change(function(){ + triggerLoadTarget(); + }); + var initISCSIServers = function(){ + kimchi.getStorageServers("iscsi", function(data){ + for(var i=0;i<data.length;i++){ + var itemNode = $.parseHTML("<li>"+data[i].host+"</li>"); + $(".option", "#iSCSIServer").append(itemNode); + $(itemNode).click(function(){ + $("#iscsiportId").val($(this).prop("port")); + $("#iscsiserverId").val($(this).text()); + triggerLoadTarget(); + }).prop("port", data[i].port); + } + kimchi.storageFilterSelect('iSCSIServer', false); + }); + }; + initISCSIServers(); +}; + kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { @@ -160,6 +244,10 @@ kimchi.initStorageAddPage = function() { $('#iscsiportId').keyup(function(event) { $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); }); + $('#iscsiserverId').keyup(function(event) { + $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim())); + }); + kimchi.setupISCSI(); }; /* Returns 'true' if all form fields were filled, 'false' if diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 1eb2029..6f1861b 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -23,7 +23,7 @@ <!DOCTYPE html> <html> <body> - <div class="window storage-window"> + <div class="window storage-window storage-admin"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -111,7 +111,10 @@ <div class="field"> <p class="text-help"> $_("iSCSI server IP or hostname. It should not be empty.")</p> - <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text storage-base-input-width"> + <span class="filter-select popable" id="iSCSIServer"> + <input id="iscsiserverId" type="text" placeholder="$_("Server")"> + <div class="popover"><ul class="option select-list"></ul></div> + </span> <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text storage-port-width" maxlength="4"> </div> </section> @@ -119,7 +122,10 @@ <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text storage-base-input-width"> + <span class="filter-select popable" id="iSCSITarget"> + <input id="iscsiTargetId" type="text"> + <div class="popover"><ul class="option select-list"></ul></div> + </span> </div> </section> <section class="form-section"> -- 1.7.1

3 2