December 2014 - Kimchi-devel - oVirt List Archives

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

16 Dec '14

2 4

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

16 Dec '14

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

3 2

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

15 Dec '14

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

2 2

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

15 Dec '14

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

2 2

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

15 Dec '14

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

3 2

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

15 Dec '14

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

1 0

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

14 Dec '14

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

3 2

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

12 Dec '14

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

1 0

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

11 Dec '14

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

3 14

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

11 Dec '14

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

2 3

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

11 Dec '14

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

3 3

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

11 Dec '14

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

2 4

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

11 Dec '14

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

1 0

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

10 Dec '14

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

1 0

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

10 Dec '14

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

2 4

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

10 Dec '14

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

2 2

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

10 Dec '14

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

2 1

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

10 Dec '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index cd8ac89..6815ecf 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -360,6 +360,7 @@ border-radius: 7px 0px 0px 7px; padding: 2px 2px 2px 7px; width: 100px; + height: 24px; } .guest-edit-pci .filter select option { @@ -370,6 +371,7 @@ border-radius: 0px 7px 7px 0px; padding: 3px 3px 3px 10px; width: 200px; + height: 16px; font-style: italic; } -- 1.7.1

2 1

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

10 Dec '14

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

2 2

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

10 Dec '14

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

2 1

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

09 Dec '14

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

4 4

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

09 Dec '14

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

3 6

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

09 Dec '14

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

3 5

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

09 Dec '14

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

2 1

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

09 Dec '14

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

3 3