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

[RFC] Add an sos plugin for the kimchi platform
by Christy Perez 05 Dec '14

05 Dec '14

This plugin gathers kimchi logs as well as information about libvirt storage pools defined on the system. Kimchi is an HTML5-based virtualization-management platform For more information, please visit: https://github.com/kimchi-project/kimchi/wiki Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- sos/plugins/kimchi.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sos/plugins/kimchi.py diff --git a/sos/plugins/kimchi.py b/sos/plugins/kimchi.py new file mode 100644 index 0000000..69f138e --- /dev/null +++ b/sos/plugins/kimchi.py @@ -0,0 +1,39 @@ +### This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin + +class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + """kimchi-related information + """ + + plugin_name = 'kimchi' + packages = ('kimchi',) + + def setup(self): + self.add_copy_spec([ + "/etc/kimchi/", + "/var/log/kimchi*" + ]) + + file_name = self.get_cmd_output_now("virsh -r pool-list --details") + if file_name is not None: + with open(file_name, 'r') as pools: + for pool in list(pools)[2:]: + try: + pool_name = pool.lstrip().split()[0] + self.get_cmd_output_now("virsh -r vol-list --pool \ + %s --details" % pool_name) + except: + pass -- 1.9.3

1 1

[PATCH V2] issue #498: Fix typos on Kimchi messages
by Aline Manera 05 Dec '14

05 Dec '14

Also update the po files to reflect those changes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- po/de_DE.po | 18 ++++++++++++------ po/en_US.po | 18 ++++++++++++------ po/es_ES.po | 18 ++++++++++++------ po/fr_FR.po | 20 +++++++++++++------- po/it_IT.po | 18 ++++++++++++------ po/ja_JP.po | 18 ++++++++++++------ po/kimchi.pot | 18 ++++++++++++------ po/ko_KR.po | 18 ++++++++++++------ po/pt_BR.po | 20 +++++++++++++------- po/ru_RU.po | 18 ++++++++++++------ po/zh_CN.po | 20 +++++++++++++------- po/zh_TW.po | 18 ++++++++++++------ src/kimchi/i18n.py | 6 +++--- ui/pages/i18n.json.tmpl | 2 +- ui/pages/storagepool-add-volume.html.tmpl | 4 ++-- 15 files changed, 153 insertions(+), 81 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 52831eb..a66a052 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1129,7 +1129,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1160,7 +1160,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1170,6 +1170,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1407,7 +1413,7 @@ msgstr "Gäste" msgid "Templates" msgstr "Vorlagen" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Ungültiger URL. Rückleitung zur Homepage." msgid "Failed to get application configuration" @@ -2000,10 +2006,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/en_US.po b/po/en_US.po index 37efd19..bad843c 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1007,7 +1007,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1038,7 +1038,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/es_ES.po b/po/es_ES.po index 1999dd2..e4051ec 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1147,7 +1147,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1178,7 +1178,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1188,6 +1188,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1425,7 +1431,7 @@ msgstr "Invitados" msgid "Templates" msgstr "Plantillas" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL no válido. Redirigido a la página inicial." msgid "Failed to get application configuration" @@ -2017,10 +2023,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/fr_FR.po b/po/fr_FR.po index 3e19c91..1042d55 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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/" @@ -1162,7 +1162,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1193,7 +1193,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1203,6 +1203,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1441,7 +1447,7 @@ msgstr "Invités" msgid "Templates" msgstr "Modèles" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL invalide. Redirigé vers la page d'accueil." msgid "Failed to get application configuration" @@ -2044,11 +2050,11 @@ msgstr "" msgid "Enter the remote URL here." msgstr "Saisir une URL distante ici" -msgid "Upload an file" +msgid "Upload a file" msgstr "Charger un fichier" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Sélectionner le fichier ISO (avec suffixe .iso) à charger" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Ajouter un Modèle" diff --git a/po/it_IT.po b/po/it_IT.po index 2b7d69b..a31414b 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1116,7 +1116,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1147,7 +1147,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1157,6 +1157,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1394,7 +1400,7 @@ msgstr "Guest" msgid "Templates" msgstr "Modelli" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL non valido. Reindirizzato alla home page." msgid "Failed to get application configuration" @@ -1987,10 +1993,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ja_JP.po b/po/ja_JP.po index 782992b..3188aa3 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1128,7 +1128,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1159,7 +1159,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1169,6 +1169,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1404,7 +1410,7 @@ msgstr "ゲスト" msgid "Templates" msgstr "テンプレート" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL が無効です。ホーム・ページにリダイレクトします。" msgid "Failed to get application configuration" @@ -1986,10 +1992,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/kimchi.pot b/po/kimchi.pot index 08fb697..932afb1 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1007,7 +1007,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1038,7 +1038,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ko_KR.po b/po/ko_KR.po index f2e0ad1..f61445b 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1059,7 +1059,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1090,7 +1090,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1100,6 +1100,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1336,7 +1342,7 @@ msgstr "게스트" msgid "Templates" msgstr "템플리트" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "올바르지 않은 URL입니다. 홈 페이지로 경로 지정됩니다." msgid "Failed to get application configuration" @@ -1909,10 +1915,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8c6f821..dc1649d 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\n" "PO-Revision-Date: 2014-09-16 18:45+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -1138,7 +1138,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1169,7 +1169,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1179,6 +1179,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1416,7 +1422,7 @@ msgstr "Guests" msgid "Templates" msgstr "Modelos" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL inválida. Redirecionado para a Página Inicial." msgid "Failed to get application configuration" @@ -2012,11 +2018,11 @@ msgstr "Fazer download de uma URL remota" msgid "Enter the remote URL here." msgstr "Digite a URL remota aqui." -msgid "Upload an file" +msgid "Upload a file" msgstr "Fazer upload de um arquivo" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Escolha o arquivo ISO (com extensão .iso) que você quer fazer upload." +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Adicionar Modelo" diff --git a/po/ru_RU.po b/po/ru_RU.po index acf326d..d8f8af0 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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/" @@ -1061,7 +1061,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1092,7 +1092,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1102,6 +1102,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1337,7 +1343,7 @@ msgstr "Гостевые системы" msgid "Templates" msgstr "Шаблоны" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Недопустимый URL. Перенаправление на домашнюю страницу." msgid "Failed to get application configuration" @@ -1913,10 +1919,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9ad4e8d..0eeb631 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1030,7 +1030,7 @@ msgstr "软件仓库不支持配置类型: %(items)s" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1061,7 +1061,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1071,6 +1071,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1304,7 +1310,7 @@ msgstr "客户机" msgid "Templates" msgstr "模板" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "无效的URL，已重定向到首页" msgid "Failed to get application configuration" @@ -1861,11 +1867,11 @@ msgstr "从远程URL获取" msgid "Enter the remote URL here." msgstr "在这里输入远程URL。" -msgid "Upload an file" +msgid "Upload a file" msgstr "上传一个文件" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "创建模板" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6709233..cd389d7 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:40-0200\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" @@ -1010,7 +1010,7 @@ msgstr "" #, python-format msgid "" -"Virtual machine '%(vm)s' must be stopped before creating a snapshot on it." +"Virtual machine '%(vm)s' must be stopped before creating a snapshot of it." msgstr "" #, python-format @@ -1041,7 +1041,7 @@ msgstr "" #, python-format msgid "" -"Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: " +"Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: " "%(err)s" msgstr "" @@ -1051,6 +1051,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot of virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1284,7 +1290,7 @@ msgstr "客體" msgid "Templates" msgstr "範本" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL 無效。已重新導向至首頁。" msgid "Failed to get application configuration" @@ -1847,10 +1853,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index e43fe9c..45aa15e 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -311,15 +311,15 @@ messages = { "KCHREPOS0027E": _("Unable to remove repository. Details: '%(err)s'"), "KCHREPOS0028E": _("Configuration items: '%(items)s' are not supported by repository manager"), - "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot on it."), + "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."), "KCHSNAP0002E": _("Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0003E": _("Snapshot '%(name)s' does not exist on virtual machine '%(vm)s'."), "KCHSNAP0004E": _("Unable to retrieve snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0005E": _("Unable to list snapshots on virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0006E": _("Unable to delete snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), - "KCHSNAP0008E": _("Unable to retrieve current snapshot on virtual machine '%(vm)s'. Details: %(err)s"), + "KCHSNAP0008E": _("Unable to retrieve current snapshot of virtual machine '%(vm)s'. Details: %(err)s"), "KCHSNAP0009E": _("Unable to revert virtual machine '%(vm)s' to snapshot '%(name)s'. Details: %(err)s"), - "KCHSNAP0010E": _("Unable to create snapshot on virtual machine '%(vm)s' because it contains a disk with format '%(format)s'; only 'qcow2' is supported."), + "KCHSNAP0010E": _("Unable to create snapshot of virtual machine '%(vm)s' because it contains a disk with format '%(format)s'; only 'qcow2' is supported."), "KCHCPUINF0001E": _("The number of vCPUs is too large for this system."), "KCHCPUINF0002E": _("Invalid vCPU/topology combination."), diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 1edbc19..10fa4f9 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -34,7 +34,7 @@ "Storage": "$_("Storage")", "Network": "$_("Network")", - "KCHAPI6001E": "$_("Invalid URL. Redireced to home page.")", + "KCHAPI6001E": "$_("Invalid URL. Redirected to home page.")", "KCHAPI6002E": "$_("Failed to get application configuration")", "KCHAPI6003E": "$_("This is not a valid Linux path")", "KCHAPI6004E": "$_("This is not a valid URL.")", diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/ui/pages/storagepool-add-volume.html.tmpl index c0d68f6..b5f365f 100644 --- a/ui/pages/storagepool-add-volume.html.tmpl +++ b/ui/pages/storagepool-add-volume.html.tmpl @@ -49,12 +49,12 @@ <h2> <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload" disabled/> <label for="volume-type-upload"> - $_("Upload an file") + $_("Upload a file") </label> </h2> <div class="field"> <p class="text-help"> - $_("Choose the ISO file (with .iso suffix) you want to upload.") + $_("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" /> -- 1.9.3

2 2

[PATCH] issue #498: Fix typos on Kimchi messages
by Aline Manera 05 Dec '14

05 Dec '14

Also update the po files to reflect those changes. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- po/de_DE.po | 14 ++++++++++---- po/en_US.po | 14 ++++++++++---- po/es_ES.po | 14 ++++++++++---- po/fr_FR.po | 16 +++++++++++----- po/it_IT.po | 14 ++++++++++---- po/ja_JP.po | 14 ++++++++++---- po/kimchi.pot | 14 ++++++++++---- po/ko_KR.po | 14 ++++++++++---- po/pt_BR.po | 16 +++++++++++----- po/ru_RU.po | 14 ++++++++++---- po/zh_CN.po | 16 +++++++++++----- po/zh_TW.po | 14 ++++++++++---- ui/pages/i18n.json.tmpl | 2 +- ui/pages/storagepool-add-volume.html.tmpl | 4 ++-- 14 files changed, 126 insertions(+), 54 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 52831eb..8fdc2cd 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1170,6 +1170,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1407,7 +1413,7 @@ msgstr "Gäste" msgid "Templates" msgstr "Vorlagen" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Ungültiger URL. Rückleitung zur Homepage." msgid "Failed to get application configuration" @@ -2000,10 +2006,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/en_US.po b/po/en_US.po index 37efd19..9c1f99b 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/es_ES.po b/po/es_ES.po index 1999dd2..59130cc 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1188,6 +1188,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1425,7 +1431,7 @@ msgstr "Invitados" msgid "Templates" msgstr "Plantillas" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL no válido. Redirigido a la página inicial." msgid "Failed to get application configuration" @@ -2017,10 +2023,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/fr_FR.po b/po/fr_FR.po index 3e19c91..f9465d6 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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/" @@ -1203,6 +1203,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1441,7 +1447,7 @@ msgstr "Invités" msgid "Templates" msgstr "Modèles" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL invalide. Redirigé vers la page d'accueil." msgid "Failed to get application configuration" @@ -2044,11 +2050,11 @@ msgstr "" msgid "Enter the remote URL here." msgstr "Saisir une URL distante ici" -msgid "Upload an file" +msgid "Upload a file" msgstr "Charger un fichier" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Sélectionner le fichier ISO (avec suffixe .iso) à charger" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Ajouter un Modèle" diff --git a/po/it_IT.po b/po/it_IT.po index 2b7d69b..2cc5fef 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1157,6 +1157,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1394,7 +1400,7 @@ msgstr "Guest" msgid "Templates" msgstr "Modelli" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL non valido. Reindirizzato alla home page." msgid "Failed to get application configuration" @@ -1987,10 +1993,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ja_JP.po b/po/ja_JP.po index 782992b..62d5ef7 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1169,6 +1169,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1404,7 +1410,7 @@ msgstr "ゲスト" msgid "Templates" msgstr "テンプレート" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL が無効です。ホーム・ページにリダイレクトします。" msgid "Failed to get application configuration" @@ -1986,10 +1992,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/kimchi.pot b/po/kimchi.pot index 08fb697..420f097 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1048,6 +1048,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1281,7 +1287,7 @@ msgstr "" msgid "Templates" msgstr "" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "" msgid "Failed to get application configuration" @@ -1833,10 +1839,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/ko_KR.po b/po/ko_KR.po index f2e0ad1..dc4ae3a 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1100,6 +1100,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1336,7 +1342,7 @@ msgstr "게스트" msgid "Templates" msgstr "템플리트" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "올바르지 않은 URL입니다. 홈 페이지로 경로 지정됩니다." msgid "Failed to get application configuration" @@ -1909,10 +1915,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8c6f821..fd815a3 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\n" "PO-Revision-Date: 2014-09-16 18:45+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -1179,6 +1179,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1416,7 +1422,7 @@ msgstr "Guests" msgid "Templates" msgstr "Modelos" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL inválida. Redirecionado para a Página Inicial." msgid "Failed to get application configuration" @@ -2012,11 +2018,11 @@ msgstr "Fazer download de uma URL remota" msgid "Enter the remote URL here." msgstr "Digite a URL remota aqui." -msgid "Upload an file" +msgid "Upload a file" msgstr "Fazer upload de um arquivo" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "Escolha o arquivo ISO (com extensão .iso) que você quer fazer upload." +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "Adicionar Modelo" diff --git a/po/ru_RU.po b/po/ru_RU.po index acf326d..ebd32e2 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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/" @@ -1102,6 +1102,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1337,7 +1343,7 @@ msgstr "Гостевые системы" msgid "Templates" msgstr "Шаблоны" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "Недопустимый URL. Перенаправление на домашнюю страницу." msgid "Failed to get application configuration" @@ -1913,10 +1919,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9ad4e8d..b6ca095 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1071,6 +1071,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1304,7 +1310,7 @@ msgstr "客户机" msgid "Templates" msgstr "模板" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "无效的URL，已重定向到首页" msgid "Failed to get application configuration" @@ -1861,11 +1867,11 @@ msgstr "从远程URL获取" msgid "Enter the remote URL here." msgstr "在这里输入远程URL。" -msgid "Upload an file" +msgid "Upload a file" msgstr "上传一个文件" -msgid "Choose the ISO file (with .iso suffix) you want to upload." -msgstr "选择您需要上传的ISO文件(以.iso为后缀名)。" +msgid "Choose the file you want to upload." +msgstr "" msgid "Add Template" msgstr "创建模板" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6709233..da3aa16 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-12-01 12:26-0200\n" +"POT-Creation-Date: 2014-12-05 13:06-0200\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" @@ -1051,6 +1051,12 @@ msgid "" "%(err)s" msgstr "" +#, python-format +msgid "" +"Unable to create snapshot on virtual machine '%(vm)s' because it contains a " +"disk with format '%(format)s'; only 'qcow2' is supported." +msgstr "" + msgid "The number of vCPUs is too large for this system." msgstr "" @@ -1284,7 +1290,7 @@ msgstr "客體" msgid "Templates" msgstr "範本" -msgid "Invalid URL. Redireced to home page." +msgid "Invalid URL. Redirected to home page." msgstr "URL 無效。已重新導向至首頁。" msgid "Failed to get application configuration" @@ -1847,10 +1853,10 @@ msgstr "" msgid "Enter the remote URL here." msgstr "" -msgid "Upload an file" +msgid "Upload a file" msgstr "" -msgid "Choose the ISO file (with .iso suffix) you want to upload." +msgid "Choose the file you want to upload." msgstr "" msgid "Add Template" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 1edbc19..10fa4f9 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -34,7 +34,7 @@ "Storage": "$_("Storage")", "Network": "$_("Network")", - "KCHAPI6001E": "$_("Invalid URL. Redireced to home page.")", + "KCHAPI6001E": "$_("Invalid URL. Redirected to home page.")", "KCHAPI6002E": "$_("Failed to get application configuration")", "KCHAPI6003E": "$_("This is not a valid Linux path")", "KCHAPI6004E": "$_("This is not a valid URL.")", diff --git a/ui/pages/storagepool-add-volume.html.tmpl b/ui/pages/storagepool-add-volume.html.tmpl index c0d68f6..b5f365f 100644 --- a/ui/pages/storagepool-add-volume.html.tmpl +++ b/ui/pages/storagepool-add-volume.html.tmpl @@ -49,12 +49,12 @@ <h2> <input type="radio" id="volume-type-upload" class="volume-type" name="volumeType" value="upload" disabled/> <label for="volume-type-upload"> - $_("Upload an file") + $_("Upload a file") </label> </h2> <div class="field"> <p class="text-help"> - $_("Choose the ISO file (with .iso suffix) you want to upload.") + $_("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" /> -- 1.9.3

2 2

[PATCH V2] issue #491: Check model parameter exists when generating the interface XML
by Aline Manera 05 Dec '14

05 Dec '14

V1 -> V2: - Add test case Aline Manera (1): issue #491: Check model parameter exists when generating the interface XML src/kimchi/xmlutils/interface.py | 4 +++- tests/test_model.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) -- 1.9.3

2 3

[PATCH] issue #515: Add check_i18n.py to EXTRA_DIST
by lvroyce＠linux.vnet.ibm.com 05 Dec '14

05 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> make check-local errors for tarball because of lacking "check_i18n.py", adding it to EXTRA_DIST so that make check-local can work right. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- contrib/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index e36d4cd..393306f 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -17,6 +17,7 @@ SUBDIRS = DEBIAN EXTRA_DIST = \ + check_i18n.py \ kimchid.sysvinit \ kimchid.service.fedora \ kimchi.spec.fedora.in \ -- 1.8.3.2

2 2

[PATCH] issue#532: Fix ldap admin filtering
by lvroyce＠linux.vnet.ibm.com 05 Dec '14

05 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> LDAP admin ID is filtered because leading/trailing spaces. Fix this by truncating spaces. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index 330d98c..22c5c81 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -222,9 +222,11 @@ class LDAPUser(User): return self.user[USER_GROUPS] def get_roles(self): - admin_id = config.get("authentication", "ldap_admin_id").strip('"') - if self.user[USER_NAME] in admin_id.split(','): - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') + 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') return self.user[USER_ROLES] def get_user(self): -- 1.8.3.2

2 3

[PATCH] issue #475: Properly set cert and key variables when starting nginx proxy
by Aline Manera 05 Dec '14

05 Dec '14

When specifying a custom SSL certificate and key, Kimchi did not start up due the error: Traceback (most recent call last): File "/usr/bin/kimchid", line 95, in sys.exit(main(sys.argv[1:])) File "/usr/bin/kimchid", line 92, in main kimchi.server.main(options) File "/usr/lib/python2.6/site-packages/kimchi/server.py", line 183, in main srv = Server(options) File "/usr/lib/python2.6/site-packages/kimchi/server.py", line 62, in init start_proxy(options) File "/usr/lib/python2.6/site-packages/kimchi/proxy.py", line 89, in start_proxy _create_proxy_config(options) File "/usr/lib/python2.6/site-packages/kimchi/proxy.py", line 78, in _create_proxy_config cert_pem=cert, cert_key=key, UnboundLocalError: local variable 'cert' referenced before assignment Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/proxy.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kimchi/proxy.py b/src/kimchi/proxy.py index 9238147..fafa5bc 100644 --- a/src/kimchi/proxy.py +++ b/src/kimchi/proxy.py @@ -43,7 +43,6 @@ def _create_proxy_config(options): Arguments: options - OptionParser object with Kimchi config options """ - # User that will run the worker process of the proxy. Fedora, # RHEL and Suse creates an user called 'nginx' when installing # the proxy. Ubuntu creates an user 'www-data' for it. @@ -54,8 +53,11 @@ def _create_proxy_config(options): user_proxy = 'www-data' config_dir = paths.conf_dir + cert = options.ssl_cert + key = options.ssl_key + # No certificates specified by the user - if not options.ssl_cert or not options.ssl_key: + if not cert or not key: cert = '%s/kimchi-cert.pem' % config_dir key = '%s/kimchi-key.pem' % config_dir # create cert files if they don't exist -- 1.9.3

3 4

[PATCH] UI: Use capabilities cached values on 'Host PCI Device' tab
by Aline Manera 05 Dec '14

05 Dec '14

Kimchi capabilities are cached on UI to avoid multiples request to it as those values does not change with high frequency. So use the cached values to check host has kernel_vfio capability. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 132 ++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 9d87a73..359add8 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -360,77 +360,75 @@ kimchi.guest_edit_main = function() { var setupPCIDevice = function(){ kimchi.getHostPCIDevices(function(hostPCIs){ kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){ - kimchi.getCapabilities(function(result) { - var pciEnabled = result.kernel_vfio; - for(var i=0; i<hostPCIs.length; i++){ - var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ - name: hostPCIs[i].name, - product: hostPCIs[i].product.description, - vendor: hostPCIs[i].vendor.description - })); - $(".body", "#form-guest-edit-pci").append(itemNode); - var iconClass = "ui-icon-plus"; - for(var j=0; j<vmPCIs.length; j++){ - if(hostPCIs[i].name==vmPCIs[j].name){ - iconClass = "ui-icon-minus"; - break; - } + var pciEnabled = kimchi.capabilities.kernel_vfio; + for(var i=0; i<hostPCIs.length; i++){ + var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ + name: hostPCIs[i].name, + product: hostPCIs[i].product.description, + vendor: hostPCIs[i].vendor.description + })); + $(".body", "#form-guest-edit-pci").append(itemNode); + var iconClass = "ui-icon-plus"; + for(var j=0; j<vmPCIs.length; j++){ + if(hostPCIs[i].name==vmPCIs[j].name){ + iconClass = "ui-icon-minus"; + break; } - pciEnabled || $("button", itemNode).remove(); - $("button", itemNode).button({ - icons: { primary: iconClass }, - text: false - }).click(function(){ - var obj = $(this); - if(obj.button("option", "icons").primary == "ui-icon-minus"){ - kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ - for(var k=0; k<hostPCIs.length; k++) { - $("button", "#" + hostPCIs[k].name).button("option", "icons", {primary: "ui-icon-plus"}); - } - for(var k=0; k<vmPCIs1.length; k++) { - $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); - } - }); - filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + } + pciEnabled || $("button", itemNode).remove(); + $("button", itemNode).button({ + icons: { primary: iconClass }, + text: false + }).click(function(){ + var obj = $(this); + if(obj.button("option", "icons").primary == "ui-icon-minus"){ + kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<hostPCIs.length; k++) { + $("button", "#" + hostPCIs[k].name).button("option", "icons", {primary: "ui-icon-plus"}); + } + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } }); - }else{ - kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ - kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ - for(var k=0; k<vmPCIs1.length; k++) { - $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); - } - }); - filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } else { + kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs1){ + for(var k=0; k<vmPCIs1.length; k++) { + $("button", "#" + vmPCIs1[k].name).button("option", "icons", {primary: "ui-icon-minus"}); + } }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } + }); + kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { + var pciTitle = i18n["KCHVMED6007M"] + "\n"; + var haveCompanions = false; + for(var p=0; p<infoData.length; p++) { + if(infoData[p].device_type === "net") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6001M"] + " " + infoData[p].interface; + pciTitle += ", " + i18n["KCHVMED6002M"] + " " + infoData[p].address; + pciTitle += ", " + i18n["KCHVMED6003M"] + " " + infoData[p].link_type + "\n"; + } else if(infoData[p].device_type === "storage") { + haveCompanions = true; + pciTitle += " " + infoData[p].name + "\n"; + pciTitle += " " + i18n["KCHVMED6004M"] + " " + infoData[p].block; + pciTitle += ", " + i18n["KCHVMED6005M"] + " " + infoData[p].drive_type; + pciTitle += ", " + i18n["KCHVMED6006M"] + " " + infoData[p].model + "\n"; } - }); - kimchi.getPCIDeviceCompanions(hostPCIs[i].name, function(infoData) { - var pciTitle = i18n["KCHVMED6007M"] + "\n"; - var haveCompanions = false; - for(var p=0; p<infoData.length; p++) { - if(infoData[p].device_type === "net") { - haveCompanions = true; - pciTitle += " " + infoData[p].name + "\n"; - pciTitle += " " + i18n["KCHVMED6001M"] + " " + infoData[p].interface; - pciTitle += ", " + i18n["KCHVMED6002M"] + " " + infoData[p].address; - pciTitle += ", " + i18n["KCHVMED6003M"] + " " + infoData[p].link_type + "\n"; - } else if(infoData[p].device_type === "storage") { - haveCompanions = true; - pciTitle += " " + infoData[p].name + "\n"; - pciTitle += " " + i18n["KCHVMED6004M"] + " " + infoData[p].block; - pciTitle += ", " + i18n["KCHVMED6005M"] + " " + infoData[p].drive_type; - pciTitle += ", " + i18n["KCHVMED6006M"] + " " + infoData[p].model + "\n"; - } - } - for(var q=0; q<infoData.length; q++) { - haveCompanions && $(".name", "#" + infoData[q].parent).attr("title", pciTitle); - haveCompanions && $(".product", "#" + infoData[q].parent).attr("title", pciTitle); - haveCompanions && $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); - } - }); - } - }); + } + for(var q=0; q<infoData.length; q++) { + haveCompanions && $(".name", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".product", "#" + infoData[q].parent).attr("title", pciTitle); + haveCompanions && $(".vendor", "#" + infoData[q].parent).attr("title", pciTitle); + } + }); + } }); }); var filterNodes = function(group, text){ -- 1.9.3

3 3

[PATCH] issue #491: Check model parameter exists when generating the interface XML
by Aline Manera 05 Dec '14

05 Dec '14

When interface model is not explicitly set on interface XML, libvirt automaticaly sets the default value. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/xmlutils/interface.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kimchi/xmlutils/interface.py b/src/kimchi/xmlutils/interface.py index c76131a..7b79584 100644 --- a/src/kimchi/xmlutils/interface.py +++ b/src/kimchi/xmlutils/interface.py @@ -32,7 +32,9 @@ def get_iface_xml(params, arch=None, os_distro=None, os_version=None): """ interface = E.interface(type=params['type']) interface.append(E.source(network=params['network'])) - interface.append(E.model(type=params['model'])) + + if 'model' in params.keys(): + interface.append(E.model(type=params['model'])) mac = params.get('mac', None) if mac is not None: -- 1.9.3

3 3

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

04 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. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/storagepools.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 20c9e5a..ba2cf3e 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -202,6 +202,11 @@ 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 + return 0 + except Exception as e: raise OperationFailed("KCHPOOL0008E", {'name': pool.name(), 'err': e.get_error_message()}) -- 1.9.3

2 2

[PATCH] issue #492: Expressly set autoport to yes in vm graphics.
by Aline Manera 04 Dec '14

04 Dec '14

From: Alan Jenkins <alan.james.jenkins(a)gmail.com> Signed-off-by: Alan Jenkins <alan.james.jenkins(a)gmail.com> Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/xmlutils/graphics.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/xmlutils/graphics.py b/src/kimchi/xmlutils/graphics.py index 4c69cd9..53cba09 100644 --- a/src/kimchi/xmlutils/graphics.py +++ b/src/kimchi/xmlutils/graphics.py @@ -32,7 +32,8 @@ def get_graphics_xml(params): <target type='virtio' name='com.redhat.spice.0'/> </channel> """ - graphics = E.graphics(type=params['type'], listen=params['listen']) + graphics = E.graphics(type=params['type'], autoport='yes', + listen=params['listen']) graphics_xml = ET.tostring(graphics, encoding='utf-8', pretty_print=True) if params['type'] == 'vnc': -- 1.9.3

2 2

[PATCH] Bugfix: fix testcase for repository update
by lvroyce＠linux.vnet.ibm.com 04 Dec '14

04 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Context manager delete the created repository as cleanup, But repository is update afterwards, the newly created one does not exist any more. So update repository again to the original one so that context manager can delete it successfully. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- tests/test_model.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index 1355295..c42c8de 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1655,16 +1655,17 @@ class ModelTests(unittest.TestCase): self.assertEquals(system_host_repos + 1, len(host_repos)) # update repositories with invalid data - for repo in invalid_repos: + for tmp_repo in invalid_repos: self.assertRaises(InvalidParameter, inst.repository_update, - repo_id, repo) + repo_id, tmp_repo) new_repo_id = inst.repository_update(repo_id, new_repo) repo_info = inst.repository_lookup(new_repo_id) - self.assertEquals(new_repo_id, repo_info['repo_id']) - self.assertEquals(new_repo['baseurl'], repo_info['baseurl']) - self.assertEquals(True, repo_info['enabled']) + self.assertEquals(new_repo_id, repo_info['repo_id']) + self.assertEquals(new_repo['baseurl'], repo_info['baseurl']) + self.assertEquals(True, repo_info['enabled']) + inst.repository_update(new_repo_id, repo) def test_repository_disable_enable(self): inst = model.Model('test:///default', -- 1.8.3.2

2 1

[PATCH] Bugfix: Disable actions not supported by non-persistent VMs
by Wen Wang 04 Dec '14

04 Dec '14

1) Disable "Reset" and "Delete" buttons when using non-persistent VMs 2) Disable "Reset" button when VM is shutdown Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/list.css | 11 +++++++++++ ui/js/src/kimchi.guest_main.js | 7 +++++-- ui/pages/guest.html.tmpl | 10 +++++----- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index ded18eb..52cccc4 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -228,6 +228,17 @@ padding: 7px 10px; } +.guest-actions .top button { + display: inline-block; + width: 42px; + height: 42px; +} + +.guest-actions .top button span { + margin-left: -3px; + margin-top: -1px; +} + .guest-actions .bottom { padding: 0 10px; } diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index 2fd5c55..21caf1b 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -252,6 +252,7 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM list entry var vmRunningBool=(vmObject.state=="running"); + var vmPersistent = (vmObject.persistent == true); result.attr('id',vmObject.name); result.data(vmObject); @@ -302,8 +303,10 @@ kimchi.createGuestLi = function(vmObject, prevScreenImage, openMenu) { //Setup the VM Actions var guestActions=result.find("div[name=guest-actions]"); - guestActions.find(".shutoff-disabled").prop('disabled', !vmRunningBool ); - guestActions.find(".running-disabled").prop('disabled', vmRunningBool ); + guestActions.find(".shutoff-disabled").prop("disabled", !vmRunningBool); + guestActions.find(".running-disabled").prop("disabled", vmRunningBool); + guestActions.find(".non-persistent-disabled").prop("disabled", !vmPersistent); + guestActions.find(".reset-disabled").prop("disabled", !vmRunningBool || !vmPersistent); if (vmRunningBool) { guestActions.find(".running-hidden").hide(); diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index ebb5e86..3cc2fad 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -50,9 +50,9 @@ </div> <div class="sortable guest-actions" name="guest-actions"> <div class="top"> - <a class="btn shutoff-disabled" name="vm-reset" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></a> - <a class="btn running-hidden" name="vm-start" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></a> - <a class="btn shutoff-hidden" name="vm-poweroff" href="javascript:void(0);" title="$_("Power Off")"><span class="icon power-up"></span></a> + <button class="btn reset-disabled" name="vm-reset" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></button> + <button class="btn running-hidden" name="vm-start" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></button> + <button class="btn shutoff-hidden" name="vm-poweroff" href="javascript:void(0);" title="$_("Power Off")"><span class="icon power-up"></span></button> </div> <div class="bottom"> <div name="actionmenu" class="btn dropdown popable vm-action" style="width: 70px"> @@ -61,11 +61,11 @@ <button class="button-big shutoff-disabled" name="vm-console" ><span class="text">$_("Connect")</span></button> <button class="button-big running-disabled" name="vm-clone"><span class="text">$_("Clone")</span></button> <button class="button-big" 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 non-persistent-disabled" 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> <button class="button-big running-hidden" name="vm-start"><span class="text">$_("Start")</span></button> <button class="button-big shutoff-hidden" name="vm-poweroff"><span class="text">$_("Power Off")</span></button> - <a class="button-big red " name="vm-delete">$_("Delete")</a> + <button class="button-big red non-persistent-disabled" name="vm-delete">$_("Delete")</button> </div> </div> </div> -- 1.9.3

2 1

[PATCH] Change pattern match in pep8 filtering
by lvroyce＠linux.vnet.ibm.com 04 Dec '14

04 Dec '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Files like "./src/kimchi/i18n.py" will be warned with error by pep8 because pep8 uses wildcard searching instead of interpreting path of file. So change pattern to fix this problem. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ec88787..62b10fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST = \ $(NULL) -PEP8_BLACKLIST = src/kimchi/config.py,src/kimchi/i18n.py,tests/test_config.py +PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" -- 1.8.3.2

4 3

[PATCH 0/2] More snapshot bugfixes
by Crístian Viana 04 Dec '14

04 Dec '14

Crístian Viana (2): Only allow VM snapshots to be taken on 'qcow2' disks Revert "snapshot: Clone snapshots when cloning a VM" src/kimchi/i18n.py | 1 + src/kimchi/model/vms.py | 29 +---------------------------- src/kimchi/model/vmsnapshots.py | 17 +++++++++++++++-- tests/test_model.py | 11 ----------- tests/test_rest.py | 19 ++----------------- 5 files changed, 19 insertions(+), 58 deletions(-) -- 1.9.3

2 3