December 2014 - Kimchi-devel - oVirt List Archives

[PATCH] Bug 499 Fix: Disable download button of debug report when mobile
by huoyuxin＠linux.vnet.ibm.com 09 Dec '14

09 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.host.js | 2 +- ui/js/src/kimchi.main.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index b75b9e4..295e4cc 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -290,7 +290,7 @@ kimchi.host_main = function() { $(kimchi.substitute(buttonID, { grid: reportGridID, btn: n - })).prop('disabled', !toEnable); + })).prop('disabled', (n=="download"&&kimchi.isMobile)||!toEnable); }); }; var initReportGrid = function(reports) { diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 1424827..3f08d82 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -27,6 +27,8 @@ kimchi.getCapabilities(function(result) { kimchi.capabilities = {}; }); +kimchi.isMobile = /android|iphone|ipad/i.test(navigator.userAgent); + kimchi.main = function() { kimchi.isLoggingOut = false; kimchi.popable(); -- 1.7.1

3 3

[PATCH] issue #438: Display nicer error message when starting network
by Crístian Viana 09 Dec '14

09 Dec '14

If an error occurs when a network is being started (e.g. the host firewall is disabled), a generic message is displayed. Add a more specific error message for when a network fails to start. The root reason is also displayed along the message. Fix issue #438 ("Unexpected error when starting network interface with firewall disabled"). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/networks.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 45aa15e..e3a051c 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -234,6 +234,7 @@ messages = { "KCHNET0019E": _("Bridge device %(name)s can not be the trunk device of a VLAN."), "KCHNET0020E": _("Failed to activate interface %(iface)s: %(err)s."), "KCHNET0021E": _("Failed to activate interface %(iface)s. Please check the physical link status."), + "KCHNET0022E": _("Failed to start network %(name)s. Details: %(err)s"), "KCHDR0001E": _("Debug report %(name)s does not exist"), "KCHDR0002E": _("Debug report tool not found in system"), diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index 6d21e9e..f3ea099 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -305,7 +305,11 @@ class NetworkModel(object): def activate(self, name): network = self.get_network(self.conn.get(), name) - network.create() + try: + network.create() + except libvirt.libvirtError, e: + raise OperationFailed('KCHNET0022E', {'name': name, + 'err': e.message}) def deactivate(self, name): if self._is_network_in_use(name): -- 1.9.3

4 3

[PATCH] Bug fix #530: Update distros.d/ files
by Aline Manera 09 Dec '14

09 Dec '14

Add openSUSE 13.2 and Ubuntu 14.10 and update gentoo and debian links to reflect the latest distribution version available. 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 +++++++ src/distros.d/ubuntu.json | 7 +++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/distros.d/debian.json b/src/distros.d/debian.json index 60bdf41..5d6a313 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.6.0", - "path": "http://ftp.acc.umu.se/debian-cd/7.6.0-live/amd64/iso-hybrid/debian-live-7.6…" + "os_version": "7.7.0", + "path": "http://caesar.acc.umu.se/debian-cd/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-ne…" } ] diff --git a/src/distros.d/gentoo.json b/src/distros.d/gentoo.json index 1c398e8..2c0f012 100644 --- a/src/distros.d/gentoo.json +++ b/src/distros.d/gentoo.json @@ -1,9 +1,9 @@ [ { - "name": "gentoo-20140904", + "name": "gentoo-20141204", "os_distro": "gentoo", "os_arch": "x86_64", - "os_version": "20140904", - "path": "http://distfiles.gentoo.org/releases/amd64/autobuilds/current-iso/install-a…" + "os_version": "20141204", + "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 ad80c50..f51de97 100644 --- a/src/distros.d/opensuse.json +++ b/src/distros.d/opensuse.json @@ -12,5 +12,12 @@ "os_arch": "x86_64", "os_version": "13.1", "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/13.1/iso/openSUSE-13.…" + }, + { + "name": "opensuse-13.2", + "os_distro": "opensuse", + "os_arch": "x86_64", + "os_version": "13.2", + "path": "http://suse.mirrors.tds.net/pub/opensuse/distribution/13.2/iso/openSUSE-13.…" } ] diff --git a/src/distros.d/ubuntu.json b/src/distros.d/ubuntu.json index b0b5f45..161fbc8 100644 --- a/src/distros.d/ubuntu.json +++ b/src/distros.d/ubuntu.json @@ -26,5 +26,12 @@ "os_arch": "x86_64", "os_version": "14.04", "path": "http://releases.ubuntu.com/14.04/ubuntu-14.04-desktop-amd64.iso" + }, + { + "name": "Ubuntu Server 14.10 (Utopic Unicorn)", + "os_distro": "ubuntu", + "os_arch": "x86_64", + "os_version": "14.10", + "path": "http://releases.ubuntu.com/14.10/ubuntu-14.10-desktop-amd64.iso" } ] -- 1.9.3

3 3

[PATCH v2] 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 (v1) is: - Remove "python-requests" from the build/install dependencies list and put it in the test list. Crístian Viana (1): issue #504: Add details on how to install test dependencies docs/README.md | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) -- 1.9.3

3 3

[PATCH] Bug #443: Do not crash Kimchi when federation is enabled and openslp is not installed
by Aline Manera 09 Dec '14

09 Dec '14

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi.conf.in | 2 +- src/kimchi/model/peers.py | 7 +++++-- src/kimchi/utils.py | 2 +- src/kimchid.in | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/kimchi.conf.in b/src/kimchi.conf.in index 003ce4a..9f62ac0 100644 --- a/src/kimchi.conf.in +++ b/src/kimchi.conf.in @@ -27,7 +27,7 @@ #environment = production # Federation feature: register Kimchi server on openSLP and discover peers -# at the same network +# in the same network. Check README-federation for more details. #federation = off # Max request body size in KB, default value is 4GB diff --git a/src/kimchi/model/peers.py b/src/kimchi/model/peers.py index 1bf74cb..a9f5fcd 100644 --- a/src/kimchi/model/peers.py +++ b/src/kimchi/model/peers.py @@ -38,7 +38,7 @@ class PeersModel(object): cmd = ["slptool", "register", "service:kimchid://%s" % self.url] out, error, ret = run_command(cmd) - if len(out) != 0: + if out and len(out) != 0: kimchi_log.error("Unable to register server on openSLP." " Details: %s" % out) @@ -47,9 +47,12 @@ class PeersModel(object): if config.get("server", "federation") == "off": return [] - peers = [] cmd = ["slptool", "findsrvs", "service:kimchid"] out, error, ret = run_command(cmd) + if ret != 0: + return [] + + peers = [] for server in out.strip().split("\n"): match = re.match("service:kimchid://(.*?),.*", server) peer = match.group(1) diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index 68415dc..989e370 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -224,7 +224,7 @@ def run_command(cmd, timeout=None): except Exception as e: msg = "Failed to run command: %s." % " ".join(cmd) msg = msg if proc is None else msg + "\n error code: %s." - kimchi_log.error("%s\n %s", msg, e) + kimchi_log.error("%s %s", msg, e) if proc: return out, error, proc.returncode diff --git a/src/kimchid.in b/src/kimchid.in index 0746ba6..0a8dc1f 100644 --- a/src/kimchid.in +++ b/src/kimchid.in @@ -70,8 +70,9 @@ def main(options): parser.add_option('--environment', default=runningEnv, help="Running environment of kimchi server") parser.add_option('--federation', default=federation, - help="Register and discover Kimchi peers at the same " - "network using openSLP") + help="Register and discover Kimchi peers in the same " + "network using openSLP. Check README-federation for" + " more details.") parser.add_option('--test', action='store_true', help="Run server in mock model") (options, args) = parser.parse_args() -- 1.9.3

2 2

[PATCH] Bugfix #479: Allow non-admin users get devices passthrough information
by Aline Manera 09 Dec '14

09 Dec '14

The API /host/devices is used in many places (such as to create a SCSI FC pool or to list the PCI passthrough devices). As the PCI passthrough devices might be accessible for non-admin users the authorization configuration to that API was reset. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/control/host.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/kimchi/control/host.py b/src/kimchi/control/host.py index 3592388..c690945 100644 --- a/src/kimchi/control/host.py +++ b/src/kimchi/control/host.py @@ -96,8 +96,6 @@ class Partition(Resource): class Devices(Collection): def __init__(self, model): super(Devices, self).__init__(model) - self.role_key = 'storage' - self.admin_methods = ['GET'] self.resource = Device @@ -109,8 +107,6 @@ class VMHolders(SimpleCollection): class Device(Resource): def __init__(self, model, id): - self.role_key = 'storage' - self.admin_methods = ['GET'] super(Device, self).__init__(model, id) self.vm_holders = VMHolders(self.model, id) -- 1.9.3

3 3

[PATCH] issue #504: Add details on how to install test dependencies
by Crístian Viana 08 Dec '14

08 Dec '14

The package dependencies listed in docs/README.md are only required for building, installing and running Kimchi. If the user wants to run the tests, they need to install some extra packages which are not listed in that file. Update the file docs/README.md by adding the dependencies required for testing. Fix issue #504 ("check pyflakes installation"). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- docs/README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/README.md b/docs/README.md index ed3d489..681acab 100644 --- a/docs/README.md +++ b/docs/README.md @@ -69,6 +69,9 @@ Install Dependencies Packages version requirement: python-psutil >= 0.6.0 + # These dependencies are only required if you want to run the tests: + $ sudo yum install pyflakes python-pep8 + *Note for RHEL users*: Some of the above packages are located in the Red Hat EPEL repositories. See [this FAQ](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.… @@ -94,6 +97,9 @@ channel at RHN Classic or Red Hat Satellite. python-jsonschema >= 1.3.0 python-psutil >= 0.6.0 + # These dependencies are only required if you want to run the tests: + $ sudo apt-get install pyflakes pep8 + **For openSUSE:** $ sudo zypper install gcc make autoconf automake gettext-tools git \ @@ -110,6 +116,9 @@ channel at RHN Classic or Red Hat Satellite. Packages version requirement: python-psutil >= 0.6.0 + # These dependencies are only required if you want to run the tests: + $ sudo zypper install python-pyflakes python-pep8 + *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 @@ -135,6 +144,16 @@ Run $ sudo kimchid --host=0.0.0.0 + +Test +---- + + $ make check-local # check for i18n and formatting errors + $ sudo make check + +After all tests are executed, a summary will be displayed containing any +errors/failures which might have occurred. + Usage ----- -- 1.9.3

2 1

[PATCH] Bug 495 Fix: Remove error popup when non-admin login
by huoyuxin＠linux.vnet.ibm.com 08 Dec '14

08 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.main.js | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 3f08d82..be959db 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -150,7 +150,6 @@ kimchi.main = function() { */ var tab = $('#nav-menu a[href="' + url + '"]'); if (tab.length === 0) { - kimchi.message.error.code('KCHAPI6001E'); location.hash = ''; return; } -- 1.7.1

2 1

[PATCH] Bugfix#477 Fix snapshot time didn't align issue
by wenwang＠linux.vnet.ibm.com 08 Dec '14

08 Dec '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch align the create time in snapshot for IE specially since IE is using time format different from firefox. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index aaccfe7..cd8ac89 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -141,7 +141,7 @@ } .guest-edit-snapshot .created { - width: 250px; + width: 270px; } #form-guest-edit-storage .cell.dev { -- 1.9.3

2 1

[PATCH] Bug 546 Fix: Network button state issue
by huoyuxin＠linux.vnet.ibm.com 08 Dec '14

08 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.network.js | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 7194f93..34448f8 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -184,6 +184,11 @@ kimchi.addNetworkActions = function(network) { kimchi.initNetworkCreation = function() { $("#networkAdd").on("click", function() { kimchi.openNetworkDialog(function() { + var errorCallback = function(){ + $("#networkFormOk").button("enable"); + $("#networkName").removeAttr("readonly"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); + }; var network = kimchi.getNetworkDialogValues(); var data = { name : network.name, @@ -196,6 +201,7 @@ kimchi.initNetworkCreation = function() { data.vlan_id = network.vlan_id; if (!(data.vlan_id >=1 && data.vlan_id <= 4094)) { kimchi.message.error.code('KCHNET6001E'); + errorCallback(); return; } } @@ -209,9 +215,7 @@ kimchi.initNetworkCreation = function() { $("#networkConfig").dialog("close"); }, function(data) { kimchi.message.error(data.responseJSON.reason); - $("#networkFormOk").button("enable"); - $("#networkName").removeAttr("readonly"); - $("#networkFormOk span").text(i18n.KCHAPI6005M); + errorCallback(); }); }); }); -- 1.7.1

2 1