- Kimchi-devel - oVirt List Archives

[PATCH] Translate pt_BR.po files
by Ramon Medeiros 26 Mar '14

26 Mar '14

Translation to pt_Br, by me and Rodrigo. Ramon Medeiros (1): Translate pt_BR.po file po/pt_BR.po | 505 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 272 insertions(+), 233 deletions(-) -- 1.8.3.1

2 2

[PATCH] bug fix: fix the string format %(pool).
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> a "s" should be subfix in string format %(pool). Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index de029f5..8b88cae 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -108,7 +108,7 @@ messages = { "KCHTMPL0016E": _("Specify an ISO image as CDROM to create a template"), "KCHTMPL0017E": _("All networks for the template must be specified in a list."), "KCHTMPL0018E": _("Must specify a volume to a template, when storage pool is iscsi or scsi"), - "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)"), + "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)s"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), -- 1.8.5.3

3 2

[PATCH V3 0/3] Fix non persistent network handling
by Rodrigo Trujillo 26 Mar '14

26 Mar '14

V3: Changes mockmodel and tests (Royce suggestion) V2: Address Ming comments: - Updates API.md - remove useless comments and return V1: Kimchi networks have the same problem storage had. Non persistent networks are not stop, they are removed by libvirt and this causes an error in Kimchi. Rodrigo Trujillo (3): Fix non persistent network handling (backend) Fix non persistent network handling (frontend) Fix non persistent network handling (mockmodel/tests) docs/API.md | 2 ++ src/kimchi/control/networks.py | 3 ++- src/kimchi/mockmodel.py | 7 +++++- src/kimchi/model/networks.py | 3 ++- tests/test_model.py | 1 + tests/test_rest.py | 1 + ui/js/src/kimchi.network.js | 55 ++++++++++++++++++++++++++++-------------- ui/pages/i18n.html.tmpl | 1 + 8 files changed, 52 insertions(+), 21 deletions(-) -- 1.8.5.3

2 5

[PATCH] Add error handling for repo management
by Adam King 26 Mar '14

26 Mar '14

ListRepo call had no error handler. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.host.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index acd8e8e..e94bad6 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -176,6 +176,15 @@ kimchi.host_main = function() { repositoriesGrid.setData(repositories); } } + }, + function(error) { + var message = error && error['responseJSON'] && error['responseJSON']['reason']; + + if($.isFunction(gridCallback)) { + gridCallback([]); + } + repositoriesGrid && + repositoriesGrid.showMessage(message || i18n['KCHUPD6008M']); }); $('#repositories-grid-remove-button').prop('disabled', true); -- 1.8.1.4

2 2

[PATCH v2] Logical Storage Pool: Detect and Enumerate Multipath Block Devices
by zhshzhou＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> When creating a logical storage pool Kimci ignores multipath block devices. This is on purpose because at the time the kimchi.disks was implemented, there was not enough time to test every kind of devices. This patch adds the missing support for multipath block devices. After this patch, the kimchi.disks will include multipath devices in the available partition list. The front-end code is also changed accordingly. v2 Use the major device number to determine if a deivce is a multipath one. Use indexOf of the array object to determine if an element is in array. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 13 ++++++++++++- ui/js/src/kimchi.storagepool_add_main.js | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index ce0c5bb..5f004b3 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -27,8 +27,19 @@ from kimchi.exception import OperationFailed from kimchi.utils import kimchi_log +def _get_friendly_dm_path(maj_min): + """ Returns user friendly dm path given the device number 'major:min' """ + dm_name = "/sys/dev/block/%s/dm/name" % maj_min + with open(dm_name) as dm_f: + content = dm_f.read().rstrip('\n') + return "/dev/mapper/" + content + + def _get_dev_node_path(maj_min): """ Returns device node path given the device number 'major:min' """ + if maj_min.startswith('253:'): + return _get_friendly_dm_path(maj_min) + uevent = "/sys/dev/block/%s/uevent" % maj_min with open(uevent) as ueventf: content = ueventf.read() @@ -137,7 +148,7 @@ def get_partitions_names(): # leaf means a partition, a disk has no partition, or a disk not held # by any multipath device. Physical volume belongs to no volume group # is also listed. Extended partitions should not be listed. - if not (dev['type'] in ['part', 'disk'] and + if not (dev['type'] in ['part', 'disk', 'mpath'] and dev['fstype'] in ['', 'LVM2_member'] and dev['mountpoint'] == "" and _get_vgname(devNodePath) == "" and diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 10833be..a3b60f7 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -27,8 +27,9 @@ kimchi.initStorageAddPage = function() { if (data.length > 0) { var deviceHtml = $('#partitionTmpl').html(); var listHtml = ''; + valid_types = ['part', 'disk', 'mpath']; $.each(data, function(index, value) { - if (value.type === 'part' || value.type === 'disk') { + if (valid_types.indexOf(value.type) != -1) { listHtml += kimchi.template(deviceHtml, value); } }); -- 1.8.5.3

3 2

[PATCH] validate the volume parameter when the pool of template is iscsi or scsi
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> When the pool of template is iscsi or scsi, the volume parameter can not be NULL. And as we discussion, we do not mix disks from 2 different types of storage pools, for instance: we do not create a template with 2 disks, where one comes from a SCSI pool and other is a .img in a DIR pool. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 ++ src/kimchi/model/templates.py | 50 +++++++++++++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 1f84034..bcc15b7 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -107,6 +107,8 @@ messages = { "KCHTMPL0015E": _("Invalid storage pool URI %(value)s specified for template"), "KCHTMPL0016E": _("Specify an ISO image as CDROM to create a template"), "KCHTMPL0017E": _("All networks for the template must be specified in a list."), + "KCHTMPL0018E": _("Must specify a volume to a template, when storage pool is iscsi or scsi"), + "KCHTMPL0019E": _("The volume: %(volume)s in not in storage pool %(pool)"), "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 d49632e..0e5c2b2 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -55,15 +55,17 @@ class TemplatesModel(object): params['name'] = name conn = self.conn.get() - pool_uri = params.get(u'storagepool', '') if pool_uri: - pool_name = pool_name_from_uri(pool_uri) try: - conn.storagePoolLookupByName(pool_name.encode("utf-8")) + pool_name = pool_name_from_uri(pool_uri) + pool = conn.storagePoolLookupByName(pool_name.encode("utf-8")) except Exception: raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name, 'template': name}) + tmp_volumes = [disk['volume'] for disk in params.get('disks', []) + if 'volume' in disk] + self.template_volume_validate(tmp_volumes, pool) for net_name in params.get(u'networks', []): try: @@ -83,6 +85,28 @@ class TemplatesModel(object): with self.objstore as session: return session.get_list('template') + def template_volume_validate(self, tmp_volumes, pool): + kwargs = {'conn': self.conn, 'objstore': self.objstore} + pool_type = xmlutils.xpath_get_text(pool.XMLDesc(0), "/pool/@type")[0] + pool_name = pool.name() + + # as we discussion, we do not mix disks from 2 different types of + # storage pools, for instance: we do not create a template with 2 + # disks, where one comes from a SCSI pool and other is a .img in + # a DIR pool. + if pool_type in ['iscsi', 'scsi']: + if not tmp_volumes: + raise InvalidParameter("KCHTMPL0018E") + + storagevolumes = __import__("kimchi.model.storagevolumes", + fromlist=['']) + pool_volumes = storagevolumes.StorageVolumesModel( + **kwargs).get_list(pool_name) + vols = set(tmp_volumes) - set(pool_volumes) + if vols: + raise InvalidParameter("KCHTMPL0019E", {'pool': pool_name, + 'volume': vols}) + class TemplateModel(object): def __init__(self, **kargs): @@ -128,18 +152,22 @@ class TemplateModel(object): new_t.update(params) ident = name + conn = self.conn.get() pool_uri = new_t.get(u'storagepool', '') - pool_name = pool_name_from_uri(pool_uri) - try: - conn = self.conn.get() - conn.storagePoolLookupByName(pool_name.encode("utf-8")) - except Exception: - raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name, - 'template': name}) + + if pool_uri: + try: + pool_name = pool_name_from_uri(pool_uri) + pool = conn.storagePoolLookupByName(pool_name.encode("utf-8")) + except Exception: + raise InvalidParameter("KCHTMPL0004E", {'pool': pool_name, + 'template': name}) + tmp_volumes = [disk['volume'] for disk in new_t.get('disks', []) + if 'volume' in disk] + self.templates.template_volume_validate(tmp_volumes, pool) for net_name in params.get(u'networks', []): try: - conn = self.conn.get() conn.networkLookupByName(net_name) except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, -- 1.8.5.3

4 6

[PATCH ] Fix a typo.
by Leonardo Garcia 26 Mar '14

26 Mar '14

From: Leonardo Garcia <lagarcia(a)br.ibm.com> Signed-off-by: Leonardo Garcia <lagarcia(a)br.ibm.com> --- src/kimchi/model/debugreports.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index 6ae282a..7254b1b 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -117,7 +117,7 @@ class DebugReportsModel(object): except Exception, e: # No need to call cb to update the task status here. - # The task object will catch the exception rasied here + # The task object will catch the exception raised here # and update the task status there log = logging.getLogger('Model') log.warning('Exception in generating debug file: %s', e) -- 1.8.5.3

5 4

[PATCH] bug fix: fix the string format.
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> a "s" should be subfix in string format. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 398d49a..de70522 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -68,7 +68,7 @@ messages = { "KCHVM0006E": _("Screenshot not supported for virtual machine %(name)s"), "KCHVM0007E": _("Unable to create virtual machine %(name)s. Details: %(err)s"), "KCHVM0008E": _("Unable to rename virtual machine %(name)s. Details: %(err)s"), - "KCHVM0009E": _("Unable to retrieve virtual machine %(name)s. Details: %(err)"), + "KCHVM0009E": _("Unable to retrieve virtual machine %(name)s. Details: %(err)s"), "KCHVM0010E": _("Unable to connect to powered off machine %(name)s."), "KCHVM0011E": _("Virtual machine name must be a string"), "KCHVM0012E": _("Invalid template URI: %(value)s specified for virtual machine"), @@ -173,7 +173,7 @@ messages = { "KCHNET0007E": _("Interface should be bare NIC, bonding or bridge device."), "KCHNET0008E": _("Unable to create network %(name)s. Details: %(err)s"), "KCHNET0009E": _("Unable to find a free IP address for network '%(name)s'"), - "KCHNET0010E": _("Unable to create VLAN tagged bridge using interface %(iface)s. Details: %(err)"), + "KCHNET0010E": _("Unable to create VLAN tagged bridge using interface %(iface)s. Details: %(err)s"), "KCHNET0011E": _("Network name must be a string"), "KCHNET0012E": _("Supported network types are isolated, NAT and bridge"), "KCHNET0013E": _("Network subnet must be a string with IP address and prefix or netmask"), -- 1.8.5.3

2 1

[PATCH] error message fix.
by shaohef＠linux.vnet.ibm.com 26 Mar '14

26 Mar '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> This error message is not obscure. Fix it. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index de70522..d9d2ee7 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -29,7 +29,7 @@ messages = { "KCHAPI0004E": _("Parameters %(params)s are not allowed to be updated in %(resource)s"), "KCHAPI0005E": _("Create is not allowed for %(resource)s"), "KCHAPI0006E": _("Unable to parse JSON request"), - "KCHAPI0007E": _("This API only supports"), + "KCHAPI0007E": _("This API only supports JSON"), "KCHASYNC0001E": _("Datastore is not initiated in the model object."), -- 1.8.5.3

2 1

[PATCH] Properly display YUM exception
by Aline Manera 26 Mar '14

26 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> When YUM raises an error it does not set the message exception so while using e.message we get an empty string. Fix it by using str(e) Also releases Kimchi lock before raises the exception. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/repositories.py | 2 +- src/kimchi/swupdate.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 1c74f04..3407263 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -123,7 +123,7 @@ class YumRepo(object): yb.doUnlock() except Exception, e: kimchiLock.release() - raise OperationFailed(errcode, {'err': e.message}) + raise OperationFailed(errcode, {'err': str(e)}) return repos diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 9489900..ef77e3b 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -155,7 +155,8 @@ class YumUpdate(object): self._pkgs = yb.doPackageLists('updates') yb.doUnlock() except Exception, e: - raise OperationFailed('KCHPKGUPD0003E', {'err': e.message}) + kimchiLock.release() + raise OperationFailed('KCHPKGUPD0003E', {'err': str(e)}) def getPackagesList(self): """ -- 1.7.10.4

2 2