September 2014 - Kimchi-devel - oVirt List Archives

[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