February 2015 - Kimchi-devel - oVirt List Archives

RFC - Guest memory usage
by Daniel Henrique Barboza 27 Oct '15

27 Oct '15

I was looking at the following item in the backlog: Guests Stats: Display memory utilization (use virt-df or virt-top or ...) If I understood it right, the idea here is to show the -inner- memory allocation of the guest. If you have a VM with 4Gb of RAM running an Ubuntu, we want to know how much memory the Ubuntu OS and its processes are using. I've done an investigation and I haven't found any tool to accomplish this. "virt-top", "virsh dommemstat" and the libvirt API retrieves the information of the memory usage of the guest relative to the host. In the example mentioned before, supposing that the host has 64Gb of RAM, all these tools would show that the VM is using 12% of the host RAM. They do not dive in the VM and shows the actual mem usage of the Ubuntu and its processes running there. Haven't found anything useful in other MLs and forums. The common answer is 'run top in a terminal inside the VM', which of course does not suit us. My question is: any thoughts about how we can implement this feature? Because I am starting to think that, in the end, this kind of info is strict to the guest OS and can't be polled from the outside. Thanks!

5 5

[kimchi-devel][PATCHv3 0/6] Upload storage volume
by lvroyce＠linux.vnet.ibm.com 03 Apr '15

03 Apr '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> known issue: When using api to send requests without setting up session, cherrypy server will report error after hundred of calls, because race condition below: https://bitbucket.org/cherrypy/cherrypy/pull-request/50/fix-race-condition-… But it works well with session setup. v3>v1, Use libvirt upload api instead of r/w file Use lock to synchronize upload to prevent Royce Lv (6): Update docs and json schema of storage volume upload Update controller to make update accept formdata params Add lock facility for storage volume upload Update model for storage volume update Fix incomplete record when uploading update test case for storage volume upload docs/API.md | 7 ++-- src/kimchi/API.json | 19 +++++++++++ src/kimchi/control/base.py | 6 ++-- src/kimchi/i18n.py | 4 +++ src/kimchi/isoinfo.py | 5 ++- src/kimchi/mockmodel.py | 8 ++--- src/kimchi/model/storagevolumes.py | 61 +++++++++++++++------------------- src/kimchi/model/utils.py | 46 ++++++++++++++++++++++++++ tests/test_model.py | 67 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 177 insertions(+), 46 deletions(-) -- 2.1.0

3 20

[PATCH] RFC patch to make nginx proxy optional
by Julien Goodwin 03 Apr '15

03 Apr '15

Sending this as an RFC patch, I expect people will want changes from this. Implements Issue #570. Julien Goodwin (1): Initial prototype, make nginx proxy optional. docs/Makefile.am | 1 + docs/apache.conf.ex | 35 +++++++++++++++++++++++++++++++++++ src/kimchi.conf.in | 3 +++ src/kimchi/config.py.in | 1 + src/kimchi/proxy.py | 6 ++++++ 5 files changed, 46 insertions(+) create mode 100644 docs/apache.conf.ex -- 2.1.4

4 18

[RFC] New API to create a random guest console password
by Aline Manera 02 Apr '15

02 Apr '15

Today user may set/change the guest console password and also its expiration time through Kimchi API. When passing an empty password, a random password is automatically generated. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": ""}}' That way is difficult to handle when user wants to reset the guest password. We have a similar issue when we automatically change the passwdValidTo when it is expired - increasing it in 30 seconds. My proposal is simple: only change "passwd" and "passwdValidTo" when user wants to do it. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwd": "123456", "passwdValidTo": "<some datetime format>"}}' curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"passwdValidTo": "<some datetime format>"}}' And make sure the passwdValidTo is only acceptable when there is a passwd set. And to reset those values, we only need to send an empty string: curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah -X PUT -d'{"graphics": {"password": "", "passwdValidTo": ""}}' And create a new API: POST /vms/blah/ticket to automatically generate a random password valid only for 30 seconds. curl -u <user:password> -H "Content-Type: application/json" -H "Accept: application/json" http://localhost:8010/vms/blah/ticket -X POST -d'{}' What do you think about it? Regards, Aline Manera

2 3

[PATCH][RFC] Kimchi and relative URLs
by Frédéric Bonnard 01 Apr '15

01 Apr '15

From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com> Hi, many people and distros use a subdirectory in the configuration of the system's webserver to configure different websites. The usual way to setup a website is thus to : 1. use the distro's webserver to serve all the websites 2. have a subdirectory to copy the configuration file that makes available a website by only restarting the webserver (and removing the website is just done by removing the configuration file and restart). Concerning this point, the classical configurations can be : a) a sub web location : https://website.org/webapp b) a virtual host : http://webapp.website.org a) and b) correspond each to different configuration files that are just dropped into : - Ubuntu/Debian : /etc/{apache,nginx,..}/sites-available/{webapp_subweb,webapp_virthost}.conf - Fedora/Opensuse : /etc/{httpd,nginx,..}/conf.d/ At the moment kimchi is launched with a private instance of nginx, not the system's installed one and it would be nice to have this improved and this is covered in another thread : http://lists.ovirt.org/pipermail/kimchi-devel/2015-February/009642.html Provided that previous patch, one can use the distro's webserver to run proxy kimchi and that fullfills 1. Then for 2. one need a configuration file for either b) (provided for apache in the link above ; I have also one for nginx ) and a), which I provide in this patch. But this nginx configuration file is not enough for a sub web location configuration as kimchi relies on absolute path based on / from the http://server/. I tried to make URLs paths relative so that kimchi doesn't have to know where it has been placed on the webserver, for example https://server/kimchi/ which will probably be the URL used in distros. I'm not a web developer and I tried to modify all failing requests with a a) configuration with relative paths in mind. So I'd like comments on the way this is done, and this may need more extensive testing (paths I didn't test). Though I used that code back on a virtualhost configuration and it worked as well. Thanks for your help, F. Frederic Bonnard (1): Making urls relative docs/Makefile.am | 1 + docs/nginx.conf.subsite.ex | 37 +++++++ src/kimchi/screenshot.py | 2 +- ui/css/theme-default/template_add.css | 20 ++-- ui/css/theme-default/topbar.css | 2 +- ui/js/src/kimchi.api.js | 176 +++++++++++++++++----------------- ui/js/src/kimchi.login.js | 2 +- ui/pages/guest.html.tmpl | 2 +- ui/pages/help/dita-help.xsl | 4 +- ui/pages/kimchi-ui.html.tmpl | 4 +- ui/pages/storagepool-add.html.tmpl | 2 +- ui/pages/tabs/storage.html.tmpl | 2 +- ui/pages/template-add.html.tmpl | 2 +- 13 files changed, 147 insertions(+), 109 deletions(-) create mode 100644 docs/nginx.conf.subsite.ex -- 1.9.1

4 9

[kimchi-devel][PATCH 0/2] Fix error usage of feature tests
by lvroyce＠linux.vnet.ibm.com 13 Mar '15

13 Mar '15

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Feature tests depend on running kimchi server should not be used in model tests, while coincidently, command "qemu-io -r http://localhost:8080/images/icon-fedora.png -c 'read -v 0 512'" return code is 0 so we cannot count on the return code. This patch forces module usage without running kimchi server to return false, and fixes testcase accordingly. REF: https://github.com/kimchi-project/kimchi/issues/579 https://github.com/kimchi-project/kimchi/issues/580 Royce Lv (2): Avoid using server dependent feature tests when server not running Fix wrong usage of feature tests src/kimchi/model/featuretests.py | 5 ++++- src/kimchi/utils.py | 8 ++++++++ tests/test_model.py | 16 +++++++--------- 3 files changed, 19 insertions(+), 10 deletions(-) -- 1.9.3

3 6

[PATCH v2] Remove Non-ASCII chars from tests when unnecessary
by Christy Perez 11 Mar '15

11 Mar '15

A domain with non-ASCII characters will fail to start. There are several tests that use such characters, and these tests fail. None of the failing tests are required to test the validity of non-ascii characters, so it's best to remove them and create seperate tests explicitly for these chracters. This way we will not be masking actual issues by ignoring an expected failure. The issue was first noticed with libvirt 1.1.3. The character issue is discussed in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1062943 Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- tests/test_model.py | 112 +++++++++++++++++++++++++++----------- tests/test_model_network.py | 6 +- tests/test_model_storagepool.py | 27 +++++++++ tests/test_model_storagevolume.py | 1 - 4 files changed, 113 insertions(+), 33 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f80f1c9..ada7498 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -97,6 +97,44 @@ def test_vm_info(self): self.assertTrue(info['persistent']) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + def test_non_ascii_vm_name(self): + inst = model.Model(objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + vol_params = {'name': u'test-vol', 'capacity': 1024} + task = inst.storagevolumes_create(u'default', vol_params) + rollback.prependDefer(inst.storagevolume_delete, u'default', + vol_params['name']) + inst.task_wait(task['id']) + task = inst.task_lookup(task['id']) + self.assertEquals('finished', task['status']) + vol = inst.storagevolume_lookup(u'default', vol_params['name']) + + # Create template + params = {'name': 'test', 'disks': [{'base': vol['path'], + 'size': 1}], + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, 'test') + + # Create VM with non-ascii char name + params = {'name': u'��e��-��', 'template': '/templates/test'} + inst.vms_create(params) + rollback.prependDefer(inst.vm_delete, u'��e��-��') + + vms = inst.vms_get_list() + self.assertTrue(u'��e��-��' in vms) + + # Start VM + # Note: This fails with libvirt > 1.1.3 + inst.vm_start(u'��e��-��') + info = inst.vm_lookup(u'��e��-��') + self.assertEquals('running', info['state']) + + vms = inst.vms_get_list() + self.assertFalse(u'��e��-��' in vms) + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -620,6 +658,18 @@ def test_template_storage_customise(self): params = {'storagepool': '/storagepools/default'} inst.template_update('test', params) + def test_non_ascii_template_create(self): + inst = model.Model('test:///default', + objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + params = {'name': u'��e��-te��plate', 'memory': 1024, 'cpus': 1, + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, u'��e��-te��plate') + info = inst.template_lookup(u'��e��-te��plate') + self.assertEquals(info['name'], u'��e��-te��plate') + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_create(self): inst = model.Model('test:///default', @@ -737,7 +787,7 @@ def test_template_update(self): inst.network_activate(net_name) rollback.prependDefer(inst.network_deactivate, net_name) - net_name = u'k��h��-��et' + net_name = u'kimchi-net' net_args = {'name': net_name, 'connection': 'nat', 'subnet': '127.0.20.0/24'} @@ -764,7 +814,7 @@ def test_template_update(self): self.assertEquals("default", info["networks"][0]) params = {'name': 'new-test', 'memory': 1024, 'cpus': 1, - 'networks': ['default', 'test-network', u'k��h��-��et']} + 'networks': ['default', 'test-network', u'kimchi-net']} inst.template_update('new-test', params) info = inst.template_lookup('new-test') for key in params.keys(): @@ -792,7 +842,7 @@ def test_template_update(self): self.assertEquals('some-vm', inst.vms_create(params)) rollback.prependDefer(inst.vm_delete, 'some-vm') - iface_args = {'type': 'network', 'network': u'k��h��-��et'} + iface_args = {'type': 'network', 'network': u'kimchi-net'} mac = inst.vmifaces_create('some-vm', iface_args) self.assertEquals(17, len(mac)) @@ -865,52 +915,52 @@ def test_vm_edit(self): self.assertRaises(OperationFailed, inst.vm_update, 'kimchi-vm1', {'name': 'kimchi-vm2'}) - params = {'name': u'��e��-��', 'cpus': 4, 'memory': 2048} + params = {'name': u'new-vm', 'cpus': 4, 'memory': 2048} inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'��e��-��') - self.assertEquals(info['uuid'], inst.vm_lookup(u'��e��-��')['uuid']) - info = inst.vm_lookup(u'��e��-��') + u'new-vm') + self.assertEquals(info['uuid'], inst.vm_lookup(u'new-vm')['uuid']) + info = inst.vm_lookup(u'new-vm') for key in params.keys(): self.assertEquals(params[key], info[key]) # change only VM users - groups are not changed (default is empty) users = inst.users_get_list()[:3] - inst.vm_update(u'��e��-��', {'users': users}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals([], inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'users': users}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) # change only VM groups - users are not changed (default is empty) groups = inst.groups_get_list()[:2] - inst.vm_update(u'��e��-��', {'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by adding a new element to each one users.append(pwd.getpwuid(os.getuid()).pw_name) groups.append(grp.getgrgid(os.getgid()).gr_name) - inst.vm_update(u'��e��-��', {'users': users, 'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'users': users, 'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users (wrong value) and groups # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'��e��-��', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': ['userdoesnotexist'], 'groups': []}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups (wrong value) # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'��e��-��', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': [], 'groups': ['groupdoesnotexist']}) - self.assertEquals(users, inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals(groups, inst.vm_lookup(u'��e��-��')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by removing all elements - inst.vm_update(u'��e��-��', {'users': [], 'groups': []}) - self.assertEquals([], inst.vm_lookup(u'��e��-��')['users']) - self.assertEquals([], inst.vm_lookup(u'��e��-��')['groups']) + inst.vm_update(u'new-vm', {'users': [], 'groups': []}) + self.assertEquals([], inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) def test_multithreaded_connection(self): def worker(): @@ -1090,19 +1140,19 @@ def test_delete_running_vm(self): inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') - params = {'name': u'k��h��-��', 'template': u'/templates/test'} + params = {'name': 'kimchi-vm', 'template': u'/templates/test'} inst.vms_create(params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'k��h��-��') + 'kimchi-vm') - inst.vm_start(u'k��h��-��') + inst.vm_start('kimchi-vm') rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, - u'k��h��-��') + 'kimchi-vm') - inst.vm_delete(u'k��h��-��') + inst.vm_delete('kimchi-vm') vms = inst.vms_get_list() - self.assertFalse(u'k��h��-��' in vms) + self.assertFalse('kimchi-vm' in vms) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_list_sorted(self): diff --git a/tests/test_model_network.py b/tests/test_model_network.py index 5dbe54d..c61f37c 100644 --- a/tests/test_model_network.py +++ b/tests/test_model_network.py @@ -99,6 +99,10 @@ class NetworkTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_net_names(self): + net = {'name': u'k��h��-��et', 'connection': 'isolated'} + _do_network_test(self, model, net) + def test_get_networks(self): networks = json.loads(self.request('/networks').read()) self.assertIn('default', [net['name'] for net in networks]) @@ -127,7 +131,7 @@ def test_get_networks(self): def test_network_lifecycle(self): # Verify all the supported network type - networks = [{'name': u'k��h��-��et', 'connection': 'isolated'}, + networks = [{'name': u'kimchi-net', 'connection': 'isolated'}, {'name': u'nat-network', 'connection': 'nat'}, {'name': u'subnet-network', 'connection': 'nat', 'subnet': '127.0.100.0/24'}] diff --git a/tests/test_model_storagepool.py b/tests/test_model_storagepool.py index eabf875..de4469d 100644 --- a/tests/test_model_storagepool.py +++ b/tests/test_model_storagepool.py @@ -60,6 +60,33 @@ class StoragepoolTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_storagepool_name(self): + storagepools = json.loads(self.request('/storagepools').read()) + self.assertIn('default', [pool['name'] for pool in storagepools]) + + with RollbackContext() as rollback: + name = u'k��h��-storagepool' + req = json.dumps({'name': name, 'type': 'dir', + 'path': '/var/lib/libvirt/images/test_pool'}) + resp = self.request('/storagepools', req, 'POST') + rollback.prependDefer(model.storagepool_delete, name) + + self.assertEquals(201, resp.status) + + # Verify pool information + resp = self.request('/storagepools/%s' % name.encode("utf-8")) + p = json.loads(resp.read()) + keys = [u'name', u'state', u'capacity', u'allocated', + u'available', u'path', u'source', u'type', + u'nr_volumes', u'autostart', u'persistent'] + self.assertEquals(sorted(keys), sorted(p.keys())) + self.assertEquals(name, p['name']) + resp = self.request('/storagepools/%s/activate' + % name.encode('utf-8'), req, 'POST') + rollback.prependDefer(model.storagepool_deactivate, name) + p = json.loads(resp.read()) + self.assertEquals('active', p['state']) + def test_get_storagepools(self): storagepools = json.loads(self.request('/storagepools').read()) self.assertIn('default', [pool['name'] for pool in storagepools]) diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index a3c3ce3..39531e9 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Project Kimchi # -- 2.1.0

2 5

[PATCH] Change python #! line to be more portable
by Alan Jenkins 05 Mar '15

05 Mar '15

Hey guys, This is a patch to change the #! line used in Kimchi from the ambiguous /usr/bin/python to a more specific and more portable /usr/bin/env python2. This enables users of distributions that have switched to the default python version to python3 to run Kimchi without having to go and manually change the line and at the same time allows people who have python installed to non default locations to also use Kimchi by setting the python2 environment variable. Thanks, Alan Jenkins (demon012) Alan Jenkins (1): Change from using /usr/bin/python to /usr/bin/env python2 to improve portability. contrib/check_i18n.py | 2 +- src/kimchi/vnc.py | 2 +- src/kimchid.in | 2 +- ui/pages/help/gen-index.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- 2.2.2

2 5

[PATCH v2 0/5] Create VMs Asynchronously
by Christy Perez 04 Mar '15

04 Mar '15

If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (5): Granular Task Queries: Backend Granular task queries test updates More Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates docs/API.md | 14 +++++++ src/kimchi/asynctask.py | 6 ++- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 ++-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 7 ++-- src/kimchi/model/tasks.py | 1 - src/kimchi/model/vms.py | 33 ++++++++++++--- src/kimchi/model/vmsnapshots.py | 3 +- src/kimchi/utils.py | 4 +- tests/test_authorization.py | 23 ++++++----- tests/test_mockmodel.py | 15 +++++-- tests/test_model.py | 62 ++++++++++++++++++---------- tests/test_rest.py | 82 ++++++++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 2 +- 17 files changed, 192 insertions(+), 81 deletions(-) -- 2.1.0

4 16

[PATCH] issue #545: Handle simultaneous authentication methods when updating VM permission
by Crístian Viana 03 Mar '15

03 Mar '15

If a VM has one authentication method in its metadata (e.g. 'pam') and a user sets some permissions with a different authentication method (e.g. 'ldap'), then the group of the first authentication method is lost and only the last type is kept. In other words, it is not possible to have more than one authenticatin type in a VM's metadata. Add the ability to handle different authentication methods simultaneously when updating VM permission. Whatever is already set will always be kept, even if the user chooses a different method. Fix issue #545 (VM permission data is lost when changing authentication method). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 54 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 379c850..018df9e 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -552,18 +552,48 @@ class VMModel(object): # remove the new object store entry should an error occur later rollback.prependDefer(_rollback_objstore) - def _build_access_elem(self, users, groups): + def _build_access_elem(self, dom, users, groups): auth = config.get("authentication", "method") - auth_elem = E.auth(type=auth) - for user in users: - auth_elem.append(E.user(user)) + access_xml = get_metadata_node(dom, "access", + self.caps.metadata_support) - for group in groups: - auth_elem.append(E.group(group)) + auth_elem = None - access = E.access() - access.append(auth_elem) - return access + if not access_xml: + # there is no metadata element 'access' + access_elem = E.access() + else: + access_elem = ET.fromstring(access_xml) + + same_auth = access_elem.xpath('./auth[@type="%s"]' % auth) + if len(same_auth) > 0: + # there is already a sub-element 'auth' with the same type; + # update it. + auth_elem = same_auth[0] + + if users is not None: + for u in auth_elem.findall('user'): + auth_elem.remove(u) + + if groups is not None: + for g in auth_elem.findall('group'): + auth_elem.remove(g) + + if auth_elem is None: + # there is no sub-element 'auth' with the same type + # (or no 'auth' at all); create it. + auth_elem = E.auth(type=auth) + access_elem.append(auth_elem) + + if users is not None: + for u in users: + auth_elem.append(E.user(u)) + + if groups is not None: + for g in groups: + auth_elem.append(E.group(g)) + + return access_elem def _vm_update_access_metadata(self, dom, params): users = groups = None @@ -583,11 +613,7 @@ class VMModel(object): if users is None and groups is None: return - old_users, old_groups = self._get_access_info(dom) - users = old_users if users is None else users - groups = old_groups if groups is None else groups - - node = self._build_access_elem(users, groups) + node = self._build_access_elem(dom, users, groups) set_metadata_node(dom, node, self.caps.metadata_support) def _get_access_info(self, dom): -- 2.1.0

2 4

[PATCH 0/2] Change radios and checkboxes in first 4 dialogs
by Wen Wang 02 Mar '15

02 Mar '15

1) Add icons to the help text 2) Change all the radios and checkboxes in frist 4 tabs of dialog Wen Wang (2): UI Add text help icon to dialog of first 4 tabs UI: complete kimchi dialog exchange for frist 4 tabs ui/css/theme-default/base.css | 4 +++ ui/css/theme-default/button.css | 5 +++ ui/css/theme-default/repository-add.css | 4 +++ ui/css/theme-default/repository-edit.css | 6 ++-- ui/css/theme-default/template-edit.css | 4 +++ ui/css/theme-default/template_add.css | 5 +++ ui/js/src/kimchi.repository_add_main.js | 21 +++++++++++++ ui/js/src/kimchi.repository_edit_main.js | 16 ++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 11 +++++++ ui/js/src/kimchi.storagepool_add_volume_main.js | 17 ++++++++++ ui/js/src/kimchi.template_add_main.js | 24 +++++++++++++++ ui/js/src/kimchi.template_edit_main.js | 12 ++++++++ ui/pages/guest-add.html.tmpl | 9 ++++-- ui/pages/report-add.html.tmpl | 1 + ui/pages/report-rename.html.tmpl | 1 + ui/pages/repository-add.html.tmpl | 18 +++++++---- ui/pages/repository-edit.html.tmpl | 6 ++-- ui/pages/storagepool-add-volume.html.tmpl | 14 ++++++--- ui/pages/storagepool-add.html.tmpl | 41 +++++++++++++++---------- ui/pages/template-add.html.tmpl | 9 ++++-- ui/pages/template-edit.html.tmpl | 6 +++- 21 files changed, 196 insertions(+), 38 deletions(-) -- 2.1.0

2 4

[PATCH 0/5] Exchange dialog of tab Host/Guests/Templates/Storage
by Wen Wang 02 Mar '15

02 Mar '15

Exchange dialog of tab Host/Guests/Templates/Storage with new kimchi UI Wen Wang (5): UI: Change host dialog UI: Exchange guests dialog style to new kimchi UI UI: Guest button fix UI: Exchange template dialog with new kimchi UI UI: Exchange storage dialog with new kimchi UI ui/css/theme-default/base.css | 2 +- ui/css/theme-default/button.css | 25 +++++----------- ui/css/theme-default/form.css | 10 +++++-- ui/css/theme-default/guest-edit.css | 28 +++++++++++------- ui/css/theme-default/report-add.css | 11 +++++-- ui/css/theme-default/report-rename.css | 14 ++++----- ui/css/theme-default/repository-add.css | 6 ++++ ui/css/theme-default/repository-edit.css | 24 +++++++-------- ui/css/theme-default/template_add.css | 4 +++ ui/css/theme-default/window.css | 49 +++++++------------------------ ui/js/src/kimchi.storagepool_add_main.js | 7 ++--- ui/pages/guest-add.html.tmpl | 12 ++++---- ui/pages/guest-edit.html.tmpl | 6 ++-- ui/pages/report-add.html.tmpl | 10 ++++--- ui/pages/report-rename.html.tmpl | 10 ++++--- ui/pages/repository-add.html.tmpl | 41 ++++++++++++++------------ ui/pages/repository-edit.html.tmpl | 8 +++-- ui/pages/storagepool-add-volume.html.tmpl | 10 +++---- ui/pages/storagepool-add.html.tmpl | 22 +++++++------- ui/pages/template-add.html.tmpl | 8 +++-- ui/pages/template-edit.html.tmpl | 4 +-- 21 files changed, 157 insertions(+), 154 deletions(-) -- 2.1.0

2 7

[PATCH] UI: Storage Grid View
by huoyuxin＠linux.vnet.ibm.com 27 Feb '15

27 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 161 +++++++------------------------------ ui/js/src/kimchi.storage_main.js | 21 ++++-- ui/pages/tabs/storage.html.tmpl | 72 +++++++++--------- 3 files changed, 82 insertions(+), 172 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index e0ab290..6231178 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -16,101 +16,29 @@ * limitations under the License. */ /* STORAGE */ -.handle { - width: 49px; +.storage { + margin: 5px; } -.storage-allocate-padding-user { - padding-right: 108px; -} -.storage-title { - font-size: 13px; - height: 18px; - padding: 10px; - color: #666; - float: left; - max-width: 85px; - overflow: hidden; - text-overflow: ellipsis; - font-weight: bold; - line-height: 18px; - white-space: nowrap; +.storage .grid-control { + height: 40px; + padding: 5px 0; } -.usage { - font-size: 13px; - height: 18px; - padding: 10px; - color: #666; +.storage .grid-control .filter { + width: 300px; + padding: 5px; float: right; - font-weight: bold; - line-height: 18px; -} - -.storage-text { - font-size: 12px; - height: 18px; - padding: 10px; - color: #999999; - font-weight: bold; - line-height: 18px; -} - -.list-storage { - margin: 10px; -} - -.list-storage .storage-li { - width: 1004px; - margin-top: 10px; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, - color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', - endColorstr='#e5e5e5', GradientType=0); - border: 1px solid #ccc; - color: #333; - -moz-border-top-left-radius: 8px; - -moz-border-top-right-radius: 8px; - -webkit-border-top-left-radius: 8px; - -webkit-border-top-right-radius: 8px; - -moz-border-bottom-left-radius: 8px; - -moz-border-bottom-right-radius: 8px; - -webkit-border-bottom-left-radius: 8px; - -webkit-border-bottom-right-radius: 8px; - border-top-left-radius: 8px; - border-top-right-radius: 8px; - border-bottom-left-radius: 8px; - border-bottom-right-radius: 8px; -} - -.list-storage .storage-li>* { - height: 25px; - display: table-cell; - vertical-align: middle; - position: relative; - border-left: 1px solid #ccc; - border-right: 1px solid #fff; -} - -.list-storage .storage-li>*:FIRST-CHILD { - border-left: none; } -.list-storage .storage-li>*:LAST-CHILD { - border-right: none; +.storage-allocate-padding-user { + padding-right: 108px; } -.list-storage .storage-li[data-stat="active"]:hover { - border: 1px solid rgb(11, 107, 173); - box-shadow: 0px 0px 5px rgb(11, 107, 173); - cursor: default; +.usage { + float: right; + margin-right: 30px; } .list-storage .storage-li>.guest-tile { @@ -152,62 +80,35 @@ } .storage-name { - width: 199px; + width: 15%; } .storage-state { - width: 51px; -} - -.storage-location { - width: 288px; + width: 10%; } .storage-type { - width: 98px; + width: 10%; } .storage-capacity { - width: 98px; + width: 10%; } .storage-allocate { - width: 98px; -} - - -.storage-button { - width: 108px; - text-align: center; -} - -.title-name { - width: 199px; -} - -.title-state { - width: 51px; -} - -.title-location { - width: 288px; + width: 10%; } -.title-type { - width: 98px; -} - -.title-capacity { - width: 98px; +.storage-location { + width: 30%; } -.title-allocate { - width: 98px; +.storage-button { + width: 9%; } - -.title-action { - width: 108px; +.handle { + width: 2%; } .status-dot { @@ -218,8 +119,8 @@ border-radius: 13px; box-shadow: 3px 3px 3px #FFFFFF, -3px -3px 3px #DDDDDD; height: 13px; - margin: 20px 18px; width: 13px; + margin-left: 10px; } .toolable { @@ -459,22 +360,22 @@ .list-storage .storage-li[data-stat="active"]>.handle>.arrow-down { background: url(../images/theme-default/arrow-down.png) no-repeat center center; - height: 52px; - width: 45px; + height: 18px; + width: 18px; } .list-storage .storage-li[data-stat="inactive"]>.handle>.arrow-down { background: url(../images/theme-default/arrow-down-disable.png) no-repeat center center; - height: 52px; - width: 45px; + height: 18px; + width: 18px; } .arrow-up { background: url(../images/theme-default/arrow-up.png) no-repeat center center; - height: 52px; - width: 45px; + height: 18px; + width: 18px; } .storage-icon { diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 9a45b65..64a132a 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -29,12 +29,18 @@ kimchi.doListStoragePools = function() { listHtml += kimchi.substitute(storageHtml, value); } }); + if($('#storageGrid').hasClass('grid')) + $('#storageGrid').grid('destroy'); $('#storagepoolsList').html(listHtml); if(kimchi.tabMode['storage'] === 'admin') { $('.storage-button').attr('style','display'); } else { $('.storage-allocate').addClass('storage-allocate-padding-user'); } + $('#storageGrid').grid({enableSorting: false}); + $('input', $('.grid-control', '.storage')).on('keyup', function(){ + $('#storageGrid').grid('filter', $(this).val()); + }); kimchi.storageBindClick(); } else { $('#storagepoolsList').html(''); @@ -169,18 +175,21 @@ kimchi.storageBindClick = function() { }); } - $('.storage-li').on('click', function(event) { + $('.row').on('click', function(event) { if (!$(event.target).parents().hasClass('bottom')) { if ($(this).data('stat') === 'active') { var that = $(this); var volumeDiv = $('#volume' + that.data('name')); - var slide = $(this).next('.volumes'); + var slide = $('.volumes', this); if (that.hasClass('in')) { + that.css('height','auto'); kimchi.doListVolumes(that); } else { - slide.slideUp('slow'); + slide.slideUp('slow', function(){ + that.css('height',''); + }); that.addClass('in'); - kimchi.changeArrow(that.children().last().children()); + kimchi.changeArrow($('.arrow-up', this)); } } } @@ -226,8 +235,8 @@ kimchi.doListVolumes = function(poolObj) { var volumeDiv = $('#volume' + poolName); $(volumeDiv).empty(); - var slide = poolObj.next('.volumes'); - var handleArrow = poolObj.children().last().children(); + var slide = $('.volumes', poolObj); + var handleArrow = $('.arrow-down', poolObj); kimchi.listStorageVolumes(poolName, function(result) { var listHtml = ''; diff --git a/ui/pages/tabs/storage.html.tmpl b/ui/pages/tabs/storage.html.tmpl index dbbaef9..320ec16 100644 --- a/ui/pages/tabs/storage.html.tmpl +++ b/ui/pages/tabs/storage.html.tmpl @@ -29,17 +29,19 @@ <a id="storage-pool-add" class="btn-tool" href="javascript:void(0);"><span class="icon add">+</span></a> </div> </div> -<div> - <div class="list-title"> - <li class="title-name">$_("Name")</li> - <li class="title-state" >$_("State")</li> - <li class="title-location">$_("Location")</li> - <li class="title-type">$_("Type")</li> - <li class="title-capacity">$_("Capacity")</li> - <li class="title-allocate">$_("Allocated")</li> - <li class="title-actions" style="display:none">$_("Actions")</li> +<div class='storage'> +<div class="grid-control"><input type="text" class="filter" placeholder="$_("Filter")"></div> +<div id='storageGrid'> + <div> + <span class="storage-name">$_("Name")</span> + <span class="storage-state" >$_("State")</span> + <span class="storage-type">$_("Type")</span> + <span class="storage-capacity">$_("Capacity")</span> + <span class="storage-allocate">$_("Allocated")</span> + <span class="storage-location">$_("Location")</span> </div> - <ul id="storagepoolsList" class="list-storage empty-when-logged-off"></ul> + <div id="storagepoolsList" class="list-storage empty-when-logged-off"></div> +</div> </div> <div id="logicalPoolExtend" title="$_("Device path")"> <p id="loading-info" class="text-help"> @@ -50,33 +52,32 @@ </div> </div> <script id="storageTmpl" type="html/text"> - <li id="{name}"> - <div class="storage-li in" data-name="{name}" data-stat="{state}"> - <div class="storage-name"> - <span class="storage-title" title="{name}">{name}</span> - <span class="storage-title usage">{usage}%</span> - </div> - <div class="storage-state"> + <div id="{name}" class="storage-li in" data-name="{name}" data-stat="{state}"> + <span class="storage-name" val="{name}{usage}%"> + <span title="{name}">{name}</span> + <span class="usage">{usage}%</span> + </span> + <span class="storage-state"> <div class="status-dot toolable active" data-state="{state}"> <label class="tooltip">$_("active")</label> </div> <div class="status-dot toolable inactive" data-state="{state}"> <label class="tooltip">$_("inactive")</label> </div> - </div> - <div class="storage-location"> - <div class="storage-text">{path}</div> - </div> - <div class="storage-type"> - <div class="storage-text">{type}</div> - </div> - <div class="storage-capacity"> - <div class="storage-text" data-type="{type}">{capacity}</div> - </div> - <div class="storage-allocate"> - <div class="storage-text" data-type="{type}">{allocated}</div> - </div> - <div class="bottom storage-button" style="display:none"> + </span> + <span class="storage-type" val="{type}"> + <div>{type}</div> + </span> + <span class="storage-capacity" val="{capacity}"> + <div data-type="{type}">{capacity}</div> + </span> + <span class="storage-allocate" val="{allocated}"> + <div data-type="{type}">{allocated}</div> + </span> + <span class="storage-location" val="{path}"> + <div>{path}</div> + </span> + <span class="bottom storage-button" style="display:none"> <div class="btn dropdown popable storage-action" data-state="{state}" data-type="{type}" data-name="{name}"> <span class="text">$_("Actions")</span><span class="arrow"></span> <div class="popover actionsheet right-side" style="width: 250px"> @@ -87,16 +88,15 @@ <button class="button-big red pool-delete" data-stat="{state}" data-name="{name}"><span class="text">$_("Undefine")</span></button> </div> </div> - </div> - <div class="handle"> + </span> + <span class="handle"> <div class="arrow-down"></div> - </div> - </div> + </span> <div class="volumes"> <div id="volume{name}" class="volumeslist" data-name="{name}" ></div> <div class="clear"></div> </div> - </li> + </div> </script> <script id="volumeTmpl" type="html/text"> <div class="volume-box white-box" data-volume-name="{name}"> -- 1.7.1

3 2

[v2 0/3] UI: Grid View of Network Tab
by huoyuxin＠linux.vnet.ibm.com 27 Feb '15

27 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (3): UI: Update Framework Style UI: Update Grid Widget UI: Network Grid View ui/css/theme-default/datagrid.css | 11 +--- ui/css/theme-default/framework.css | 4 +- ui/css/theme-default/network.css | 83 ++++++++--------------------------- ui/css/theme-default/reset.css | 2 +- ui/js/src/kimchi.network.js | 14 ++++-- ui/js/widgets/grid.js | 28 ++++++++---- ui/pages/tabs/network.html.tmpl | 29 ++++++------ 7 files changed, 69 insertions(+), 102 deletions(-)

3 6

[PATCH 0/3] UI: Network Grid View
by huoyuxin＠linux.vnet.ibm.com 27 Feb '15

27 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (3): UI: Update Framework Style UI: Update Grid Widget UI: Network Grid View ui/css/theme-default/datagrid.css | 11 +--- ui/css/theme-default/framework.css | 4 +- ui/css/theme-default/network.css | 83 ++++++++--------------------------- ui/css/theme-default/reset.css | 2 +- ui/js/src/kimchi.network.js | 6 ++- ui/js/widgets/grid.js | 20 +++++---- ui/pages/tabs/network.html.tmpl | 29 ++++++------ 7 files changed, 56 insertions(+), 99 deletions(-)

2 5

[PATCH 00/11] Full patch of the rest widgets
by Wen Wang 26 Feb '15

26 Feb '15

Full patch of rest widgets. Wen Wang (11): UI: Add Kimchi message widget for new kimchi UI UI: Sample of message widget UI: Adding new widget of list UI: Sample of list widget UI Add widget button to new kimchi UI UI: Adding new widget of menu to kimchi new UI UI: Adding new textbox widget to new kimchi UI UI: Adding new radio widget of new kimchi UI UI: Adding new checkbox widget to new kimchi UI UI: Adding selectmenu widget for kimchi new UI UI: Sample of menu/button/radio/checkbox/seletmenu/textbox ui/css/theme-default/button-flat.css | 135 +++++++ ui/css/theme-default/checkbox-flat.css | 25 ++ ui/css/theme-default/list-flat.css | 83 ++++ ui/css/theme-default/menu-flat.css | 89 +++++ ui/css/theme-default/message-flat.css | 87 +++++ ui/css/theme-default/radio-flat.css | 30 ++ ui/css/theme-default/selectmenu-flat.css | 88 +++++ ui/css/theme-default/textbox-flat.css | 22 ++ ui/js/widgets/button-flat.js | 419 +++++++++++++++++++++ ui/js/widgets/checkbox-flat.js | 86 +++++ ui/js/widgets/list-flat.js | 76 ++++ ui/js/widgets/menu-flat.js | 114 ++++++ ui/js/widgets/message-flat.js | 97 +++++ ui/js/widgets/radio-flat.js | 86 +++++ ui/js/widgets/samples/list-sample.html | 27 ++ ...u-button-radio-checkbox-text-select-sample.html | 83 ++++ ui/js/widgets/samples/message-sample.html | 30 ++ ui/js/widgets/selectmenu-flat.js | 130 +++++++ ui/js/widgets/textbox-flat.js | 39 ++ 19 files changed, 1746 insertions(+) create mode 100755 ui/css/theme-default/button-flat.css create mode 100644 ui/css/theme-default/checkbox-flat.css create mode 100644 ui/css/theme-default/list-flat.css create mode 100644 ui/css/theme-default/menu-flat.css create mode 100644 ui/css/theme-default/message-flat.css create mode 100644 ui/css/theme-default/radio-flat.css create mode 100644 ui/css/theme-default/selectmenu-flat.css create mode 100644 ui/css/theme-default/textbox-flat.css create mode 100755 ui/js/widgets/button-flat.js create mode 100644 ui/js/widgets/checkbox-flat.js create mode 100644 ui/js/widgets/list-flat.js create mode 100644 ui/js/widgets/menu-flat.js create mode 100644 ui/js/widgets/message-flat.js create mode 100644 ui/js/widgets/radio-flat.js create mode 100644 ui/js/widgets/samples/list-sample.html create mode 100644 ui/js/widgets/samples/menu-button-radio-checkbox-text-select-sample.html create mode 100644 ui/js/widgets/samples/message-sample.html create mode 100644 ui/js/widgets/selectmenu-flat.js create mode 100644 ui/js/widgets/textbox-flat.js -- 2.1.0

2 13

[PATCH 0/5] Create VMs Asynchronously
by Christy Perez 26 Feb '15

26 Feb '15

If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (5): Granular Task Queries: Backend Granular task queries test updates More Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates docs/API.md | 14 +++++++ src/kimchi/asynctask.py | 6 ++- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 ++-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 7 ++-- src/kimchi/model/tasks.py | 1 - src/kimchi/model/vms.py | 32 ++++++++++++--- src/kimchi/model/vmsnapshots.py | 3 +- src/kimchi/utils.py | 4 +- tests/test_authorization.py | 23 ++++++----- tests/test_mockmodel.py | 15 +++++-- tests/test_model.py | 62 ++++++++++++++++++---------- tests/test_rest.py | 82 ++++++++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 2 +- 17 files changed, 191 insertions(+), 81 deletions(-) -- 2.1.0

2 9

[PATCH] Set a common message to KCHGRD6002M
by Aline Manera 26 Feb '15

26 Feb '15

The message KCHGRD6002M is used on grid for packages update and repositories managment. So it needs to be a common message. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- po/de_DE.po | 8 ++------ po/en_US.po | 4 ++-- po/es_ES.po | 7 ++----- po/fr_FR.po | 10 ++-------- po/it_IT.po | 7 ++----- po/ja_JP.po | 8 ++------ po/kimchi.pot | 4 ++-- po/ko_KR.po | 7 ++----- po/pt_BR.po | 9 +++------ po/ru_RU.po | 7 ++----- po/zh_CN.po | 9 +++------ po/zh_TW.po | 4 ++-- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 27 insertions(+), 59 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index f271b78..6a3b7df 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1455,7 +1455,7 @@ msgstr "Warnung" msgid "Loading..." msgstr "Wird geladen..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2212,7 +2212,3 @@ msgstr "Zuordnung:" msgid "No templates found." msgstr "Keine Vorlagen gefunden." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "" -#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" diff --git a/po/en_US.po b/po/en_US.po index 5377aec..6efb22c 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1327,7 +1327,7 @@ msgstr "" msgid "Loading..." msgstr "" -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" diff --git a/po/es_ES.po b/po/es_ES.po index 1e95992..e3c567f 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1474,7 +1474,7 @@ msgstr "Aviso" msgid "Loading..." msgstr "Cargando..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2231,6 +2231,3 @@ msgstr "Asignado:" msgid "No templates found." msgstr "No se han encontrado plantillas." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" diff --git a/po/fr_FR.po b/po/fr_FR.po index 1ee9bb9..b27ec76 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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/" @@ -1488,9 +1488,8 @@ msgstr "Avertissement" msgid "Loading..." msgstr "Chargement en cours..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" -"Une erreur est survenue lors de la vérification des mises-à-jour de paquets." msgid "Retry" msgstr "Essayer à nouveau" @@ -2254,8 +2253,3 @@ msgstr "Allocation" msgid "No templates found." msgstr "Aucun modèle trouvé." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "" -#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " -#~ "%(resource)s" diff --git a/po/it_IT.po b/po/it_IT.po index b5e2866..81e49f8 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1443,7 +1443,7 @@ msgstr "Avvertenza" msgid "Loading..." msgstr "Caricamento in corso..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2199,6 +2199,3 @@ msgstr "Allocazione:" msgid "No templates found." msgstr "Nessun modello trovato." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" diff --git a/po/ja_JP.po b/po/ja_JP.po index e81cddb..e29de8c 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1448,7 +1448,7 @@ msgstr "警告" msgid "Loading..." msgstr "ロードしています..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2193,7 +2193,3 @@ msgstr "割り振り:" msgid "No templates found." msgstr "テンプレートが見つかりません。" - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "" -#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません" diff --git a/po/kimchi.pot b/po/kimchi.pot index cba1e2b..ee30a71 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1327,7 +1327,7 @@ msgstr "" msgid "Loading..." msgstr "" -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" diff --git a/po/ko_KR.po b/po/ko_KR.po index 1da6a20..53fb4bf 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1380,7 +1380,7 @@ msgstr "경고" msgid "Loading..." msgstr "로드 중..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2116,6 +2116,3 @@ msgstr "할당:" msgid "No templates found." msgstr "템플리트가 없습니다." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" diff --git a/po/pt_BR.po b/po/pt_BR.po index 1159157..0514b62 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\n" "PO-Revision-Date: 2014-12-02 12:15+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -1502,8 +1502,8 @@ msgstr "Aviso" msgid "Loading..." msgstr "Carregando..." -msgid "An error occurred while checking for packages update." -msgstr "Um erro ocorreu ao verificar port atualização de pacotes." +msgid "An error occurred while retrieving system information." +msgstr "" msgid "Retry" msgstr "Tentar novamente" @@ -2264,6 +2264,3 @@ msgstr "Alocação" msgid "No templates found." msgstr "Nenhum modelo encontrado." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" diff --git a/po/ru_RU.po b/po/ru_RU.po index ce80d38..389c853 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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/" @@ -1381,7 +1381,7 @@ msgstr "Предупреждение" msgid "Loading..." msgstr "Загружается..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" @@ -2120,6 +2120,3 @@ msgstr "Выделение ресурсов:" msgid "No templates found." msgstr "Не найдены шаблоны." - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s" diff --git a/po/zh_CN.po b/po/zh_CN.po index d739098..fa9e5d2 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1361,8 +1361,8 @@ msgstr "警告" msgid "Loading..." msgstr "正在加载..." -msgid "An error occurred while checking for packages update." -msgstr "查找软件包更新时出现错误。" +msgid "An error occurred while retrieving system information." +msgstr "" msgid "Retry" msgstr "重试" @@ -2084,6 +2084,3 @@ msgstr "分配" msgid "No templates found." msgstr "没有发现模板" - -#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -#~ msgstr "不允许更新%(resource)s的%(params)s参数。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 1d62ece..a41a046 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: 2015-02-25 11:06-0300\n" +"POT-Creation-Date: 2015-02-25 16:00-0300\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" @@ -1332,7 +1332,7 @@ msgstr "警告" msgid "Loading..." msgstr "正在載入..." -msgid "An error occurred while checking for packages update." +msgid "An error occurred while retrieving system information." msgstr "" msgid "Retry" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index b170d26..8e45b51 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -50,7 +50,7 @@ "KCHAPI6008M": "$_("Creating...")", "KCHGRD6001M": "$_("Loading...")", - "KCHGRD6002M": "$_("An error occurred while checking for packages update.")", + "KCHGRD6002M": "$_("An error occurred while retrieving system information.")", "KCHGRD6003M": "$_("Retry")", "KCHGRD6004M": "$_("Detailed message:")", -- 2.1.0

3 3

[PATCH] Bug fix: Properly reload grid content
by Aline Manera 26 Feb '15

26 Feb '15

The grid reload function requires a data argument related to the grid object. It is passed to the handler in the event.data property each time an event is trigered. So, properly get the grid object on event.data property to do the reload. To test this, you can manually lock YUM/apt on system by running a system update command and then verify on Kimchi that the packages update and repositories information was not loaded. Stop the system update you have manually started and click on "Retry" button. Without this patch you will get a Javascript error: 'grid' is undefined. And with that the content will be properly reloaded. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index eccac1c..6fed753 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -503,7 +503,7 @@ kimchi.widget.Grid.prototype = (function() { $('.retry-button', domNode).on('click', { grid: this }, function(event) { - grid.reload(); + event.data.grid.reload(); }); }; -- 2.1.0

2 2

[PATCH] Bug fix: Properly raise authenticate error when login fails
by Aline Manera 26 Feb '15

26 Feb '15

Commit 3e25bdfc moved the PAM authentication to a sub process to avoid file handler leak. But on any error it must be raised in the main process, otherwise it will not reach the user. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index dee4c37..1a52185 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -30,13 +30,11 @@ import termios import time import urllib2 - from kimchi import template from kimchi.config import config from kimchi.exception import InvalidOperation, OperationFailed from kimchi.utils import get_all_tabs, run_command - USER_NAME = 'username' USER_GROUPS = 'groups' USER_ROLES = 'roles' @@ -164,25 +162,26 @@ class PAMUser(User): return None return resp - result.value = False auth = PAM.pam() auth.start(service) auth.set_item(PAM.PAM_USER, username) auth.set_item(PAM.PAM_CONV, _pam_conv) try: auth.authenticate() + result.value = 0 except PAM.error, (resp, code): - msg_args = {'username': username, 'code': code} - raise OperationFailed("KCHAUTH0001E", msg_args) - - result.value = True + result.value = code result = multiprocessing.Value('i', 0, lock=False) p = multiprocessing.Process(target=_auth, args=(result, )) p.start() p.join() - return result.value + if result.value != 0: + msg_args = {'username': username, 'code': result.value} + raise OperationFailed("KCHAUTH0001E", msg_args) + + return True class LDAPUser(User): -- 2.1.0

2 2

[PATCH] Issue #587: Man page submission for kimchid
by frediz＠linux.vnet.ibm.com 26 Feb '15

26 Feb '15

From: Frederic Bonnard <frediz(a)linux.vnet.ibm.com> Adding a manpage and handling it in Makefile.am --- Makefile.am | 2 ++ docs/kimchid.8 | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 docs/kimchid.8 diff --git a/Makefile.am b/Makefile.am index 36e12d0..0720277 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,8 @@ SUBDIRS = src ui docs contrib tests po config plugins +man_MANS = docs/kimchid.8 + AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = --install -I m4 diff --git a/docs/kimchid.8 b/docs/kimchid.8 new file mode 100644 index 0000000..9591b29 --- /dev/null +++ b/docs/kimchid.8 @@ -0,0 +1,100 @@ +.TH KIMCHI 1 "February 05, 2015" "Version 1.4.0" "Kimchi Manual" +.SH NAME Kimchi \- HTML5 based management tool for KVM +.SH SYNOPSIS +.B kimchid +[\fB-h\fP|\fB--help\fP] [\fB--host\fP \fIhost\fP] [\fB--port\fP \fIport\fP] +[\fB--ssl-port\fP \fIssl_port\fP] [\fB--cherrypy_port\fP \fIcherrypy_port\fP] +[\fB--log-level\fP \fIlog_level\fP] [\fB--access-log\fP \fIaccess_log\fP] +[\fB--error-log\fP \fIerror_log\fP] [\fB--environment\fP \fIenvironment\fP] +[\fB--federation\fP \fIfederation\fP] [\fB--test\fP] +.SH DESCRIPTION +\fBKimchi\fP is an HTML5 based management tool for KVM. It is designed to make +it as easy as possible to get started with KVM and create your first guest. +\fBkimchid\fP launches the daemon on the hypervisor host which manages KVM guests through +libvirt. The management interface is accessed over the web using a browser that +supports HTML5. +.SH OPTIONS +The following options are supported: +.TP +\fB-h\fP , \fB--help\fP +Show the help message and exit +.TP +\fB--host\fP +Specify the hostname to listen on +.TP +\fB--port\fP +Specify the port to listen on (default \fI8000\fP) +.TP +\fB--ssl-port\fP +Specify the port to enable SSL (default \fI8001\fP) +.TP +\fB--cherrypy_port\fP +Specify the Cherrypy server port (default \fI8010\fP) +.TP +\fB--log-level\fP +Specify the log level +.TP +\fB--access-log\fP +Specify the access log file +.TP +\fB--environment\fP +Specify the running environment of kimchi server +.TP +\fB--federation\fP +Register and discover Kimchi peers in the same network using openSLP. Check +README-federation for more details. +.TP +\fB--test\fP +Run server in mock model +.SH LICENCE +.br +Kimchi is distributed pursuant to the terms of two different licenses. +The user interface (located in ui/ in this distribution) is governed by +the Apache License version 2.0. + +Except the code under ui/spice-html5 which is imported from spice-html5 project +(http://cgit.freedesktop.org/spice/spice-html5) and under ui/libs which is +imported from JQuery UI (http://jqueryui.com) + +The rest of this distribution is governed by the GNU Lesser General Public +License version 3. + +See COPYING.LGPL and COPYING.ASL2. +.SH BUGS +Current bugs can be found here : https://github.com/kimchi-project/kimchi/issues +.br +If you find any, please open an issue : https://github.com/kimchi-project/kimchi/issues/new +.SH AUTHOR +\fBAdam King\fP <rak(a)linux.vnet.ibm.com>, +\fBAdam Litke\fP <agl(a)linux.vnet.ibm.com>, +\fBAdriano Botega\fP <abotega(a)linux.vnet.ibm.com>, +\fBAlexandre Tanaka Hirata\fP <hirata(a)linux.vnet.ibm.com>, +\fBAline Manera\fP <alinefm(a)br.ibm.com>, +\fBapporc\fP <appleorchard2000(a)gmail.com>, +\fBAnthony Liguori\fP <aliguori(a)us.ibm.com>, +\fBBing Bu Cao\fP <mars(a)linux.vnet.ibm.com>, +\fBChristy Perez\fP <christy(a)linux.vnet.ibm.com>, +\fBCole Robinson\fP <crobinso(a)redhat.com>, +\fBCr��stian Viana\fP <vianac(a)linux.vnet.ibm.com>, +\fBDaniel H Barboza\fP <danielhb(a)linux.vnet.ibm.com>, +\fBEduardo Elias Ferreira\fP <edusf(a)linux.vnet.ibm.com>, +\fBEli Qiao(Li Yong Qiao)\fP <taget(a)linux.vnet.ibm.com>, +\fBHongliang Wang\fP <hlwang(a)linux.vnet.ibm.com>, +\fBLeonardo Garcia\fP <lagarcia(a)br.ibm.com>, +\fBLise Noble\fP <lwnoble(a)us.ibm.com>, +\fBMalcolm Yu\fP <minghaoyusombie(a)gmail.com>, +\fBMark Wu\fP <wudxw(a)linux.vnet.ibm.com>, +\fBMei Na Zhou\fP <zhoumein(a)linux.vnet.ibm.com>, +\fBPaulo Vital\fP <pvital(a)linux.vnet.ibm.com>, +\fBPradeep K Surisetty\fP <psuriset(a)linux.vnet.ibm.com>, +\fBRamon Medeiros\fP <ramonn(a)linux.vnet.ibm.com>, +\fBRodrigo Trujilo\fP <rodrigo.trujillo(a)linux.vnet.ibm.com>, +\fBRoyce Lv\fP <lvroyce(a)linux.vnet.ibm.com>, +\fBShaoHe Feng\fP <shaohef(a)linux.vnet.ibm.com>, +\fBShu Ming\fP <shuming(a)linux.vnet.ibm.com>, +\fBToby Allsopp\fP <toby(a)MI6.GEN.NZ>, +\fBTony Breeds\fP <tonyb(a)au1.ibm.com>, +\fBXin BJ Ding\fP <xinding(a)cn.ibm.com>, +\fBYu Xin Huo\fP <huoyuxin(a)linux.vnet.ibm.com>, +\fBZhou Zheng Sheng\fP <zhshzhou(a)linux.vnet.ibm.com>, +.SH SEE ALSO -- 1.9.1

4 5

[PATCH 0/5] Create VMs Asynchronously
by Christy Perez 25 Feb '15

25 Feb '15

If a guest has a large disk, and uses a filesystem that requires preallocation, it can take several minutes to create a VM. During that time, kimchi is tied up by the VM creation. This patch changes the VMs Collection to be an AsyncCollection. Another change required for this was to create a more granular way to query tasks. Currently it is not possible (using the API) to query tasks for the same collection or resource type that may have different operations. For example, VM cloning is also an asynchronous operation. For the guests tab, the UI was querying all running tasks and displaying them with the Cloning label. This picked up VMs that were being created as well. For more information about how the tasks can be queried, see the updated API doc and the UI change. Christy Perez (5): Granular Task Queries: Backend Granular task queries test updates More Granular Task Queries: UI Create guests asynchronously: Backend Async vm creation test updates docs/API.md | 14 +++++++ src/kimchi/asynctask.py | 6 ++- src/kimchi/control/vms.py | 4 +- src/kimchi/mockmodel.py | 7 ++-- src/kimchi/model/debugreports.py | 4 +- src/kimchi/model/host.py | 4 +- src/kimchi/model/storagepools.py | 2 +- src/kimchi/model/storagevolumes.py | 7 ++-- src/kimchi/model/tasks.py | 1 - src/kimchi/model/vms.py | 33 ++++++++++++--- src/kimchi/model/vmsnapshots.py | 3 +- src/kimchi/utils.py | 4 +- tests/test_authorization.py | 23 ++++++----- tests/test_mockmodel.py | 15 +++++-- tests/test_model.py | 62 ++++++++++++++++++---------- tests/test_rest.py | 82 ++++++++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 2 +- 17 files changed, 192 insertions(+), 81 deletions(-) -- 2.1.0

1 6

[PATCH v4] Fix grammar for selected messages
by Christy Perez 25 Feb '15

25 Feb '15

There were two things I saw that needed to be fixed: - The ISO scan warning, "It may take long time," and - The interface error for an exsiting interface, "The interface already exist." Fixed these and corrected all the translation strings for other changes. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/de_DE.po | 123 ++++++++++++++++++++++++---------------------- po/en_US.po | 94 +++++++++++++++++++----------------- po/es_ES.po | 124 ++++++++++++++++++++++++----------------------- po/fr_FR.po | 126 +++++++++++++++++++++++++----------------------- po/it_IT.po | 124 ++++++++++++++++++++++++----------------------- po/ja_JP.po | 121 +++++++++++++++++++++++----------------------- po/kimchi.pot | 95 ++++++++++++++++++------------------ po/ko_KR.po | 120 ++++++++++++++++++++++----------------------- po/pt_BR.po | 124 ++++++++++++++++++++++++----------------------- po/ru_RU.po | 120 ++++++++++++++++++++++----------------------- po/zh_CN.po | 30 +++++++----- po/zh_TW.po | 120 +++++++++++++++++++++++---------------------- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 690 insertions(+), 633 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 5116d1f..6c4a089 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s implementiert keine Aktualisierungsmethode" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Erstellen ist nicht zulässig für %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -801,6 +801,9 @@ msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Es konnte keine freie IP-Adresse für Netz '%(name)s' gefunden werden" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Netzname muss eine Zeichenfolge sein" @@ -823,19 +826,19 @@ msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Netz %(name)s konnte nicht gelöscht werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" "Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1334,36 +1337,6 @@ msgstr "Abbrechen" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" - -msgid "Device Type" -msgstr "Einheitentyp" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." - -msgid "Storage Pool" -msgstr "Speicherpool" - -msgid "Storage pool which volume located in" -msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" - -msgid "Storage Volume" -msgstr "Speicherpoolname" - -msgid "Storage volume to be attached" -msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" - -msgid "File Path" -msgstr "Dateipfad" - -msgid "The ISO file path in the server for CDROM." -msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." - -msgid "Attach" -msgstr "Anhängen" - msgid "Cloning" msgstr "" @@ -1394,6 +1367,36 @@ msgstr "Herunterfahren" msgid "Delete" msgstr "Löschen" +msgid "Add a Storage Device to VM" +msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" + +msgid "Device Type" +msgstr "Einheitentyp" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." + +msgid "Storage Pool" +msgstr "Speicherpool" + +msgid "Storage pool which volume located in" +msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" + +msgid "Storage Volume" +msgstr "Speicherpoolname" + +msgid "Storage volume to be attached" +msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" + +msgid "File Path" +msgstr "Dateipfad" + +msgid "The ISO file path in the server for CDROM." +msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." + +msgid "Attach" +msgstr "Anhängen" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " @@ -1466,7 +1469,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Dies ist keine gültige ISO-Datei." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Dies wird einige Zeit dauern. Möchten Sie fortfahren?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1920,21 +1923,6 @@ msgstr "Ja" msgid "No" msgstr "Nein" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Neuen Speicherpool definieren" @@ -2013,6 +2001,21 @@ msgstr "SCSI-Adapter" msgid "Please, wait..." msgstr "Bitte warten..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Vorlage hinzufügen" @@ -2208,3 +2211,7 @@ msgstr "Zuordnung:" msgid "No templates found." msgstr "Keine Vorlagen gefunden." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" diff --git a/po/en_US.po b/po/en_US.po index 05ca48a..5e66487 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +288,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +711,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +735,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1214,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1342,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1765,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1835,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 573dc03..4816918 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s no implementa método de actualización" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Crear no está permitido para %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -810,6 +810,9 @@ msgstr "No se puede crear la red %(name)s. Detalles: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "No se puede encontrar una dirección IP libre para la red '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "La interfaz %(iface)s ya existe" + msgid "Network name must be a string" msgstr "El nombre de red debe ser una serie" @@ -832,19 +835,19 @@ msgstr "Especifique el nombre y el tipo para crear una red" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales %(vms)s " +"y/o plantillas enlazadas a esta red." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales " +"%(vms)s y/o plantillas enlazadas a esta red." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1352,36 +1355,6 @@ msgstr "Cancelar" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Añadir un dispositivo de almacenamiento a VM" - -msgid "Device Type" -msgstr "Tipo de dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." - -msgid "Storage Pool" -msgstr "Agrupación de almacenamiento" - -msgid "Storage pool which volume located in" -msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" - -msgid "Storage Volume" -msgstr "Nombre de agrupación de almacenamiento" - -msgid "Storage volume to be attached" -msgstr "El nombre de volumen de almacenamiento debe ser una serie" - -msgid "File Path" -msgstr "Vía de acceso de archivo" - -msgid "The ISO file path in the server for CDROM." -msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." - -msgid "Attach" -msgstr "Conectar" - msgid "Cloning" msgstr "" @@ -1412,6 +1385,36 @@ msgstr "Concluir" msgid "Delete" msgstr "Suprimir" +msgid "Add a Storage Device to VM" +msgstr "Añadir un dispositivo de almacenamiento a VM" + +msgid "Device Type" +msgstr "Tipo de dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." + +msgid "Storage Pool" +msgstr "Agrupación de almacenamiento" + +msgid "Storage pool which volume located in" +msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" + +msgid "Storage Volume" +msgstr "Nombre de agrupación de almacenamiento" + +msgid "Storage volume to be attached" +msgstr "El nombre de volumen de almacenamiento debe ser una serie" + +msgid "File Path" +msgstr "Vía de acceso de archivo" + +msgid "The ISO file path in the server for CDROM." +msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." + +msgid "Attach" +msgstr "Conectar" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " @@ -1485,7 +1488,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "No es un archivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Tardará mucho tiempo. ¿Desea continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1939,21 +1942,6 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definir una agrupación de almacenamiento nueva" @@ -2030,6 +2018,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, espere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Añadir plantilla" @@ -2227,3 +2230,6 @@ msgstr "Asignado:" msgid "No templates found." msgstr "No se han encontrado plantillas." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" diff --git a/po/fr_FR.po b/po/fr_FR.po index 715d612..3d49ca3 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,12 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s n'implémente pas de méthode de mise à jour" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" -"Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " -"%(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "La création n'est pas autorisée pour %(resource)s" @@ -329,6 +323,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +819,9 @@ msgstr "Impossible de créer le réseau %(name)s. Détails: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossible de trouver une adresse IP libre pour le réseau '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interface %(iface)s existe déjà" + msgid "Network name must be a string" msgstr "Le nom de réseau doit être une chaîne de caractères" @@ -843,19 +844,19 @@ msgstr "Spécifiez un nom et un type pour créer un réseau" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" "Impossible de supprimer le réseau %(name)s. Il y a des machines virtuelles " -"et/ou des modèles liés à ce réseau. " +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles et/" -"ou des modèles liés à ce réseau. " +"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles" +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1367,6 +1368,36 @@ msgstr "Annuler" msgid "revert" msgstr "" +msgid "Cloning" +msgstr "" + +msgid "Start" +msgstr "Démarrer" + +msgid "Reset" +msgstr "Réinitialiser" + +msgid "Power Off" +msgstr "Mettre hors tension" + +msgid "Actions" +msgstr "Actions" + +msgid "Connect" +msgstr "Connecter" + +msgid "Clone" +msgstr "Cloner" + +msgid "Edit" +msgstr "Éditer" + +msgid "Shut Down" +msgstr "Éteindre" + +msgid "Delete" +msgstr "Supprimer" + msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" @@ -1398,36 +1429,6 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM." msgid "Attach" msgstr "Attacher" -msgid "Cloning" -msgstr "" - -msgid "Start" -msgstr "Démarrer" - -msgid "Reset" -msgstr "Réinitialiser" - -msgid "Power Off" -msgstr "Mettre hors tension" - -msgid "Actions" -msgstr "Actions" - -msgid "Connect" -msgstr "Connecter" - -msgid "Clone" -msgstr "Cloner" - -msgid "Edit" -msgstr "Éditer" - -msgid "Shut Down" -msgstr "Éteindre" - -msgid "Delete" -msgstr "Supprimer" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " @@ -1502,7 +1503,7 @@ msgstr "Aucune ISO détectée" msgid "This is not a valid ISO file." msgstr "Ce n'est pas un fichier ISO valide." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Cela va prendre un long moment. Voulez-vous continuer ?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1964,21 +1965,6 @@ msgstr "Oui" msgid "No" msgstr "Non" -msgid "Add a Volume to Storage Pool" -msgstr "iAjouter un Volume au Pool de Stockage" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "Saisir une URL distante ici" - -msgid "Upload a file" -msgstr "Charger un fichier" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Définir un Nouveau Pool de Stockage" @@ -2057,6 +2043,21 @@ msgstr "Adaptateur SCSI" msgid "Please, wait..." msgstr "Veuillez patienter..." +msgid "Add a Volume to Storage Pool" +msgstr "iAjouter un Volume au Pool de Stockage" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "Saisir une URL distante ici" + +msgid "Upload a file" +msgstr "Charger un fichier" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Ajouter un Modèle" @@ -2252,3 +2253,8 @@ msgstr "Allocation" msgid "No templates found." msgstr "Aucun modèle trouvé." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " +#~ "%(resource)s" diff --git a/po/it_IT.po b/po/it_IT.po index 1746bed..1b810db 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s non implementa il metodo di aggiornamento" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Creazione non consentita per %(resource)s" @@ -311,6 +307,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -783,6 +783,9 @@ msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interfaccia %(iface)s già esistente." + msgid "Network name must be a string" msgstr "Il nome della rete deve essere una stringa" @@ -805,19 +808,19 @@ msgstr "Specificare nome e tipo per creare una rete" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali e/o " -"modelli collegati a tale rete." +"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie/" -"o modelli collegati a tale rete." +"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1321,36 +1324,6 @@ msgstr "Annulla" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Aggiungi un dispositivo di memoria alla VM" - -msgid "Device Type" -msgstr "Tipo dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." - -msgid "Storage Pool" -msgstr "Pool di memoria" - -msgid "Storage pool which volume located in" -msgstr "Il percorso del pool di memoria deve essere una stringa" - -msgid "Storage Volume" -msgstr "Nome pool di memoria" - -msgid "Storage volume to be attached" -msgstr "Il nome del volume di memoria deve essere una stringa" - -msgid "File Path" -msgstr "Percorso file" - -msgid "The ISO file path in the server for CDROM." -msgstr "Il percorso file ISO nel server per CDROM." - -msgid "Attach" -msgstr "Allega" - msgid "Cloning" msgstr "" @@ -1381,6 +1354,36 @@ msgstr "Arresta" msgid "Delete" msgstr "Elimina" +msgid "Add a Storage Device to VM" +msgstr "Aggiungi un dispositivo di memoria alla VM" + +msgid "Device Type" +msgstr "Tipo dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." + +msgid "Storage Pool" +msgstr "Pool di memoria" + +msgid "Storage pool which volume located in" +msgstr "Il percorso del pool di memoria deve essere una stringa" + +msgid "Storage Volume" +msgstr "Nome pool di memoria" + +msgid "Storage volume to be attached" +msgstr "Il nome del volume di memoria deve essere una stringa" + +msgid "File Path" +msgstr "Percorso file" + +msgid "The ISO file path in the server for CDROM." +msgstr "Il percorso file ISO nel server per CDROM." + +msgid "Attach" +msgstr "Allega" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " @@ -1454,7 +1457,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Non è un file ISO valido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Richiederà molto tempo. Continuare?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1906,21 +1909,6 @@ msgstr "Sì" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definisci un nuovo pool di memoria" @@ -2000,6 +1988,21 @@ msgstr "Adattatore SCSI" msgid "Please, wait..." msgstr "Attendere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Aggiungi modello" @@ -2195,3 +2198,6 @@ msgstr "Allocazione:" msgid "No templates found." msgstr "Nessun modello trovato." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" diff --git a/po/ja_JP.po b/po/ja_JP.po index f9fe5ee..c04ea0c 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s は更新メソッドを実装していません" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "パラメーター %(params)s を %(resource)s で更新することは許可されません" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s の作成は許可されません" @@ -308,6 +304,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -799,6 +799,9 @@ msgstr "ネットワーク %(name)s を作成できません。詳細: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "ネットワーク「%(name)s」のフリー IP アドレスが見つかりません。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "ネットワーク名はストリングでなければなりません" @@ -821,19 +824,15 @@ msgstr "ネットワークを作成するには、名前とタイプを指定し #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を削除できません。いくつかの仮想マシン/テンプレートが、" -"このネットワークにリンクしています。" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を非アクティブにできません。いくつかの仮想マシン/テンプ" -"レートが、このネットワークにリンクしています。" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1333,36 +1332,6 @@ msgstr "取消" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "VM にストレージ・デバイスを追加" - -msgid "Device Type" -msgstr "デバイス・タイプ" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" - -msgid "Storage Pool" -msgstr "ストレージ・プール" - -msgid "Storage pool which volume located in" -msgstr "ストレージ・プール・パスはストリングでなければなりません" - -msgid "Storage Volume" -msgstr "ストレージ・プール名" - -msgid "Storage volume to be attached" -msgstr "ストレージ・ボリューム名はストリングでなければなりません" - -msgid "File Path" -msgstr "ファイル・パス" - -msgid "The ISO file path in the server for CDROM." -msgstr "サーバー内での CDROM の ISO ファイル・パス。" - -msgid "Attach" -msgstr "接続" - msgid "Cloning" msgstr "" @@ -1393,6 +1362,36 @@ msgstr "シャットダウン" msgid "Delete" msgstr "削除" +msgid "Add a Storage Device to VM" +msgstr "VM にストレージ・デバイスを追加" + +msgid "Device Type" +msgstr "デバイス・タイプ" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" + +msgid "Storage Pool" +msgstr "ストレージ・プール" + +msgid "Storage pool which volume located in" +msgstr "ストレージ・プール・パスはストリングでなければなりません" + +msgid "Storage Volume" +msgstr "ストレージ・プール名" + +msgid "Storage volume to be attached" +msgstr "ストレージ・ボリューム名はストリングでなければなりません" + +msgid "File Path" +msgstr "ファイル・パス" + +msgid "The ISO file path in the server for CDROM." +msgstr "サーバー内での CDROM の ISO ファイル・パス。" + +msgid "Attach" +msgstr "接続" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" @@ -1463,7 +1462,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "有効な ISO ファイルではありません。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "しばらく時間がかかることがあります。続行しますか?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1907,21 +1906,6 @@ msgstr " はい" msgid "No" msgstr " いいえ" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "新規ストレージ・プールの定義" @@ -1999,6 +1983,21 @@ msgstr "SCSI アダプター" msgid "Please, wait..." msgstr "お待ちください..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "テンプレートの追加" @@ -2193,3 +2192,7 @@ msgstr "割り振り:" msgid "No templates found." msgstr "テンプレートが見つかりません。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません" diff --git a/po/kimchi.pot b/po/kimchi.pot index 1923fad..f98fc7f 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +287,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +710,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +734,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1213,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1341,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1764,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1834,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 0f6f530..0394efe 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s에서는 업데이트 메소드를 구현하지 않음" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s의 작성은 허용되지 않음" @@ -301,6 +297,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -752,6 +752,9 @@ msgstr "네트워크 %(name)s을(를) 작성할 수 없습니다. 세부사항: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "네트워크 '%(name)s'에 대한 여유 IP 주소를 찾을 수 없습니다." +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "네트워크 이름은 문자열이어야 합니다." @@ -773,19 +776,15 @@ msgstr "네트워크를 작성하려면 이름 및 유형을 지정하십시오. #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 삭제할 수 없습니다. 이 네트워크에 일부 가상 머신 및/또는 " -"템플리트가 링크되어 있습니다." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 비활성화할 수 없습니다. 이 네트워크에 일부 가상 머신 및/" -"또는템플리트가 링크되어 있습니다." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1264,36 +1263,6 @@ msgstr "취소" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "스토리지 장치를 VM에 추가" - -msgid "Device Type" -msgstr "장치 유형" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." - -msgid "Storage Pool" -msgstr "스토리지 풀" - -msgid "Storage pool which volume located in" -msgstr "스토리지 풀 경로는 문자열이어야 합니다." - -msgid "Storage Volume" -msgstr "스토리지 풀 이름" - -msgid "Storage volume to be attached" -msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." - -msgid "File Path" -msgstr "파일 경로" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." - -msgid "Attach" -msgstr "연결" - msgid "Cloning" msgstr "" @@ -1324,6 +1293,36 @@ msgstr "시스템 종료" msgid "Delete" msgstr "삭제" +msgid "Add a Storage Device to VM" +msgstr "스토리지 장치를 VM에 추가" + +msgid "Device Type" +msgstr "장치 유형" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." + +msgid "Storage Pool" +msgstr "스토리지 풀" + +msgid "Storage pool which volume located in" +msgstr "스토리지 풀 경로는 문자열이어야 합니다." + +msgid "Storage Volume" +msgstr "스토리지 풀 이름" + +msgid "Storage volume to be attached" +msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." + +msgid "File Path" +msgstr "파일 경로" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." + +msgid "Attach" +msgstr "연결" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." @@ -1395,7 +1394,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "올바른 ISO 파일이 아닙니다." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "시간이 오래 걸립니다. 계속하시겠습니까?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1834,21 +1833,6 @@ msgstr "예" msgid "No" msgstr "아니오" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "새 스토리지 풀 정의" @@ -1922,6 +1906,21 @@ msgstr "SCSI 어댑터" msgid "Please, wait..." msgstr "잠시 기다려 주십시오." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "템플리트 추가" @@ -2116,3 +2115,6 @@ msgstr "할당:" msgid "No templates found." msgstr "템플리트가 없습니다." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" diff --git a/po/pt_BR.po b/po/pt_BR.po index 898ee5d..92e2440 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\n" "PO-Revision-Date: 2014-12-02 12:15+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -48,10 +48,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s não implementa método de atualização" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Método de criação não é permitido em %(resource)s" @@ -338,6 +334,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "Não foi possível clonar a VM '%(name)s'. Detalhes: %(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +821,9 @@ msgstr "Não foi possível criar a rede %(name)s. Detalhes: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Não foi possível encontrar um endereço IP livre para a rede '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "A interface %(iface)s já existe" + msgid "Network name must be a string" msgstr "Nome da rede deve ser um texto" @@ -842,19 +845,19 @@ msgstr "Especifique o nome e o tipo para criar uma rede" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Não foi possível remover a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1380,6 +1383,36 @@ msgstr "Cancelar" msgid "revert" msgstr "Reverter" +msgid "Cloning" +msgstr "Clonando" + +msgid "Start" +msgstr "Iniciar" + +msgid "Reset" +msgstr "Reiniciar" + +msgid "Power Off" +msgstr "Forçar desligamento" + +msgid "Actions" +msgstr "Ações" + +msgid "Connect" +msgstr "Conectar" + +msgid "Clone" +msgstr "Clonar" + +msgid "Edit" +msgstr "Editar" + +msgid "Shut Down" +msgstr "Desligar" + +msgid "Delete" +msgstr "Remover" + msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" @@ -1411,36 +1444,6 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor." msgid "Attach" msgstr "Adicionar" -msgid "Cloning" -msgstr "Clonando" - -msgid "Start" -msgstr "Iniciar" - -msgid "Reset" -msgstr "Reiniciar" - -msgid "Power Off" -msgstr "Forçar desligamento" - -msgid "Actions" -msgstr "Ações" - -msgid "Connect" -msgstr "Conectar" - -msgid "Clone" -msgstr "Clonar" - -msgid "Edit" -msgstr "Editar" - -msgid "Shut Down" -msgstr "Desligar" - -msgid "Delete" -msgstr "Remover" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." @@ -1513,7 +1516,7 @@ msgstr "Nenhuma ISO encontrada" msgid "This is not a valid ISO file." msgstr "Esse não é um arquivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Isso vai levar um longo tempo. Deseja continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1977,21 +1980,6 @@ msgstr "Sim" msgid "No" msgstr "Não" -msgid "Add a Volume to Storage Pool" -msgstr "Adicionar um volume ao Storage Pool" - -msgid "Fetch from remote URL" -msgstr "Fazer download de uma URL remota" - -msgid "Enter the remote URL here." -msgstr "Digite a URL remota aqui." - -msgid "Upload a file" -msgstr "Fazer upload de um arquivo" - -msgid "Choose the file you want to upload." -msgstr "Escolha o arquivo que você quer fazer upload." - msgid "Define a New Storage Pool" msgstr "Definir novo Storage Pool" @@ -2065,6 +2053,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, aguarde..." +msgid "Add a Volume to Storage Pool" +msgstr "Adicionar um volume ao Storage Pool" + +msgid "Fetch from remote URL" +msgstr "Fazer download de uma URL remota" + +msgid "Enter the remote URL here." +msgstr "Digite a URL remota aqui." + +msgid "Upload a file" +msgstr "Fazer upload de um arquivo" + +msgid "Choose the file you want to upload." +msgstr "Escolha o arquivo que você quer fazer upload." + msgid "Add Template" msgstr "Adicionar Modelo" @@ -2260,3 +2263,6 @@ msgstr "Alocação" msgid "No templates found." msgstr "Nenhum modelo encontrado." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" diff --git a/po/ru_RU.po b/po/ru_RU.po index fa8d121..2b18fda 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s не реализуют метод обновления" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Обновление параметров %(params)s запрещено в %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Создание запрещено для %(resource)s" @@ -304,6 +300,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -747,6 +747,9 @@ msgstr "Не удалось создать сеть %(name)s. Сведения: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Не найден свободный IP-адрес для сети %(name)s" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Имя сети должно быть строкой" @@ -768,19 +771,15 @@ msgstr "Укажите имя и тип для создания сети" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Не удалось удалить сеть %(name)s. Есть виртуальные машины или шаблоны, " -"связанные с этой сетью." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Не удалось деактивировать сеть %(name)s. Есть виртуальные машины илишаблоны, " -"связанные с этой сетью." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1266,36 +1265,6 @@ msgstr "Отмена" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Добавить устройство хранения в VM" - -msgid "Device Type" -msgstr "Тип устройства" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." - -msgid "Storage Pool" -msgstr "Пул памяти" - -msgid "Storage pool which volume located in" -msgstr "Путь к пулу памяти должен быть строкой" - -msgid "Storage Volume" -msgstr "Имя пула памяти" - -msgid "Storage volume to be attached" -msgstr "Имя тома должно быть строкой" - -msgid "File Path" -msgstr "Путь к файлу" - -msgid "The ISO file path in the server for CDROM." -msgstr "Путь к файлу ISO для CDROM на сервере." - -msgid "Attach" -msgstr "Подключить" - msgid "Cloning" msgstr "" @@ -1326,6 +1295,36 @@ msgstr "Завершить работу" msgid "Delete" msgstr "Удалить" +msgid "Add a Storage Device to VM" +msgstr "Добавить устройство хранения в VM" + +msgid "Device Type" +msgstr "Тип устройства" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." + +msgid "Storage Pool" +msgstr "Пул памяти" + +msgid "Storage pool which volume located in" +msgstr "Путь к пулу памяти должен быть строкой" + +msgid "Storage Volume" +msgstr "Имя пула памяти" + +msgid "Storage volume to be attached" +msgstr "Имя тома должно быть строкой" + +msgid "File Path" +msgstr "Путь к файлу" + +msgid "The ISO file path in the server for CDROM." +msgstr "Путь к файлу ISO для CDROM на сервере." + +msgid "Attach" +msgstr "Подключить" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." @@ -1396,7 +1395,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Этот файл не является допустимым образом ISO." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Это займет много времени. Продолжить?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1839,21 +1838,6 @@ msgstr "Да" msgid "No" msgstr "Нет" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Создать пул памяти" @@ -1926,6 +1910,21 @@ msgstr "Адаптер SCSI" msgid "Please, wait..." msgstr "Подождите..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Добавить шаблон" @@ -2120,3 +2119,6 @@ msgstr "Выделение ресурсов:" msgid "No templates found." msgstr "Не найдены шаблоны." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 82d2980..c11d410 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: 2015-01-12 10:43+0800\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -46,10 +46,6 @@ msgid "%(resource)s does not implement update method" msgstr "不支持更新%(resource)s" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不允许更新%(resource)s的%(params)s参数。" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不允许创建%(resource)s" @@ -313,6 +309,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。" @@ -740,6 +740,9 @@ msgstr "不能创建网络%(name)s。详情：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "不能为网络'%(name)s'找到一个未使用的IP网络地址。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "网络名称必须是字符串" @@ -760,15 +763,15 @@ msgstr "为新网络指定名字和类型" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "不能删除网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1372,7 +1375,7 @@ msgstr "没有发现ISO文件" msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "这需要一段时间。是否继续？" msgid "This will permanently delete the template. Would you like to continue?" @@ -2080,3 +2083,6 @@ msgstr "分配" msgid "No templates found." msgstr "没有发现模板" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不允许更新%(resource)s的%(params)s参数。" diff --git a/po/zh_TW.po b/po/zh_TW.po index a12a56e..70ad038 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s 未實作更新方法" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不容許更新 %(resource)s 中的參數 %(params)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不容許針對 %(resource)s 執行建立" @@ -295,6 +291,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -714,6 +714,9 @@ msgstr "無法建立網路 %(name)s。詳細資料：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "找不到網路 '%(name)s' 的可用 IP 位址" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "網路名稱必須是字串" @@ -734,15 +737,15 @@ msgstr "指定名稱和類型以建立網路" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "無法刪除網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "無法取消啟動網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1213,36 +1216,6 @@ msgstr "取消 " msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "將儲存裝置新增至 VM" - -msgid "Device Type" -msgstr "裝置類型" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "裝置類型。目前僅支援 \"cdrom\"。" - -msgid "Storage Pool" -msgstr "儲存區" - -msgid "Storage pool which volume located in" -msgstr "儲存區路徑必須是字串" - -msgid "Storage Volume" -msgstr "儲存區名稱" - -msgid "Storage volume to be attached" -msgstr "儲存磁區名稱必須是字串" - -msgid "File Path" -msgstr "檔案路徑" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" - -msgid "Attach" -msgstr "連接" - msgid "Cloning" msgstr "" @@ -1273,6 +1246,36 @@ msgstr "關閉" msgid "Delete" msgstr "刪除" +msgid "Add a Storage Device to VM" +msgstr "將儲存裝置新增至 VM" + +msgid "Device Type" +msgstr "裝置類型" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "裝置類型。目前僅支援 \"cdrom\"。" + +msgid "Storage Pool" +msgstr "儲存區" + +msgid "Storage pool which volume located in" +msgstr "儲存區路徑必須是字串" + +msgid "Storage Volume" +msgstr "儲存區名稱" + +msgid "Storage volume to be attached" +msgstr "儲存磁區名稱必須是字串" + +msgid "File Path" +msgstr "檔案路徑" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" + +msgid "Attach" +msgstr "連接" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" @@ -1343,7 +1346,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "這是無效的 ISO 檔案。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "它將需要很長時間。要繼續嗎？" msgid "This will permanently delete the template. Would you like to continue?" @@ -1775,21 +1778,6 @@ msgstr "是" msgid "No" msgstr "否" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "定義新的儲存區" @@ -1860,6 +1848,21 @@ msgstr "SCSI 配接卡" msgid "Please, wait..." msgstr "請稍候..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "新增範本" @@ -2054,3 +2057,6 @@ msgstr "配置：" msgid "No templates found." msgstr "找不到範本。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不容許更新 %(resource)s 中的參數 %(params)s" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a4a6dd5..b170d26 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -58,7 +58,7 @@ "KCHTMPL6002E": "$_("This is not a valid ISO file.")", - "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", + "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", -- 2.1.0

2 1

[PATCH] Stop collecting background stats
by Christy Perez 24 Feb '15

24 Feb '15

Kimchi was taking up CPU cycles when no one was using it. In order to reduce CPU overhead, only collect information when someone has called the get_list function. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index b5fdb12..0117fb0 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -81,16 +81,12 @@ def __init__(self, **kargs): self.conn = kargs['conn'] self.objstore = kargs['objstore'] self.caps = CapabilitiesModel(**kargs) - self.guests_stats_thread = BackgroundTask(GUESTS_STATS_INTERVAL, - self._update_guests_stats) - self.guests_stats_thread.start() - - def _update_guests_stats(self): - vm_list = self.get_list() - - for name in vm_list: + + @staticmethod + def _update_guests_stats(names, conn): + for name in names: try: - dom = VMModel.get_vm(name, self.conn) + dom = VMModel.get_vm(name, conn) vm_uuid = dom.UUIDString() info = dom.info() @@ -108,16 +104,17 @@ def _update_guests_stats(self): seconds = timestamp - prevStats.get('timestamp', 0) stats[vm_uuid].update({'timestamp': timestamp}) - self._get_percentage_cpu_usage(vm_uuid, info, seconds) - self._get_network_io_rate(vm_uuid, dom, seconds) - self._get_disk_io_rate(vm_uuid, dom, seconds) + VMsModel._get_percentage_cpu_usage(vm_uuid, info, seconds) + VMsModel._get_network_io_rate(vm_uuid, dom, seconds) + VMsModel._get_disk_io_rate(vm_uuid, dom, seconds) except Exception as e: # VM might be deleted just after we get the list. # This is OK, just skip. kimchi_log.debug('Error processing VM stats: %s', e.message) continue - def _get_percentage_cpu_usage(self, vm_uuid, info, seconds): + @staticmethod + def _get_percentage_cpu_usage(vm_uuid, info, seconds): prevCpuTime = stats[vm_uuid].get('cputime', 0) cpus = info[3] @@ -128,7 +125,8 @@ def _get_percentage_cpu_usage(self, vm_uuid, info, seconds): stats[vm_uuid].update({'cputime': info[4], 'cpu': percentage}) - def _get_network_io_rate(self, vm_uuid, dom, seconds): + @staticmethod + def _get_network_io_rate(vm_uuid, dom, seconds): prevNetRxKB = stats[vm_uuid].get('netRxKB', 0) prevNetTxKB = stats[vm_uuid].get('netTxKB', 0) currentMaxNetRate = stats[vm_uuid].get('max_net_io', 100) @@ -155,7 +153,8 @@ def _get_network_io_rate(self, vm_uuid, dom, seconds): stats[vm_uuid].update({'net_io': rate, 'max_net_io': max_net_io, 'netRxKB': netRxKB, 'netTxKB': netTxKB}) - def _get_disk_io_rate(self, vm_uuid, dom, seconds): + @staticmethod + def _get_disk_io_rate(vm_uuid, dom, seconds): prevDiskRdKB = stats[vm_uuid].get('diskRdKB', 0) prevDiskWrKB = stats[vm_uuid].get('diskWrKB', 0) currentMaxDiskRate = stats[vm_uuid].get('max_disk_io', 100) @@ -249,13 +248,15 @@ def create(self, params): return name def get_list(self): - return self.get_vms(self.conn) + return VMsModel.get_vms(self.conn) @staticmethod def get_vms(conn): - conn = conn.get() - names = [dom.name().decode('utf-8') for dom in conn.listAllDomains(0)] - return sorted(names, key=unicode.lower) + conn_ = conn.get() + names = [dom.name().decode('utf-8') for dom in conn_.listAllDomains(0)] + names = sorted(names, key=unicode.lower) + VMsModel._update_guests_stats(names, conn) + return names class VMModel(object): -- 2.1.0

2 1

[PATCH v3] Fix grammar for selected messages
by Christy Perez 24 Feb '15

24 Feb '15

There were two things I saw that needed to be fixed: - The ISO scan warning, "It may take long time," and - The interface error for an exsiting interface, "The interface already exist." Fixed these and corrected all the translation strings for other changes. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/de_DE.po | 123 +++++++++++++++++++++++---------------------- po/en_US.po | 94 ++++++++++++++++++----------------- po/es_ES.po | 124 ++++++++++++++++++++++++---------------------- po/fr_FR.po | 126 +++++++++++++++++++++++++---------------------- po/it_IT.po | 124 ++++++++++++++++++++++++---------------------- po/ja_JP.po | 121 +++++++++++++++++++++++---------------------- po/kimchi.pot | 95 ++++++++++++++++++----------------- po/ko_KR.po | 120 ++++++++++++++++++++++---------------------- po/pt_BR.po | 124 ++++++++++++++++++++++++---------------------- po/ru_RU.po | 120 ++++++++++++++++++++++---------------------- po/zh_CN.po | 30 ++++++----- po/zh_TW.po | 120 +++++++++++++++++++++++--------------------- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 2 +- src/kimchi/vmtemplate.py | 8 ++- src/nginx.conf.in | 1 + ui/pages/i18n.json.tmpl | 2 +- 17 files changed, 699 insertions(+), 636 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 5116d1f..6c4a089 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s implementiert keine Aktualisierungsmethode" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Erstellen ist nicht zulässig für %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -801,6 +801,9 @@ msgstr "Netz %(name)s konnte nicht erstellt werden. Details: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Es konnte keine freie IP-Adresse für Netz '%(name)s' gefunden werden" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Netzname muss eine Zeichenfolge sein" @@ -823,19 +826,19 @@ msgstr "Geben Sie Name und Typ an, um ein Netz zu erstellen" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Netz %(name)s konnte nicht gelöscht werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" "Netz %(name)s konnte nicht inaktiviert werden. Es sind einige virtuellen " -"Maschinen und/oder Vorlagen mit diesem Netz verknüpft." +"Maschinen %(vms)s und/oder Vorlagen mit diesem Netz verknüpft." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1334,36 +1337,6 @@ msgstr "Abbrechen" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" - -msgid "Device Type" -msgstr "Einheitentyp" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." - -msgid "Storage Pool" -msgstr "Speicherpool" - -msgid "Storage pool which volume located in" -msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" - -msgid "Storage Volume" -msgstr "Speicherpoolname" - -msgid "Storage volume to be attached" -msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" - -msgid "File Path" -msgstr "Dateipfad" - -msgid "The ISO file path in the server for CDROM." -msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." - -msgid "Attach" -msgstr "Anhängen" - msgid "Cloning" msgstr "" @@ -1394,6 +1367,36 @@ msgstr "Herunterfahren" msgid "Delete" msgstr "Löschen" +msgid "Add a Storage Device to VM" +msgstr "Speichereinheit zur virtuellen Maschine hinzufügen" + +msgid "Device Type" +msgstr "Einheitentyp" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Der Einheitentyp. Derzeit wird nur \"cdrom\" unterstützt." + +msgid "Storage Pool" +msgstr "Speicherpool" + +msgid "Storage pool which volume located in" +msgstr "Speicherpoolpfad muss eine Zeichenfolge sein" + +msgid "Storage Volume" +msgstr "Speicherpoolname" + +msgid "Storage volume to be attached" +msgstr "Name des Speicherdatenträgers muss eine Zeichenfolge sein" + +msgid "File Path" +msgstr "Dateipfad" + +msgid "The ISO file path in the server for CDROM." +msgstr "Der ISO-Dateipfad auf dem Server für die CD-ROM." + +msgid "Attach" +msgstr "Anhängen" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Der Benutzername oder das Kennwort, den bzw. das Sie eingegeben haben, ist " @@ -1466,7 +1469,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Dies ist keine gültige ISO-Datei." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Dies wird einige Zeit dauern. Möchten Sie fortfahren?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1920,21 +1923,6 @@ msgstr "Ja" msgid "No" msgstr "Nein" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Neuen Speicherpool definieren" @@ -2013,6 +2001,21 @@ msgstr "SCSI-Adapter" msgid "Please, wait..." msgstr "Bitte warten..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Vorlage hinzufügen" @@ -2208,3 +2211,7 @@ msgstr "Zuordnung:" msgid "No templates found." msgstr "Keine Vorlagen gefunden." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Parameter %(params)s dürfen nicht aktualisiert werden in %(resource)s" diff --git a/po/en_US.po b/po/en_US.po index 05ca48a..5e66487 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +288,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +711,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +735,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1214,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1342,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1765,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1835,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 573dc03..4816918 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s no implementa método de actualización" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Crear no está permitido para %(resource)s" @@ -317,6 +313,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -810,6 +810,9 @@ msgstr "No se puede crear la red %(name)s. Detalles: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "No se puede encontrar una dirección IP libre para la red '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "La interfaz %(iface)s ya existe" + msgid "Network name must be a string" msgstr "El nombre de red debe ser una serie" @@ -832,19 +835,19 @@ msgstr "Especifique el nombre y el tipo para crear una red" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede suprimir la red %(name)s. Hay algunas máquinas virtuales %(vms)s " +"y/o plantillas enlazadas a esta red." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales y/o " -"plantillas enlazadas a esta red." +"No se puede desactivar la red %(name)s. Hay algunas máquinas virtuales " +"%(vms)s y/o plantillas enlazadas a esta red." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1352,36 +1355,6 @@ msgstr "Cancelar" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Añadir un dispositivo de almacenamiento a VM" - -msgid "Device Type" -msgstr "Tipo de dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." - -msgid "Storage Pool" -msgstr "Agrupación de almacenamiento" - -msgid "Storage pool which volume located in" -msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" - -msgid "Storage Volume" -msgstr "Nombre de agrupación de almacenamiento" - -msgid "Storage volume to be attached" -msgstr "El nombre de volumen de almacenamiento debe ser una serie" - -msgid "File Path" -msgstr "Vía de acceso de archivo" - -msgid "The ISO file path in the server for CDROM." -msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." - -msgid "Attach" -msgstr "Conectar" - msgid "Cloning" msgstr "" @@ -1412,6 +1385,36 @@ msgstr "Concluir" msgid "Delete" msgstr "Suprimir" +msgid "Add a Storage Device to VM" +msgstr "Añadir un dispositivo de almacenamiento a VM" + +msgid "Device Type" +msgstr "Tipo de dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "El tipo de dispositivo. Actualmente sólo está soportado \"cdrom\"." + +msgid "Storage Pool" +msgstr "Agrupación de almacenamiento" + +msgid "Storage pool which volume located in" +msgstr "La vía de acceso de la agrupación de almacenamiento debe ser una serie" + +msgid "Storage Volume" +msgstr "Nombre de agrupación de almacenamiento" + +msgid "Storage volume to be attached" +msgstr "El nombre de volumen de almacenamiento debe ser una serie" + +msgid "File Path" +msgstr "Vía de acceso de archivo" + +msgid "The ISO file path in the server for CDROM." +msgstr "La vía de acceso del archivo ISO en el servidor para el CDROM." + +msgid "Attach" +msgstr "Conectar" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "El nombre de usuario o contraseña que ha especificado es incorrecto. Por " @@ -1485,7 +1488,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "No es un archivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Tardará mucho tiempo. ¿Desea continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1939,21 +1942,6 @@ msgstr "Sí" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definir una agrupación de almacenamiento nueva" @@ -2030,6 +2018,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, espere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Añadir plantilla" @@ -2227,3 +2230,6 @@ msgstr "Asignado:" msgid "No templates found." msgstr "No se han encontrado plantillas." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Los parámetros %(params)s no pueden actualizarse en %(resource)s" diff --git a/po/fr_FR.po b/po/fr_FR.po index 715d612..3d49ca3 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,12 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s n'implémente pas de méthode de mise à jour" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" -"Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " -"%(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "La création n'est pas autorisée pour %(resource)s" @@ -329,6 +323,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +819,9 @@ msgstr "Impossible de créer le réseau %(name)s. Détails: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossible de trouver une adresse IP libre pour le réseau '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interface %(iface)s existe déjà" + msgid "Network name must be a string" msgstr "Le nom de réseau doit être une chaîne de caractères" @@ -843,19 +844,19 @@ msgstr "Spécifiez un nom et un type pour créer un réseau" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" "Impossible de supprimer le réseau %(name)s. Il y a des machines virtuelles " -"et/ou des modèles liés à ce réseau. " +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles et/" -"ou des modèles liés à ce réseau. " +"Impossible de désactiver réseau %(name)s. Il y a des machines virtuelles" +"%(vms)s et/ou des modèles liés à ce réseau. " #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1367,6 +1368,36 @@ msgstr "Annuler" msgid "revert" msgstr "" +msgid "Cloning" +msgstr "" + +msgid "Start" +msgstr "Démarrer" + +msgid "Reset" +msgstr "Réinitialiser" + +msgid "Power Off" +msgstr "Mettre hors tension" + +msgid "Actions" +msgstr "Actions" + +msgid "Connect" +msgstr "Connecter" + +msgid "Clone" +msgstr "Cloner" + +msgid "Edit" +msgstr "Éditer" + +msgid "Shut Down" +msgstr "Éteindre" + +msgid "Delete" +msgstr "Supprimer" + msgid "Add a Storage Device to VM" msgstr "Ajouter un Périphérique de Stockage à la VM" @@ -1398,36 +1429,6 @@ msgstr "Le chemin de fichier ISO sur le serveur comme CDROM." msgid "Attach" msgstr "Attacher" -msgid "Cloning" -msgstr "" - -msgid "Start" -msgstr "Démarrer" - -msgid "Reset" -msgstr "Réinitialiser" - -msgid "Power Off" -msgstr "Mettre hors tension" - -msgid "Actions" -msgstr "Actions" - -msgid "Connect" -msgstr "Connecter" - -msgid "Clone" -msgstr "Cloner" - -msgid "Edit" -msgstr "Éditer" - -msgid "Shut Down" -msgstr "Éteindre" - -msgid "Delete" -msgstr "Supprimer" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Le nom d'utilisateur ou le mot de passe que vous avez entré est incorrect. " @@ -1502,7 +1503,7 @@ msgstr "Aucune ISO détectée" msgid "This is not a valid ISO file." msgstr "Ce n'est pas un fichier ISO valide." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Cela va prendre un long moment. Voulez-vous continuer ?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1964,21 +1965,6 @@ msgstr "Oui" msgid "No" msgstr "Non" -msgid "Add a Volume to Storage Pool" -msgstr "iAjouter un Volume au Pool de Stockage" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "Saisir une URL distante ici" - -msgid "Upload a file" -msgstr "Charger un fichier" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Définir un Nouveau Pool de Stockage" @@ -2057,6 +2043,21 @@ msgstr "Adaptateur SCSI" msgid "Please, wait..." msgstr "Veuillez patienter..." +msgid "Add a Volume to Storage Pool" +msgstr "iAjouter un Volume au Pool de Stockage" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "Saisir une URL distante ici" + +msgid "Upload a file" +msgstr "Charger un fichier" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Ajouter un Modèle" @@ -2252,3 +2253,8 @@ msgstr "Allocation" msgid "No templates found." msgstr "Aucun modèle trouvé." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "Les paramètres %(params)s ne sont pas autorisés à être mis à jour dans " +#~ "%(resource)s" diff --git a/po/it_IT.po b/po/it_IT.po index 1746bed..1b810db 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s non implementa il metodo di aggiornamento" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Creazione non consentita per %(resource)s" @@ -311,6 +307,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -783,6 +783,9 @@ msgstr "Impossibile creare la rete %(name)s. Dettagli: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Impossibile trovare un indirizzo IP libero per la rete '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "L'interfaccia %(iface)s già esistente." + msgid "Network name must be a string" msgstr "Il nome della rete deve essere una stringa" @@ -805,19 +808,19 @@ msgstr "Specificare nome e tipo per creare una rete" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali e/o " -"modelli collegati a tale rete." +"Impossibile eliminare la rete %(name)s. Ci sono alcune macchine virtuali " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie/" -"o modelli collegati a tale rete." +"Impossibile disattivare la rete %(name)s. Ci sono alcune macchine virtualie " +"%(vms)s e/o modelli collegati a tale rete." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1321,36 +1324,6 @@ msgstr "Annulla" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Aggiungi un dispositivo di memoria alla VM" - -msgid "Device Type" -msgstr "Tipo dispositivo" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." - -msgid "Storage Pool" -msgstr "Pool di memoria" - -msgid "Storage pool which volume located in" -msgstr "Il percorso del pool di memoria deve essere una stringa" - -msgid "Storage Volume" -msgstr "Nome pool di memoria" - -msgid "Storage volume to be attached" -msgstr "Il nome del volume di memoria deve essere una stringa" - -msgid "File Path" -msgstr "Percorso file" - -msgid "The ISO file path in the server for CDROM." -msgstr "Il percorso file ISO nel server per CDROM." - -msgid "Attach" -msgstr "Allega" - msgid "Cloning" msgstr "" @@ -1381,6 +1354,36 @@ msgstr "Arresta" msgid "Delete" msgstr "Elimina" +msgid "Add a Storage Device to VM" +msgstr "Aggiungi un dispositivo di memoria alla VM" + +msgid "Device Type" +msgstr "Tipo dispositivo" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Il tipo di dispositivo. Attualmente, è supportato solo \"cdrom\"." + +msgid "Storage Pool" +msgstr "Pool di memoria" + +msgid "Storage pool which volume located in" +msgstr "Il percorso del pool di memoria deve essere una stringa" + +msgid "Storage Volume" +msgstr "Nome pool di memoria" + +msgid "Storage volume to be attached" +msgstr "Il nome del volume di memoria deve essere una stringa" + +msgid "File Path" +msgstr "Percorso file" + +msgid "The ISO file path in the server for CDROM." +msgstr "Il percorso file ISO nel server per CDROM." + +msgid "Attach" +msgstr "Allega" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " @@ -1454,7 +1457,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Non è un file ISO valido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Richiederà molto tempo. Continuare?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1906,21 +1909,6 @@ msgstr "Sì" msgid "No" msgstr "No" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Definisci un nuovo pool di memoria" @@ -2000,6 +1988,21 @@ msgstr "Adattatore SCSI" msgid "Please, wait..." msgstr "Attendere..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Aggiungi modello" @@ -2195,3 +2198,6 @@ msgstr "Allocazione:" msgid "No templates found." msgstr "Nessun modello trovato." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Non è consentito aggiornare i parametri %(params)s in %(resource)s" diff --git a/po/ja_JP.po b/po/ja_JP.po index f9fe5ee..c04ea0c 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s は更新メソッドを実装していません" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "パラメーター %(params)s を %(resource)s で更新することは許可されません" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s の作成は許可されません" @@ -308,6 +304,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -799,6 +799,9 @@ msgstr "ネットワーク %(name)s を作成できません。詳細: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "ネットワーク「%(name)s」のフリー IP アドレスが見つかりません。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "ネットワーク名はストリングでなければなりません" @@ -821,19 +824,15 @@ msgstr "ネットワークを作成するには、名前とタイプを指定し #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を削除できません。いくつかの仮想マシン/テンプレートが、" -"このネットワークにリンクしています。" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"ネットワーク %(name)s を非アクティブにできません。いくつかの仮想マシン/テンプ" -"レートが、このネットワークにリンクしています。" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1333,36 +1332,6 @@ msgstr "取消" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "VM にストレージ・デバイスを追加" - -msgid "Device Type" -msgstr "デバイス・タイプ" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" - -msgid "Storage Pool" -msgstr "ストレージ・プール" - -msgid "Storage pool which volume located in" -msgstr "ストレージ・プール・パスはストリングでなければなりません" - -msgid "Storage Volume" -msgstr "ストレージ・プール名" - -msgid "Storage volume to be attached" -msgstr "ストレージ・ボリューム名はストリングでなければなりません" - -msgid "File Path" -msgstr "ファイル・パス" - -msgid "The ISO file path in the server for CDROM." -msgstr "サーバー内での CDROM の ISO ファイル・パス。" - -msgid "Attach" -msgstr "接続" - msgid "Cloning" msgstr "" @@ -1393,6 +1362,36 @@ msgstr "シャットダウン" msgid "Delete" msgstr "削除" +msgid "Add a Storage Device to VM" +msgstr "VM にストレージ・デバイスを追加" + +msgid "Device Type" +msgstr "デバイス・タイプ" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "デバイス・タイプ。現在サポートされているのは \"cdrom\" のみです。" + +msgid "Storage Pool" +msgstr "ストレージ・プール" + +msgid "Storage pool which volume located in" +msgstr "ストレージ・プール・パスはストリングでなければなりません" + +msgid "Storage Volume" +msgstr "ストレージ・プール名" + +msgid "Storage volume to be attached" +msgstr "ストレージ・ボリューム名はストリングでなければなりません" + +msgid "File Path" +msgstr "ファイル・パス" + +msgid "The ISO file path in the server for CDROM." +msgstr "サーバー内での CDROM の ISO ファイル・パス。" + +msgid "Attach" +msgstr "接続" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" @@ -1463,7 +1462,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "有効な ISO ファイルではありません。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "しばらく時間がかかることがあります。続行しますか?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1907,21 +1906,6 @@ msgstr " はい" msgid "No" msgstr " いいえ" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "新規ストレージ・プールの定義" @@ -1999,6 +1983,21 @@ msgstr "SCSI アダプター" msgid "Please, wait..." msgstr "お待ちください..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "テンプレートの追加" @@ -2193,3 +2192,7 @@ msgstr "割り振り:" msgid "No templates found." msgstr "テンプレートが見つかりません。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "" +#~ "パラメーター %(params)s を %(resource)s で更新することは許可されません" diff --git a/po/kimchi.pot b/po/kimchi.pot index 1923fad..f98fc7f 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -30,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "" @@ -292,6 +287,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -711,6 +710,10 @@ msgstr "" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "" +#, python-format +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "" @@ -731,14 +734,14 @@ msgstr "" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" #, python-format @@ -1210,64 +1213,64 @@ msgstr "" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" +msgid "Cloning" msgstr "" -msgid "Device Type" +msgid "Start" msgstr "" -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgid "Reset" msgstr "" -msgid "Storage Pool" +msgid "Power Off" msgstr "" -msgid "Storage pool which volume located in" +msgid "Actions" msgstr "" -msgid "Storage Volume" +msgid "Connect" msgstr "" -msgid "Storage volume to be attached" +msgid "Clone" msgstr "" -msgid "File Path" +msgid "Edit" msgstr "" -msgid "The ISO file path in the server for CDROM." +msgid "Shut Down" msgstr "" -msgid "Attach" +msgid "Delete" msgstr "" -msgid "Cloning" +msgid "Add a Storage Device to VM" msgstr "" -msgid "Start" +msgid "Device Type" msgstr "" -msgid "Reset" +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Power Off" +msgid "Storage Pool" msgstr "" -msgid "Actions" +msgid "Storage pool which volume located in" msgstr "" -msgid "Connect" +msgid "Storage Volume" msgstr "" -msgid "Clone" +msgid "Storage volume to be attached" msgstr "" -msgid "Edit" +msgid "File Path" msgstr "" -msgid "Shut Down" +msgid "The ISO file path in the server for CDROM." msgstr "" -msgid "Delete" +msgid "Attach" msgstr "" msgid "The username or password you entered is incorrect. Please try again." @@ -1338,7 +1341,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" @@ -1761,21 +1764,6 @@ msgstr "" msgid "No" msgstr "" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "" @@ -1846,6 +1834,21 @@ msgstr "" msgid "Please, wait..." msgstr "" +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 0f6f530..0394efe 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s에서는 업데이트 메소드를 구현하지 않음" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "%(resource)s의 작성은 허용되지 않음" @@ -301,6 +297,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -752,6 +752,9 @@ msgstr "네트워크 %(name)s을(를) 작성할 수 없습니다. 세부사항: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "네트워크 '%(name)s'에 대한 여유 IP 주소를 찾을 수 없습니다." +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "네트워크 이름은 문자열이어야 합니다." @@ -773,19 +776,15 @@ msgstr "네트워크를 작성하려면 이름 및 유형을 지정하십시오. #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 삭제할 수 없습니다. 이 네트워크에 일부 가상 머신 및/또는 " -"템플리트가 링크되어 있습니다." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"%(name)s 네트워크를 비활성화할 수 없습니다. 이 네트워크에 일부 가상 머신 및/" -"또는템플리트가 링크되어 있습니다." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1264,36 +1263,6 @@ msgstr "취소" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "스토리지 장치를 VM에 추가" - -msgid "Device Type" -msgstr "장치 유형" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." - -msgid "Storage Pool" -msgstr "스토리지 풀" - -msgid "Storage pool which volume located in" -msgstr "스토리지 풀 경로는 문자열이어야 합니다." - -msgid "Storage Volume" -msgstr "스토리지 풀 이름" - -msgid "Storage volume to be attached" -msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." - -msgid "File Path" -msgstr "파일 경로" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." - -msgid "Attach" -msgstr "연결" - msgid "Cloning" msgstr "" @@ -1324,6 +1293,36 @@ msgstr "시스템 종료" msgid "Delete" msgstr "삭제" +msgid "Add a Storage Device to VM" +msgstr "스토리지 장치를 VM에 추가" + +msgid "Device Type" +msgstr "장치 유형" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "장치 유형입니다. 현재 \"cdrom\"만 지원됩니다." + +msgid "Storage Pool" +msgstr "스토리지 풀" + +msgid "Storage pool which volume located in" +msgstr "스토리지 풀 경로는 문자열이어야 합니다." + +msgid "Storage Volume" +msgstr "스토리지 풀 이름" + +msgid "Storage volume to be attached" +msgstr "스토리지 볼륨 이름은 문자열이어야 합니다." + +msgid "File Path" +msgstr "파일 경로" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM을 위한 서버의 ISO 파일 경로입니다." + +msgid "Attach" +msgstr "연결" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." @@ -1395,7 +1394,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "올바른 ISO 파일이 아닙니다." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "시간이 오래 걸립니다. 계속하시겠습니까?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1834,21 +1833,6 @@ msgstr "예" msgid "No" msgstr "아니오" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "새 스토리지 풀 정의" @@ -1922,6 +1906,21 @@ msgstr "SCSI 어댑터" msgid "Please, wait..." msgstr "잠시 기다려 주십시오." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "템플리트 추가" @@ -2116,3 +2115,6 @@ msgstr "할당:" msgid "No templates found." msgstr "템플리트가 없습니다." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "%(resource)s에서는 %(params)s 매개변수를 업데이트할 수 없음" diff --git a/po/pt_BR.po b/po/pt_BR.po index 898ee5d..92e2440 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\n" "PO-Revision-Date: 2014-12-02 12:15+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -48,10 +48,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s não implementa método de atualização" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Método de criação não é permitido em %(resource)s" @@ -338,6 +334,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "Não foi possível clonar a VM '%(name)s'. Detalhes: %(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -821,6 +821,9 @@ msgstr "Não foi possível criar a rede %(name)s. Detalhes: %(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Não foi possível encontrar um endereço IP livre para a rede '%(name)s'" +msgid "The interface %(iface)s already exists." +msgstr "A interface %(iface)s já existe" + msgid "Network name must be a string" msgstr "Nome da rede deve ser um texto" @@ -842,19 +845,19 @@ msgstr "Especifique o nome e o tipo para criar uma rede" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Não foi possível remover a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual e/ou " -"modelo associados a esta rede." +"Não foi possível desativar a rede %(name)s. Há alguma máquina virtual " +"%(vms)s e/ou modelo associados a esta rede." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1380,6 +1383,36 @@ msgstr "Cancelar" msgid "revert" msgstr "Reverter" +msgid "Cloning" +msgstr "Clonando" + +msgid "Start" +msgstr "Iniciar" + +msgid "Reset" +msgstr "Reiniciar" + +msgid "Power Off" +msgstr "Forçar desligamento" + +msgid "Actions" +msgstr "Ações" + +msgid "Connect" +msgstr "Conectar" + +msgid "Clone" +msgstr "Clonar" + +msgid "Edit" +msgstr "Editar" + +msgid "Shut Down" +msgstr "Desligar" + +msgid "Delete" +msgstr "Remover" + msgid "Add a Storage Device to VM" msgstr "Adicionar um dispositivo de storage à VM" @@ -1411,36 +1444,6 @@ msgstr "O caminho do arquivo ISO para o CDROM no servidor." msgid "Attach" msgstr "Adicionar" -msgid "Cloning" -msgstr "Clonando" - -msgid "Start" -msgstr "Iniciar" - -msgid "Reset" -msgstr "Reiniciar" - -msgid "Power Off" -msgstr "Forçar desligamento" - -msgid "Actions" -msgstr "Ações" - -msgid "Connect" -msgstr "Conectar" - -msgid "Clone" -msgstr "Clonar" - -msgid "Edit" -msgstr "Editar" - -msgid "Shut Down" -msgstr "Desligar" - -msgid "Delete" -msgstr "Remover" - msgid "The username or password you entered is incorrect. Please try again." msgstr "" "O usuário ou senha inseridos estão incorretos. Por favor, tente novamente." @@ -1513,7 +1516,7 @@ msgstr "Nenhuma ISO encontrada" msgid "This is not a valid ISO file." msgstr "Esse não é um arquivo ISO válido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Isso vai levar um longo tempo. Deseja continuar?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1977,21 +1980,6 @@ msgstr "Sim" msgid "No" msgstr "Não" -msgid "Add a Volume to Storage Pool" -msgstr "Adicionar um volume ao Storage Pool" - -msgid "Fetch from remote URL" -msgstr "Fazer download de uma URL remota" - -msgid "Enter the remote URL here." -msgstr "Digite a URL remota aqui." - -msgid "Upload a file" -msgstr "Fazer upload de um arquivo" - -msgid "Choose the file you want to upload." -msgstr "Escolha o arquivo que você quer fazer upload." - msgid "Define a New Storage Pool" msgstr "Definir novo Storage Pool" @@ -2065,6 +2053,21 @@ msgstr "Adaptador SCSI" msgid "Please, wait..." msgstr "Por favor, aguarde..." +msgid "Add a Volume to Storage Pool" +msgstr "Adicionar um volume ao Storage Pool" + +msgid "Fetch from remote URL" +msgstr "Fazer download de uma URL remota" + +msgid "Enter the remote URL here." +msgstr "Digite a URL remota aqui." + +msgid "Upload a file" +msgstr "Fazer upload de um arquivo" + +msgid "Choose the file you want to upload." +msgstr "Escolha o arquivo que você quer fazer upload." + msgid "Add Template" msgstr "Adicionar Modelo" @@ -2260,3 +2263,6 @@ msgstr "Alocação" msgid "No templates found." msgstr "Nenhum modelo encontrado." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Paramêtros %(params)s não podem ser atualizados em %(resource)s" diff --git a/po/ru_RU.po b/po/ru_RU.po index fa8d121..2b18fda 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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/" @@ -30,10 +30,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s не реализуют метод обновления" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "Обновление параметров %(params)s запрещено в %(resource)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "Создание запрещено для %(resource)s" @@ -304,6 +300,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -747,6 +747,9 @@ msgstr "Не удалось создать сеть %(name)s. Сведения: msgid "Unable to find a free IP address for network '%(name)s'" msgstr "Не найден свободный IP-адрес для сети %(name)s" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "Имя сети должно быть строкой" @@ -768,19 +771,15 @@ msgstr "Укажите имя и тип для создания сети" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." msgstr "" -"Не удалось удалить сеть %(name)s. Есть виртуальные машины или шаблоны, " -"связанные с этой сетью." #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." msgstr "" -"Не удалось деактивировать сеть %(name)s. Есть виртуальные машины илишаблоны, " -"связанные с этой сетью." #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1266,36 +1265,6 @@ msgstr "Отмена" msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "Добавить устройство хранения в VM" - -msgid "Device Type" -msgstr "Тип устройства" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." - -msgid "Storage Pool" -msgstr "Пул памяти" - -msgid "Storage pool which volume located in" -msgstr "Путь к пулу памяти должен быть строкой" - -msgid "Storage Volume" -msgstr "Имя пула памяти" - -msgid "Storage volume to be attached" -msgstr "Имя тома должно быть строкой" - -msgid "File Path" -msgstr "Путь к файлу" - -msgid "The ISO file path in the server for CDROM." -msgstr "Путь к файлу ISO для CDROM на сервере." - -msgid "Attach" -msgstr "Подключить" - msgid "Cloning" msgstr "" @@ -1326,6 +1295,36 @@ msgstr "Завершить работу" msgid "Delete" msgstr "Удалить" +msgid "Add a Storage Device to VM" +msgstr "Добавить устройство хранения в VM" + +msgid "Device Type" +msgstr "Тип устройства" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "Тип устройства. В данный момент поддерживается только \"cdrom\"." + +msgid "Storage Pool" +msgstr "Пул памяти" + +msgid "Storage pool which volume located in" +msgstr "Путь к пулу памяти должен быть строкой" + +msgid "Storage Volume" +msgstr "Имя пула памяти" + +msgid "Storage volume to be attached" +msgstr "Имя тома должно быть строкой" + +msgid "File Path" +msgstr "Путь к файлу" + +msgid "The ISO file path in the server for CDROM." +msgstr "Путь к файлу ISO для CDROM на сервере." + +msgid "Attach" +msgstr "Подключить" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." @@ -1396,7 +1395,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Этот файл не является допустимым образом ISO." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Это займет много времени. Продолжить?" msgid "This will permanently delete the template. Would you like to continue?" @@ -1839,21 +1838,6 @@ msgstr "Да" msgid "No" msgstr "Нет" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "Создать пул памяти" @@ -1926,6 +1910,21 @@ msgstr "Адаптер SCSI" msgid "Please, wait..." msgstr "Подождите..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "Добавить шаблон" @@ -2120,3 +2119,6 @@ msgstr "Выделение ресурсов:" msgid "No templates found." msgstr "Не найдены шаблоны." + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "Обновление параметров %(params)s запрещено в %(resource)s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 82d2980..c11d410 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: 2015-01-12 10:43+0800\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -46,10 +46,6 @@ msgid "%(resource)s does not implement update method" msgstr "不支持更新%(resource)s" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不允许更新%(resource)s的%(params)s参数。" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不允许创建%(resource)s" @@ -313,6 +309,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "未能成功制作虚拟机'%(name)s'副本。详情：%(err)s" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "虚拟机%(vmid)s未指明被分配的主机设备%(dev_name)s。" @@ -740,6 +740,9 @@ msgstr "不能创建网络%(name)s。详情：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "不能为网络'%(name)s'找到一个未使用的IP网络地址。" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "网络名称必须是字符串" @@ -760,15 +763,15 @@ msgstr "为新网络指定名字和类型" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "不能删除网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "不能停用网络%(name)s。有虚拟机或者模板与这个网络关联" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1372,7 +1375,7 @@ msgstr "没有发现ISO文件" msgid "This is not a valid ISO file." msgstr "这不是一个有效的ISO文件" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "这需要一段时间。是否继续？" msgid "This will permanently delete the template. Would you like to continue?" @@ -2080,3 +2083,6 @@ msgstr "分配" msgid "No templates found." msgstr "没有发现模板" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不允许更新%(resource)s的%(params)s参数。" diff --git a/po/zh_TW.po b/po/zh_TW.po index a12a56e..70ad038 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-17 13:48-0200\n" +"POT-Creation-Date: 2015-02-24 11:52-0600\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" @@ -29,10 +29,6 @@ msgid "%(resource)s does not implement update method" msgstr "%(resource)s 未實作更新方法" #, python-format -msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" -msgstr "不容許更新 %(resource)s 中的參數 %(params)s" - -#, python-format msgid "Create is not allowed for %(resource)s" msgstr "不容許針對 %(resource)s 執行建立" @@ -295,6 +291,10 @@ msgid "Unable to clone VM '%(name)s'. Details: %(err)s" msgstr "" #, python-format +msgid "Invalid operation for non-persistent virtual machine %(name)s" +msgstr "" + +#, python-format msgid "" "VM %(vmid)s does not contain directly assigned host device %(dev_name)s." msgstr "" @@ -714,6 +714,9 @@ msgstr "無法建立網路 %(name)s。詳細資料：%(err)s" msgid "Unable to find a free IP address for network '%(name)s'" msgstr "找不到網路 '%(name)s' 的可用 IP 位址" +msgid "The interface %(iface)s already exists." +msgstr "" + msgid "Network name must be a string" msgstr "網路名稱必須是字串" @@ -734,15 +737,15 @@ msgstr "指定名稱和類型以建立網路" #, python-format msgid "" -"Unable to delete network %(name)s. There are some virtual machines and/or " -"templates linked to this network." -msgstr "無法刪除網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to delete network %(name)s. There are some virtual machines %(vms)s " +"and/or templates linked to this network." +msgstr "" #, python-format msgid "" -"Unable to deactivate network %(name)s. There are some virtual machines and/" -"or templates linked to this network." -msgstr "無法取消啟動網路 %(name)s。有一些虛擬機器及/或範本鏈結至此網路。" +"Unable to deactivate network %(name)s. There are some virtual machines " +"%(vms)s and/or templates linked to this network." +msgstr "" #, python-format msgid "Bridge device %(name)s can not be the trunk device of a VLAN." @@ -1213,36 +1216,6 @@ msgstr "取消 " msgid "revert" msgstr "" -msgid "Add a Storage Device to VM" -msgstr "將儲存裝置新增至 VM" - -msgid "Device Type" -msgstr "裝置類型" - -msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgstr "裝置類型。目前僅支援 \"cdrom\"。" - -msgid "Storage Pool" -msgstr "儲存區" - -msgid "Storage pool which volume located in" -msgstr "儲存區路徑必須是字串" - -msgid "Storage Volume" -msgstr "儲存區名稱" - -msgid "Storage volume to be attached" -msgstr "儲存磁區名稱必須是字串" - -msgid "File Path" -msgstr "檔案路徑" - -msgid "The ISO file path in the server for CDROM." -msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" - -msgid "Attach" -msgstr "連接" - msgid "Cloning" msgstr "" @@ -1273,6 +1246,36 @@ msgstr "關閉" msgid "Delete" msgstr "刪除" +msgid "Add a Storage Device to VM" +msgstr "將儲存裝置新增至 VM" + +msgid "Device Type" +msgstr "裝置類型" + +msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." +msgstr "裝置類型。目前僅支援 \"cdrom\"。" + +msgid "Storage Pool" +msgstr "儲存區" + +msgid "Storage pool which volume located in" +msgstr "儲存區路徑必須是字串" + +msgid "Storage Volume" +msgstr "儲存區名稱" + +msgid "Storage volume to be attached" +msgstr "儲存磁區名稱必須是字串" + +msgid "File Path" +msgstr "檔案路徑" + +msgid "The ISO file path in the server for CDROM." +msgstr "CDROM 的 ISO 檔案路徑在伺服器中。" + +msgid "Attach" +msgstr "連接" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" @@ -1343,7 +1346,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "這是無效的 ISO 檔案。" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "它將需要很長時間。要繼續嗎？" msgid "This will permanently delete the template. Would you like to continue?" @@ -1775,21 +1778,6 @@ msgstr "是" msgid "No" msgstr "否" -msgid "Add a Volume to Storage Pool" -msgstr "" - -msgid "Fetch from remote URL" -msgstr "" - -msgid "Enter the remote URL here." -msgstr "" - -msgid "Upload a file" -msgstr "" - -msgid "Choose the file you want to upload." -msgstr "" - msgid "Define a New Storage Pool" msgstr "定義新的儲存區" @@ -1860,6 +1848,21 @@ msgstr "SCSI 配接卡" msgid "Please, wait..." msgstr "請稍候..." +msgid "Add a Volume to Storage Pool" +msgstr "" + +msgid "Fetch from remote URL" +msgstr "" + +msgid "Enter the remote URL here." +msgstr "" + +msgid "Upload a file" +msgstr "" + +msgid "Choose the file you want to upload." +msgstr "" + msgid "Add Template" msgstr "新增範本" @@ -2054,3 +2057,6 @@ msgstr "配置：" msgid "No templates found." msgstr "找不到範本。" + +#~ msgid "Parameters %(params)s are not allowed to be updated in %(resource)s" +#~ msgstr "不容許更新 %(resource)s 中的參數 %(params)s" diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 1e36a6d..b5a1769 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -117,6 +117,7 @@ ('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'), ('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'), ('powerkvm', 'live_cd', 'POWERKVM_LIVECD'), + ('arch', lambda m: m.group(1), 'ARCH_(\d+)'), ] diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 149f059..2496e03 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -77,7 +77,7 @@ modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', - 'sles': '11'}, + 'sles': '11', 'arch': '0'}, 'power': {'rhel': '6.5', 'fedora': '19', 'ubuntu': '14.04', 'opensuse': '13.1', diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index d4fbe8b..ef41d0a 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -202,8 +202,12 @@ def to_volume_list(self, vm_uuid): 'capacity': d['size'], 'format': fmt, 'path': '%s/%s' % (storage_path, volume)} - info['allocation'] = 0 if fmt in ['qcow2', 'raw'] \ - else info['capacity'] + + if 'logical' == self._get_storage_type() or \ + fmt not in ['qcow2', 'raw']: + info['allocation'] = info['capacity'] + else: + info['allocation'] = 0 if 'base' in d: info['base'] = dict() diff --git a/src/nginx.conf.in b/src/nginx.conf.in index b5d207f..ed926a3 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -52,6 +52,7 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a4a6dd5..b170d26 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -58,7 +58,7 @@ "KCHTMPL6002E": "$_("This is not a valid ISO file.")", - "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", + "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", -- 2.1.0

2 1

[PATCH] issue #512: Attach the function "showMessage" to the UI grid class
by Crístian Viana 24 Feb '15

24 Feb '15

The JavaScript "class" kimchi.widget.Grid (which renders the packages and repositories list) lacks the function "showMessage" (which displays a message inside the grid). The function itself is already declared but it isn't attached to the class, so it cannot be used. When an error happens while reading the update packages or repositories list, that function is supposed to be executed, however it doesn't exist in the class and nothing is displayed. Attach the function "showMessage" to its corresponding class so it can be used correctly. In order to test this patch, create a failing scenario to get the update packages list and open the tab "Hosts". Without this patch, the update grid will be empty; with this patch, an error message will be displayed in the update grid. On Fedora, the failing scenario can be created by running "sudo yum update" (when there are packages to be updated) and not confirming the update, so Yum leaves a lock preventing other simultaneous operations to be executed. Fix issue #512 ("Software updates" doesn't show available updates). Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.grid.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.grid.js b/ui/js/src/kimchi.grid.js index 26e05d5..6365d5c 100644 --- a/ui/js/src/kimchi.grid.js +++ b/ui/js/src/kimchi.grid.js @@ -522,6 +522,7 @@ kimchi.widget.Grid.prototype = (function() { setData: setData, getSelected: getSelected, reload: reload, - destroy: destroy + destroy: destroy, + showMessage: showMessage }; })(); -- 2.1.0

2 1

[PATCH v2 0/2] ISO Scan grammar fix
by Christy Perez 24 Feb '15

24 Feb '15

Change "It will take long time" to "This may take a long time." Christy Perez (2): Fix iso scan warning's EN grammar Cleaning up fuzzy translation strings after make po/de_DE.po | 117 ++++++++++++++++++++++++---------------------- po/en_US.po | 94 +++++++++++++++++++------------------ po/es_ES.po | 117 ++++++++++++++++++++++++---------------------- po/fr_FR.po | 121 +++++++++++++++++++++++++----------------------- po/it_IT.po | 117 ++++++++++++++++++++++++---------------------- po/ja_JP.po | 118 ++++++++++++++++++++++++---------------------- po/kimchi.pot | 97 +++++++++++++++++++------------------- po/ko_KR.po | 117 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 117 ++++++++++++++++++++++++---------------------- po/ru_RU.po | 117 ++++++++++++++++++++++++---------------------- po/zh_CN.po | 31 ++++++++----- po/zh_TW.po | 121 +++++++++++++++++++++++++----------------------- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 681 insertions(+), 605 deletions(-) -- 2.1.0

2 3

[PATCH] Fix iso scan warning's EN grammar
by Christy Perez 24 Feb '15

24 Feb '15

The patch is the manual changes only, without running the make commands. There are a lot of other translation changes that will be pulled in after a make, so I'm leaving that step out for simplicity when reviewing this patch. If needed, I can run make and re-submit after review. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/de_DE.po | 2 +- po/en_US.po | 2 +- po/es_ES.po | 2 +- po/fr_FR.po | 2 +- po/it_IT.po | 2 +- po/ja_JP.po | 2 +- po/kimchi.pot | 2 +- po/ko_KR.po | 2 +- po/pt_BR.po | 2 +- po/ru_RU.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- ui/pages/i18n.json.tmpl | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 5116d1f..a730040 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1466,7 +1466,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Dies ist keine g��ltige ISO-Datei." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Dies wird einige Zeit dauern. M��chten Sie fortfahren?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/en_US.po b/po/en_US.po index 05ca48a..8c3aeda 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1338,7 +1338,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/es_ES.po b/po/es_ES.po index 573dc03..f9c26fe 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1485,7 +1485,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "No es un archivo ISO v��lido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Tardar�� mucho tiempo. ��Desea continuar?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/fr_FR.po b/po/fr_FR.po index 715d612..ad3abb2 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1502,7 +1502,7 @@ msgstr "Aucune ISO d��tect��e" msgid "This is not a valid ISO file." msgstr "Ce n'est pas un fichier ISO valide." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Cela va prendre un long moment. Voulez-vous continuer ?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/it_IT.po b/po/it_IT.po index 1746bed..759f4a2 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1454,7 +1454,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "Non �� un file ISO valido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Richieder�� molto tempo. Continuare?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/ja_JP.po b/po/ja_JP.po index f9fe5ee..c28d764 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1463,7 +1463,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO ��" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "��?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/kimchi.pot b/po/kimchi.pot index 1923fad..f2456f3 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -1338,7 +1338,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/ko_KR.po b/po/ko_KR.po index 0f6f530..2d01193 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1395,7 +1395,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO �� ." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "�� . ��?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/pt_BR.po b/po/pt_BR.po index 898ee5d..10ac33e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1513,7 +1513,7 @@ msgstr "Nenhuma ISO encontrada" msgid "This is not a valid ISO file." msgstr "Esse n��o �� um arquivo ISO v��lido." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "Isso vai levar um longo tempo. Deseja continuar?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/ru_RU.po b/po/ru_RU.po index fa8d121..8233e99 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1396,7 +1396,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO." -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "�� . ��?" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/zh_CN.po b/po/zh_CN.po index 82d2980..a307e3b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1372,7 +1372,7 @@ msgstr "��ISO��" msgid "This is not a valid ISO file." msgstr "��ISO��" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "��" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/po/zh_TW.po b/po/zh_TW.po index a12a56e..776bd52 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1343,7 +1343,7 @@ msgstr "" msgid "This is not a valid ISO file." msgstr "�� ISO ��" -msgid "It will take long time. Do you want to continue?" +msgid "This may take a long time. Do you want to continue?" msgstr "��" msgid "This will permanently delete the template. Would you like to continue?" diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index a4a6dd5..b170d26 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -58,7 +58,7 @@ "KCHTMPL6002E": "$_("This is not a valid ISO file.")", - "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", + "KCHTMPL6002M": "$_("This may take a long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", -- 2.1.0

2 4

[PATCH 0/3] *** Improved support for Arch Linux ***
by Alan Jenkins 24 Feb '15

24 Feb '15

Hey guys, These patches improve support for Arch Linux within Kimchi. They add support for detecting the Arch Linux distribution's releases and mark it as a modern distribution to enable Kimchi to automatically turn on support for virtio-net with Arch Linux virtual machines. I however still have yet to find the code that is able to identify a distribution from a disk image, could someone point me in the direction of that code? Thanks, Alan Jenkins Alan Jenkins (3): Add Arch Linux entry to isoinfo. Add modern entry for Arch Linux. Added Arch Icon. src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 2 +- ui/images/icon-arch.png | Bin 0 -> 3868 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 ui/images/icon-arch.png -- 2.2.2

4 18

[PATCH] Set allocation=capacity when creating images in logical pools
by Christy Perez 24 Feb '15

24 Feb '15

If allocation is set to 0 for images in logical storage, they cannot be used. You may see an error similar to: /dev/VMs_Storage_R5/ed229d7b-5248-4499-8758-43069dd79fe7-0.img: \ read failed after 0 of 65536 at 21474770944: Input/output error When attempting to access the image. When using the image, the guest may report that it is unable to write to the disk (I/O error). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index d4fbe8b..ef41d0a 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -202,8 +202,12 @@ def to_volume_list(self, vm_uuid): 'capacity': d['size'], 'format': fmt, 'path': '%s/%s' % (storage_path, volume)} - info['allocation'] = 0 if fmt in ['qcow2', 'raw'] \ - else info['capacity'] + + if 'logical' == self._get_storage_type() or \ + fmt not in ['qcow2', 'raw']: + info['allocation'] = info['capacity'] + else: + info['allocation'] = 0 if 'base' in d: info['base'] = dict() -- 2.1.0

3 2

[PATCH] Disable SSL on nginx
by Tulio Magno Quites Machado Filho 24 Feb '15

24 Feb '15

This patch helps to protect Kimchi against CVE-2014-3566 by completely disabling SSLv3 on nginx. --- src/nginx.conf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nginx.conf.in b/src/nginx.conf.in index b5d207f..ed926a3 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -52,6 +52,7 @@ http { ssl_certificate ${cert_pem}; ssl_certificate_key ${cert_key}; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; add_header X-Frame-Options DENY; -- 2.1.0

3 2

[PATCH] Set Arch Linux PNG image to be used on frontend always.
by Paulo Vital 19 Feb '15

19 Feb '15

Signed-off-by: Paulo Vital <pvital(a)gmail.com> --- ui/css/theme-default/template_add.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/css/theme-default/template_add.css b/ui/css/theme-default/template_add.css index e58bccb..580a3f3 100644 --- a/ui/css/theme-default/template_add.css +++ b/ui/css/theme-default/template_add.css @@ -199,6 +199,11 @@ background-image: url(../../images/icon-gentoo.png); } +.iso-icon.arch { + background-image: url(../../images/icon-arch.png); +} + + .list-iso { overflow: hidden; margin: 5px; -- 2.1.4

3 2

[DISCUSSION] If virbr0 is an existent bridge, libvirt will fail to create default network
by Ramon Medeiros 19 Feb '15

19 Feb '15

Hi Team, i got this issue on https://github.com/kimchi-project/kimchi/issues/556. What we can do: 1) The fix seems to be upstream. But not sure if it will be available soon 2) Run a check, like we do for subnet, to see if it's already created. If not, we can created it and pass to libvirt. -- Ramon Nunes Medeiros Kimchi Developer Software Engineer - Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 3

[PATCH] Remove Non-ASCII chars from tests when unnecessary
by Christy Perez 16 Feb '15

16 Feb '15

A domain with non-ASCII characters will fail to start. There are several tests that use such characters, and these tests fail. None of the failing tests are required to test the validity of non-ascii characters, so it's best to remove them and create seperate tests explicitly for these chracters. This way we will not be masking actual issues by ignoring an expected failure. The issue was first noticed with libvirt 1.1.3. The character issue is discussed in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1062943 Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- tests/test_model.py | 113 +++++++++++++++++++++++++++----------- tests/test_model_network.py | 6 +- tests/test_model_storagepool.py | 26 +++++++++ tests/test_model_storagevolume.py | 1 - 4 files changed, 113 insertions(+), 33 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f80f1c9..aa265f5 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -96,6 +96,45 @@ def test_vm_info(self): self.assertEquals([], info['groups']) self.assertTrue(info['persistent']) + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + def test_non_ascii_vm_name(self): + inst = model.Model(objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + vol_params = {'name': u'test-vol', 'capacity': 1024} + task = inst.storagevolumes_create(u'default', vol_params) + rollback.prependDefer(inst.storagevolume_delete, u'default', + vol_params['name']) + inst.task_wait(task['id']) + task = inst.task_lookup(task['id']) + self.assertEquals('finished', task['status']) + vol = inst.storagevolume_lookup(u'default', vol_params['name']) + + # Create template + params = {'name': 'test', 'disks': [{'base': vol['path'], + 'size': 1}], + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, 'test') + + # Create VM with non-ascii char name + params = {'name': u'пeω-∨м', 'template': '/templates/test'} + inst.vms_create(params) + rollback.prependDefer(inst.vm_delete, u'пeω-∨м') + + vms = inst.vms_get_list() + self.assertTrue(u'пeω-∨м' in vms) + + # Start VM + # Note: This fails with libvirt > 1.1.3 + inst.vm_start(u'пeω-∨м') + info = inst.vm_lookup(u'пeω-∨м') + self.assertEquals('running', info['state']) + + vms = inst.vms_get_list() + self.assertFalse(u'пeω-∨м' in vms) + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_lifecycle(self): inst = model.Model(objstore_loc=self.tmp_store) @@ -620,6 +659,18 @@ def test_template_storage_customise(self): params = {'storagepool': '/storagepools/default'} inst.template_update('test', params) + def test_non_ascii_template_create(self): + inst = model.Model('test:///default', + objstore_loc=self.tmp_store) + + with RollbackContext() as rollback: + params = {'name': u'пeω-teмplate', 'memory': 1024, 'cpus': 1, + 'cdrom': self.kimchi_iso} + inst.templates_create(params) + rollback.prependDefer(inst.template_delete, u'пeω-teмplate') + info = inst.template_lookup(u'пeω-teмplate') + self.assertEquals(info['name'], u'пeω-teмplate') + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_template_create(self): inst = model.Model('test:///default', @@ -737,7 +788,7 @@ def test_template_update(self): inst.network_activate(net_name) rollback.prependDefer(inst.network_deactivate, net_name) - net_name = u'kīмсhī-пet' + net_name = u'kimchi-net' net_args = {'name': net_name, 'connection': 'nat', 'subnet': '127.0.20.0/24'} @@ -764,7 +815,7 @@ def test_template_update(self): self.assertEquals("default", info["networks"][0]) params = {'name': 'new-test', 'memory': 1024, 'cpus': 1, - 'networks': ['default', 'test-network', u'kīмсhī-пet']} + 'networks': ['default', 'test-network', u'kimchi-net']} inst.template_update('new-test', params) info = inst.template_lookup('new-test') for key in params.keys(): @@ -792,7 +843,7 @@ def test_template_update(self): self.assertEquals('some-vm', inst.vms_create(params)) rollback.prependDefer(inst.vm_delete, 'some-vm') - iface_args = {'type': 'network', 'network': u'kīмсhī-пet'} + iface_args = {'type': 'network', 'network': u'kimchi-net'} mac = inst.vmifaces_create('some-vm', iface_args) self.assertEquals(17, len(mac)) @@ -865,52 +916,52 @@ def test_vm_edit(self): self.assertRaises(OperationFailed, inst.vm_update, 'kimchi-vm1', {'name': 'kimchi-vm2'}) - params = {'name': u'пeω-∨м', 'cpus': 4, 'memory': 2048} + params = {'name': u'new-vm', 'cpus': 4, 'memory': 2048} inst.vm_update('kimchi-vm1', params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'пeω-∨м') - self.assertEquals(info['uuid'], inst.vm_lookup(u'пeω-∨м')['uuid']) - info = inst.vm_lookup(u'пeω-∨м') + u'new-vm') + self.assertEquals(info['uuid'], inst.vm_lookup(u'new-vm')['uuid']) + info = inst.vm_lookup(u'new-vm') for key in params.keys(): self.assertEquals(params[key], info[key]) # change only VM users - groups are not changed (default is empty) users = inst.users_get_list()[:3] - inst.vm_update(u'пeω-∨м', {'users': users}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'users': users}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) # change only VM groups - users are not changed (default is empty) groups = inst.groups_get_list()[:2] - inst.vm_update(u'пeω-∨м', {'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by adding a new element to each one users.append(pwd.getpwuid(os.getuid()).pw_name) groups.append(grp.getgrgid(os.getgid()).gr_name) - inst.vm_update(u'пeω-∨м', {'users': users, 'groups': groups}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'users': users, 'groups': groups}) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users (wrong value) and groups # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'пeω-∨м', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': ['userdoesnotexist'], 'groups': []}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups (wrong value) # when an error occurs, everything fails and nothing is changed - self.assertRaises(InvalidParameter, inst.vm_update, u'пeω-∨м', + self.assertRaises(InvalidParameter, inst.vm_update, u'new-vm', {'users': [], 'groups': ['groupdoesnotexist']}) - self.assertEquals(users, inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals(groups, inst.vm_lookup(u'пeω-∨м')['groups']) + self.assertEquals(users, inst.vm_lookup(u'new-vm')['users']) + self.assertEquals(groups, inst.vm_lookup(u'new-vm')['groups']) # change VM users and groups by removing all elements - inst.vm_update(u'пeω-∨м', {'users': [], 'groups': []}) - self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['users']) - self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['groups']) + inst.vm_update(u'new-vm', {'users': [], 'groups': []}) + self.assertEquals([], inst.vm_lookup(u'new-vm')['users']) + self.assertEquals([], inst.vm_lookup(u'new-vm')['groups']) def test_multithreaded_connection(self): def worker(): @@ -1090,19 +1141,19 @@ def test_delete_running_vm(self): inst.templates_create(params) rollback.prependDefer(inst.template_delete, 'test') - params = {'name': u'kīмсhī-∨м', 'template': u'/templates/test'} + params = {'name': 'kimchi-vm', 'template': u'/templates/test'} inst.vms_create(params) rollback.prependDefer(utils.rollback_wrapper, inst.vm_delete, - u'kīмсhī-∨м') + 'kimchi-vm') - inst.vm_start(u'kīмсhī-∨м') + inst.vm_start('kimchi-vm') rollback.prependDefer(utils.rollback_wrapper, inst.vm_poweroff, - u'kīмсhī-∨м') + 'kimchi-vm') - inst.vm_delete(u'kīмсhī-∨м') + inst.vm_delete('kimchi-vm') vms = inst.vms_get_list() - self.assertFalse(u'kīмсhī-∨м' in vms) + self.assertFalse('kimchi-vm' in vms) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') def test_vm_list_sorted(self): diff --git a/tests/test_model_network.py b/tests/test_model_network.py index 5dbe54d..c61f37c 100644 --- a/tests/test_model_network.py +++ b/tests/test_model_network.py @@ -99,6 +99,10 @@ class NetworkTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_net_names(self): + net = {'name': u'kīмсhī-пet', 'connection': 'isolated'} + _do_network_test(self, model, net) + def test_get_networks(self): networks = json.loads(self.request('/networks').read()) self.assertIn('default', [net['name'] for net in networks]) @@ -127,7 +131,7 @@ def test_get_networks(self): def test_network_lifecycle(self): # Verify all the supported network type - networks = [{'name': u'kīмсhī-пet', 'connection': 'isolated'}, + networks = [{'name': u'kimchi-net', 'connection': 'isolated'}, {'name': u'nat-network', 'connection': 'nat'}, {'name': u'subnet-network', 'connection': 'nat', 'subnet': '127.0.100.0/24'}] diff --git a/tests/test_model_storagepool.py b/tests/test_model_storagepool.py index eabf875..35c62fc 100644 --- a/tests/test_model_storagepool.py +++ b/tests/test_model_storagepool.py @@ -60,6 +60,32 @@ class StoragepoolTests(unittest.TestCase): def setUp(self): self.request = partial(request, host, ssl_port) + def test_non_ascii_storagepool_name(self): + storagepools = json.loads(self.request('/storagepools').read()) + self.assertIn('default', [pool['name'] for pool in storagepools]) + + with RollbackContext() as rollback: + name = u'kīмсhī-storagepool' + req = json.dumps({'name': name, 'type': 'dir', + 'path': '/var/lib/libvirt/images/test_pool'}) + resp = self.request('/storagepools', req, 'POST') + rollback.prependDefer(model.storagepool_delete, name) + + self.assertEquals(201, resp.status) + + # Verify pool information + resp = self.request('/storagepools/%s' % name.encode("utf-8")) + p = json.loads(resp.read()) + keys = [u'name', u'state', u'capacity', u'allocated', + u'available', u'path', u'source', u'type', + u'nr_volumes', u'autostart', u'persistent'] + self.assertEquals(sorted(keys), sorted(p.keys())) + self.assertEquals(name, p['name']) + resp = self.request('/storagepools/%s/activate' % name.encode('utf-8'), req, 'POST') + rollback.prependDefer(model.storagepool_deactivate, name) + p = json.loads(resp.read()) + self.assertEquals('active', p['state']) + def test_get_storagepools(self): storagepools = json.loads(self.request('/storagepools').read()) self.assertIn('default', [pool['name'] for pool in storagepools]) diff --git a/tests/test_model_storagevolume.py b/tests/test_model_storagevolume.py index a3c3ce3..39531e9 100644 --- a/tests/test_model_storagevolume.py +++ b/tests/test_model_storagevolume.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Project Kimchi # -- 2.1.0

1 1

Scrum meeting on Feb. 18th cancelled
by Aline Manera 13 Feb '15

13 Feb '15

Hi folks, As I mentioned in the last scrum meeting, I will be out next week for the Linux Foundation Collaboration Summit where I will do a presentation about Kimchi. Because that we will not have the usual scrum meeting on Feb 18th. Regards, Aline Manera

1 0

[PATCH 0/2] Issue #556: Unable to create bridge virbr0: File already exists
by Ramon Medeiros 12 Feb '15

12 Feb '15

Discovery which bridge is available and pass it when creating the default network pool. Ramon Medeiros (2): Implement function to discover which bridge name is available Pass bridge name on NAT network creation src/kimchi/model/networks.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) -- 1.8.3.1

1 2

[PATCH] Fix issue #589: Add listener to remove Kimchi leftovers
by Aline Manera 12 Feb '15

12 Feb '15

If Kimchi is stopped before it gets completely up, it can leave some leftovers on system due the Feature tests. So add a listener to cherrypy server to clean up any leftovers when server is stopped. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/kvmusertests.py | 19 ++++++++----------- src/kimchi/model/config.py | 27 +++++++++++++++++++++++++-- src/kimchi/model/featuretests.py | 21 +++++++++++++-------- 3 files changed, 46 insertions(+), 21 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 408706d..37a80d7 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -18,18 +18,18 @@ import platform import psutil -import uuid import libvirt from kimchi.rollbackcontext import RollbackContext +KVMUSERTEST_VM_NAME = "KVMUSERTEST_VM" + class UserTests(object): SIMPLE_VM_XML = """ <domain type='kvm'> - <name>%(vm_name)s</name> - <uuid>%(vm_uuid)s</uuid> + <name>%(name)s</name> <memory unit='KiB'>262144</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -43,22 +43,19 @@ class UserTests(object): if cls.user: return cls.user - vm_uuid = uuid.uuid1() - vm_name = "kimchi_test_%s" % vm_uuid arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - xml = cls.SIMPLE_VM_XML % {'vm_name': vm_name, 'vm_uuid': vm_uuid, - 'arch': arch} + xml = cls.SIMPLE_VM_XML % {'name': KVMUSERTEST_VM_NAME, 'arch': arch} with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) - dom = conn.defineXML(xml) - rollback.prependDefer(dom.undefine) - dom.create() + dom = conn.createXML(xml, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) rollback.prependDefer(dom.destroy) - with open('/var/run/libvirt/qemu/%s.pid' % vm_name) as f: + filename = '/var/run/libvirt/qemu/%s.pid' % KVMUSERTEST_VM_NAME + with open(filename) as f: pidStr = f.read() p = psutil.Process(int(pidStr)) diff --git a/src/kimchi/model/config.py b/src/kimchi/model/config.py index 6a7df41..1c43360 100644 --- a/src/kimchi/model/config.py +++ b/src/kimchi/model/config.py @@ -1,7 +1,7 @@ # # Project Kimchi # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,8 @@ from kimchi.config import find_qemu_binary, get_version from kimchi.distroloader import DistroLoader from kimchi.exception import NotFoundError from kimchi.model.debugreports import DebugReportsModel -from kimchi.model.featuretests import FeatureTests +from kimchi.model.featuretests import FeatureTests, FEATURETEST_POOL_NAME +from kimchi.model.featuretests import FEATURETEST_VM_NAME from kimchi.repositories import Repositories from kimchi.screenshot import VMScreenshot from kimchi.swupdate import SoftwareUpdate @@ -61,6 +62,28 @@ class CapabilitiesModel(object): # It is needed because some features tests depends on the server cherrypy.engine.subscribe('start', self._set_capabilities) + # Subscribe function to clean any Kimchi leftovers + cherrypy.engine.subscribe('stop', self._clean_leftovers) + + def _clean_leftovers(self): + conn = self.conn.get() + FeatureTests.disable_libvirt_error_logging() + try: + dom = conn.lookupByName(FEATURETEST_VM_NAME) + dom.undefine() + except Exception: + # Any exception can be ignored here + pass + + try: + pool = conn.storagePoolLookupByName(FEATURETEST_POOL_NAME) + pool.undefine() + except Exception: + # Any exception can be ignored here + pass + + FeatureTests.enable_libvirt_error_logging() + def _set_capabilities(self): kimchi_log.info("*** Running feature tests ***") conn = self.conn.get() diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..6ffdf4a 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -25,17 +25,19 @@ import socket import subprocess import threading - from lxml.builder import E - from kimchi.rollbackcontext import RollbackContext from kimchi.utils import kimchi_log, run_command +FEATURETEST_VM_NAME = "FEATURETEST_VM" +FEATURETEST_POOL_NAME = "FEATURETEST_POOL" + + ISO_STREAM_XML = """ <domain type='%(domain)s'> - <name>ISO_STREAMING</name> + <name>%(name)s</name> <memory unit='KiB'>1048576</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -57,7 +59,7 @@ ISO_STREAM_XML = """ SIMPLE_VM_XML = """ <domain type='%(domain)s'> - <name>A_SIMPLE_VM</name> + <name>%(name)s</name> <memory unit='KiB'>10240</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -67,7 +69,7 @@ SIMPLE_VM_XML = """ SCSI_FC_XML = """ <pool type='scsi'> - <name>TEST_SCSI_FC_POOL</name> + <name>%(name)s</name> <source> <adapter type='fc_host' wwnn='1234567890abcdef' wwpn='abcdef1234567890'/> </source> @@ -105,7 +107,8 @@ class FeatureTests(object): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, + xml = ISO_STREAM_XML % {'name': FEATURETEST_VM_NAME, + 'domain': domain_type, 'protocol': protocol, 'arch': arch} try: FeatureTests.disable_libvirt_error_logging() @@ -176,7 +179,8 @@ class FeatureTests(object): try: FeatureTests.disable_libvirt_error_logging() pool = None - pool = conn.storagePoolDefineXML(SCSI_FC_XML, 0) + pool_xml = SCSI_FC_XML % {'name': FEATURETEST_POOL_NAME} + pool = conn.storagePoolDefineXML(pool_xml, 0) except libvirt.libvirtError as e: if e.get_error_code() == 27: # Libvirt requires adapter name, not needed when supports to FC @@ -196,7 +200,8 @@ class FeatureTests(object): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, + dom = conn.defineXML(SIMPLE_VM_XML % {'name': FEATURETEST_VM_NAME, + 'domain': domain_type, 'arch': arch}) rollback.prependDefer(dom.undefine) try: -- 2.1.0

3 3

[PATCH] Fix issue #591: Get the right arch for MockModel
by Aline Manera 12 Feb '15

12 Feb '15

Use osinfo information to get the properly arch information when creating a VM for feature tests. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/featuretests.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..c9a0c78 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -20,15 +20,13 @@ import cherrypy import libvirt import lxml.etree as ET -import platform import socket import subprocess import threading - from lxml.builder import E - +from kimchi import osinfo from kimchi.rollbackcontext import RollbackContext from kimchi.utils import kimchi_log, run_command @@ -103,8 +101,8 @@ class FeatureTests(object): @staticmethod def libvirt_supports_iso_stream(conn, protocol): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - arch = 'ppc64' if platform.machine() == 'ppc64le' \ - else platform.machine() + arch = osinfo.defaults['arch'] + arch = 'ppc64' if arch == 'ppc64le' else arch xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, 'arch': arch} try: @@ -194,8 +192,8 @@ class FeatureTests(object): FeatureTests.disable_libvirt_error_logging() rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' - arch = 'ppc64' if platform.machine() == 'ppc64le' \ - else platform.machine() + arch = osinfo.defaults['arch'] + arch = 'ppc64' if arch == 'ppc64le' else arch dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, 'arch': arch}) rollback.prependDefer(dom.undefine) -- 2.1.0

2 2

Question about KVM domain not available on trusty
by Thierry Fauck＠linux.vnet.ibm.com 11 Feb '15

11 Feb '15

I forgot, on trusty, qemu-kvm doesn't exist as is, and when I try to create a template I get errors like: libvirt: QEMU Driver error : unsupported configuration: Domain requires KVM, but it is not available. Check that virtualization is enabled in the host BIOS, and host configuration is setup to load the kvm modules. So 2 issues there - in trusty get a proper qemu version to avoid messages error: internal error: process exited while connecting to monitor: Warning: Disabling some instructions which are not emulated by TCG (0x0, 0x4) qemu: hardware error: qemu: could not load LPAR rtas '(null)' - in kimchi, detect if kvm not a valid domain type then use qemu Does that sound an issue ? - do you want me to code that ? Thanks -- Thierry Fauck @ linux.vnet.ibm

3 4

[PATCH V3] UI: Add widget messagebar with sample
by Wen Wang 11 Feb '15

11 Feb '15

V2 -> V3: Rename the sample file and add the license. V1 -> V2: Add a parameter "dismissTime" that allow delay time as well as "never" for the dismiss time. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/messagebar-flat.css | 64 ++++++++++++++++++++++++++++ ui/js/widgets/messagebar-flat.js | 71 ++++++++++++++++++++++++++++++++ ui/js/widgets/samples/messagebar.html | 49 ++++++++++++++++++++++ 3 files changed, 184 insertions(+) create mode 100644 ui/css/theme-default/messagebar-flat.css create mode 100644 ui/js/widgets/messagebar-flat.js create mode 100644 ui/js/widgets/samples/messagebar.html diff --git a/ui/css/theme-default/messagebar-flat.css b/ui/css/theme-default/messagebar-flat.css new file mode 100644 index 0000000..d5efc8e --- /dev/null +++ b/ui/css/theme-default/messagebar-flat.css @@ -0,0 +1,64 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.messagebar { + height: 30px; +} + +.messagebar .messagebar-text { + text-align: left; + vertical-align: 50%; +} + +.messagebar .messageHead { + display: inline-block; + width: 5px; + height: 30px; +} + +.messagebar-close { + line-height: 30px; + vertical-align: middle; + margin-right: 10px; + cursor: pointer; + float: right; +} + +.green { + background-color: #DAE6CB; +} + +.dark-green { + background-color: #89C53A; +} + +.yellow { + background-color: #F1E3C2; +} + +.dark-yellow { + background-color: #FDB60D; +} + +.red { + background-color: #EAC3C7; +} + +.dark-red { + background-color: #D81227; +} \ No newline at end of file diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js new file mode 100644 index 0000000..203d194 --- /dev/null +++ b/ui/js/widgets/messagebar-flat.js @@ -0,0 +1,71 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* +* Usage: + $(selector).messagebarFlat({ + content: "Test", //message you want to show in the messagebar + color: "red", //Three color supported: "red", "yellow" and "green", + dismissTime: 3000 //when set to "never", the messagebar will never disappear. + // Or setting it to numbers for the dismiss time you want to delay. + }); +*/ + +(function($) { + $.widget("kimchi.messagebarFlat", { + options : { + content : null, + color : "red", + dismissTime: 3000 + }, + + _create: function() { + var now = this._getTime(); + var that = this; + $("<div class='messagebar'><span class='messageHead'></span>" + + "<span class='messagebar-text'> " + this.options.content +": " + now + "</span></div>") + .addClass(this.options.color) + .appendTo(that.element); + $(".messageHead").addClass("dark-" + this.options.color); + $("<span class='messagebar-close icon-cancel-circled'></span>").on("click", function() { + that.destroy(); + }).appendTo($(".messagebar")); + var dismissDelay = this.options.dismissTime; + if (dismissDelay != "never") { + setTimeout(function() { + that.destroy() + }, dismissDelay); + } + }, + + _getTime: function() { + var CT = new Date(); + var currentDate = CT.getDate() + "/" + CT.getMonth()+1 + "/" +CT.getFullYear(); + var currentTime = CT.getHours() + ":" + CT.getMinutes() + ":" + CT.getSeconds(); + var now = currentDate + " " + currentTime; + return now; + }, + + destroy: function() { + var that = this; + that.element.fadeOut("normal", function() { + that.element.remove(); + }); + } + }); +})(jQuery); \ No newline at end of file diff --git a/ui/js/widgets/samples/messagebar.html b/ui/js/widgets/samples/messagebar.html new file mode 100644 index 0000000..b0aa600 --- /dev/null +++ b/ui/js/widgets/samples/messagebar.html @@ -0,0 +1,49 @@ + + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Sample of messagebar</title> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/messagebar-flat.css"> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../messagebar-flat.js"></script> + </head> + <body> + <div class="message"></div> + <script> + $(document).ready(function() { + $(".message").messagebarFlat({ + content: "This is a test", + color: "red", + dismissTime: 1000 + }); + }); + </script> + </body> + +</html> -- 2.1.0

3 3

[PATCH] Old version of ppc64_cpu command doesn't support option --threads-per-core
by thierry＠linux.vnet.ibm.com 10 Feb '15

10 Feb '15

From: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> Old version of ppc64_cpu command doesn't support option --threads-per-core and raises a start message ValueError: invalid literal for int() with base 10: 'information)' Solution is to get info from lscpu which sounds accurate Remove dependency to qemu-kvm Signed-off-by: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> modified: contrib/DEBIAN/control.in modified: src/kimchi/model/cpuinfo.py --- contrib/DEBIAN/control.in | 1 - src/kimchi/model/cpuinfo.py | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 069e14b..776b033 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,7 +14,6 @@ Depends: python-cherrypy3 (>= 3.2.0), libvirt-bin, nfs-common, python-m2crypto, - qemu-kvm, python-pam, python-parted, python-psutil (>= 0.6.0), diff --git a/src/kimchi/model/cpuinfo.py b/src/kimchi/model/cpuinfo.py index 3411ef5..d43f21f 100644 --- a/src/kimchi/model/cpuinfo.py +++ b/src/kimchi/model/cpuinfo.py @@ -80,11 +80,21 @@ class CPUInfoModel(object): out, error, rc = run_command(['ppc64_cpu', '--cores-on']) if not rc: self.cores_available = int(out.split()[-1]) - out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) - if not rc: - self.threads_per_core = int(out.split()[-1]) - self.sockets = self.cores_present/self.threads_per_core - self.cores_per_socket = self.cores_present/self.sockets + try: + out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) + if not rc: + self.threads_per_core = int(out.split()[-1]) + self.sockets = self.cores_present/self.threads_per_core + self.cores_per_socket = self.cores_present/self.sockets + except: + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Thread(s) per core:"']) + if not rc: + self.cores_present = int(out.split()[-1]) + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Core(s) per socket:"']) + if not rc: + self.cores_available = int(out.split()[-1]) else: # Intel or AMD self.guest_threads_enabled = True -- 1.7.9.5

4 4

[PATCH] Eliminate name collision for feature tests' VMs
by Christy Perez 06 Feb '15

06 Feb '15

If Kimchi's startup is interrupted for some reason, a VM created during the feature tests may be left defined. When this happens, the next time Kimchi is started it will fail with an error that the domain already exists (for example, "libvirtError: operation failed: domain 'A_SIMPLE_VM' already exists with uuid e6fccea8-f7ed-4320-a4cb-b85217d23985"). This patch just uses the same uuid-based name scheme as was already in the user tests (kvmusertests.py). That gives a miniscule chance for name collision. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/featuretests.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..aa8d709 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -24,6 +24,7 @@ import socket import subprocess import threading +import uuid from lxml.builder import E @@ -35,7 +36,7 @@ ISO_STREAM_XML = """ <domain type='%(domain)s'> - <name>ISO_STREAMING</name> + <name>'%(name)s'</name> <memory unit='KiB'>1048576</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -57,7 +58,7 @@ SIMPLE_VM_XML = """ <domain type='%(domain)s'> - <name>A_SIMPLE_VM</name> + <name>'%(name)s'</name> <memory unit='KiB'>10240</memory> <os> <type arch='%(arch)s'>hvm</type> @@ -105,8 +106,10 @@ def libvirt_supports_iso_stream(conn, protocol): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() + vm_uuid = uuid.uuid1() + vm_name = "ISO_STREAM_%s" % vm_uuid xml = ISO_STREAM_XML % {'domain': domain_type, 'protocol': protocol, - 'arch': arch} + 'arch': arch, 'name': vm_name} try: FeatureTests.disable_libvirt_error_logging() dom = conn.defineXML(xml) @@ -196,8 +199,11 @@ def has_metadata_support(conn): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() + vm_uuid = uuid.uuid1() + vm_name = "A_SIMPLE_VM_%s" % vm_uuid dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, - 'arch': arch}) + 'arch': arch, + 'name': vm_name}) rollback.prependDefer(dom.undefine) try: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, -- 1.9.3

2 5

Doubt Bug 121401 - LTCTest: Build36: Takes time to list "Device path" for logical pool creation
by Ramon Medeiros 06 Feb '15

06 Feb '15

Hi Team, i was debugging this bug and found that this query is taking so much time: pvs = subprocess.Popen( ["pvs", "--unbuffered", "--nameprefixes", "--noheadings", "-o", "vg_name", devNodePath], devNodePath is a partition or a disk (e.g. /dev/sdc or /dev/mpathe1) The goal in this command is search the volume group that this partition belongs to. On machines that has inconsistent volume groups, it takes a long time to retrieve the information. Can i cache this information before querying all partitions? Or there is other way to query this info faster? -- Ramon Nunes Medeiros Kimchi Developer Software Engineer - Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 2

[PATCH] Issue #569: Deactive logical pool cause vm failed to start
by gouzongmei＠163.com 06 Feb '15

06 Feb '15

From: Zongmei Gou <gouzongmei(a)163.com> Deactive logical pool cause vm failed to start while storage of the vm is in this logical pool. Storage pool's "deactive" action call libvirt "StoragePoolDestroy" function which causes different result on different pool type.Once the pool is destroyed, the 'dir' type pool remains its target path and images while the 'logical' type pool deletes its target path and images. This patch make deactive logical pool action failed while exists vm(s) linked to this pool. --- src/kimchi/i18n.py | 1 + src/kimchi/model/storagepools.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 4ab08d1..08bfe38 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -188,6 +188,7 @@ messages = { "KCHPOOL0035E": _("Unable to delete pool %(name)s as it is associated with some templates"), "KCHPOOL0036E": _("A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool."), "KCHPOOL0037E": _("Unable to update database with deep scan information due error: %(err)s"), + "KCHPOOL0038E": _("Unable to deactivate pool %(name)s. There are some virtual machines %(vms)s linked to this pool."), "KCHVOL0001E": _("Storage volume %(name)s already exists"), "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"), diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index b85f3b4..c42b62e 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import libvirt +import os from kimchi.scan import Scanner from kimchi.exception import InvalidOperation, MissingParameter @@ -27,6 +28,8 @@ from kimchi.model.host import DeviceModel from kimchi.model.libvirtstoragepool import StoragePoolDef from kimchi.utils import add_task, kimchi_log, pool_name_from_uri, run_command from kimchi.xmlutils.utils import xpath_get_text +from kimchi.model.vms import VMModel, VMsModel +from kimchi.xmlutils.disk import get_vm_disk_info, get_vm_disks ISO_POOL_NAME = u'kimchi_isos' @@ -230,6 +233,24 @@ class StoragePoolModel(object): source[key] = res return source + def _get_vms_attach_to_a_storagepool(self, pool_name): + # find out vm(s) the vol(s) of this pool attached to. + pool = self.get_storagepool(pool_name, self.conn) + xml = pool.XMLDesc(0) + + vms = [] + pool_path = xpath_get_text(xml, "/pool/target/path")[0] + vms_list = VMsModel.get_vms(self.conn) + for vm in vms_list: + dom = VMModel.get_vm(vm, self.conn) + storages = get_vm_disks(dom) + for disk in storages.keys(): + d_info = get_vm_disk_info(dom, disk) + if pool_path == os.path.split(d_info['path'])[0]: + vms.append(vm) + break + return sorted(vms) + def _nfs_status_online(self, pool, poolArgs=None): if not poolArgs: xml = pool.XMLDesc(0) @@ -378,6 +399,13 @@ class StoragePoolModel(object): raise OperationFailed("KCHPOOL0033E", {'name': name, 'server': source['addr']}) return + elif (pool_type == 'logical' and + self._get_storagepool_vols_num(pool) > 0): + # can not deactive if vol(s) exists, because destroy + # logical pool will cause the vol deleted. + vms = self._get_vms_attach_to_a_storagepool(name) + raise InvalidOperation('KCHPOOL0038E', {'name': name, + 'vms': ', '.join(vms)}) try: persistent = pool.isPersistent() pool.destroy() -- 1.8.3.1

2 1

[PATCH v2] Kimchi: Old version of ppc64_cpu command doesn't support option --threads-per-core V2 Correct missing \ in kimchi/model/cpuinfo.py V1 Old version of ppc64_cpu command doesn't support option --threads-per-core and raises a start message ValueError: invalid literal for int() with base 10: 'information)' Solution is to get info from lscpu which sounds accurate
by thierry＠linux.vnet.ibm.com 06 Feb '15

06 Feb '15

From: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> Remove dependency to qemu-kvm Signed-off-by: Thierry FAUCK - IBM LTC <thierry(a)linux.vnet.ibm.com> modified: contrib/DEBIAN/control.in modified: src/kimchi/model/cpuinfo.py --- contrib/DEBIAN/control.in | 1 - src/kimchi/model/cpuinfo.py | 20 +++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 069e14b..776b033 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -14,7 +14,6 @@ Depends: python-cherrypy3 (>= 3.2.0), libvirt-bin, nfs-common, python-m2crypto, - qemu-kvm, python-pam, python-parted, python-psutil (>= 0.6.0), diff --git a/src/kimchi/model/cpuinfo.py b/src/kimchi/model/cpuinfo.py index 3411ef5..d43f21f 100644 --- a/src/kimchi/model/cpuinfo.py +++ b/src/kimchi/model/cpuinfo.py @@ -80,11 +80,21 @@ class CPUInfoModel(object): out, error, rc = run_command(['ppc64_cpu', '--cores-on']) if not rc: self.cores_available = int(out.split()[-1]) - out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) - if not rc: - self.threads_per_core = int(out.split()[-1]) - self.sockets = self.cores_present/self.threads_per_core - self.cores_per_socket = self.cores_present/self.sockets + try: + out, error, rc = run_command(['ppc64_cpu', '--threads-per-core']) + if not rc: + self.threads_per_core = int(out.split()[-1]) + self.sockets = self.cores_present/self.threads_per_core + self.cores_per_socket = self.cores_present/self.sockets + except: + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Thread(s) per core:"']) + if not rc: + self.cores_present = int(out.split()[-1]) + out, error, rc = run_command(['sh', '-c', 'lscpu | + grep "Core(s) per socket:"']) + if not rc: + self.cores_available = int(out.split()[-1]) else: # Intel or AMD self.guest_threads_enabled = True -- 1.7.9.5

1 0

[PATCH] Make VMs for tests auto-destroy'd and transient
by Christy Perez 05 Feb '15

05 Feb '15

If Kimchi's startup is interrupted for some reason, a VM created during the feature tests may be left defined. When this happens, the next time Kimchi is started it will fail with an error that the domain already exists (for example, "libvirtError: operation failed: domain 'A_SIMPLE_VM' already exists with uuid e6fccea8-f7ed-4320-a4cb-b85217d23985"). About the new flag: "If the VIR_DOMAIN_START_AUTODESTROY flag is set, the guest domain will be automatically destroyed when the virConnectPtr object is finally released. This will also happen if the client application crashes / loses its connection to the libvirtd daemon. Any domains marked for auto destroy will block attempts at migration, save-to-file, or snapshots." This patch also changes the memory in the test VMs, due to the fact that the domain will be started, and some platforms (Power is a known example) require at least 128M of memory for a guest. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/kvmusertests.py | 5 ++--- src/kimchi/model/featuretests.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 408706d..3abf148 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -54,9 +54,8 @@ def probe_user(cls): with RollbackContext() as rollback: conn = libvirt.open(None) rollback.prependDefer(conn.close) - dom = conn.defineXML(xml) - rollback.prependDefer(dom.undefine) - dom.create() + dom = conn.createXML(xml, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) rollback.prependDefer(dom.destroy) with open('/var/run/libvirt/qemu/%s.pid' % vm_name) as f: pidStr = f.read() diff --git a/src/kimchi/model/featuretests.py b/src/kimchi/model/featuretests.py index 5a45990..ef7dcc5 100644 --- a/src/kimchi/model/featuretests.py +++ b/src/kimchi/model/featuretests.py @@ -58,7 +58,7 @@ SIMPLE_VM_XML = """ <domain type='%(domain)s'> <name>A_SIMPLE_VM</name> - <memory unit='KiB'>10240</memory> + <memory unit='KiB'>131072</memory> <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> @@ -109,8 +109,9 @@ def libvirt_supports_iso_stream(conn, protocol): 'arch': arch} try: FeatureTests.disable_libvirt_error_logging() - dom = conn.defineXML(xml) - dom.undefine() + dom = conn.createXML(xml, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) + dom.destroy() return True except libvirt.libvirtError, e: kimchi_log.error(e.message) @@ -196,9 +197,10 @@ def has_metadata_support(conn): domain_type = 'test' if conn.getType().lower() == 'test' else 'kvm' arch = 'ppc64' if platform.machine() == 'ppc64le' \ else platform.machine() - dom = conn.defineXML(SIMPLE_VM_XML % {'domain': domain_type, - 'arch': arch}) - rollback.prependDefer(dom.undefine) + dom = conn.createXML(SIMPLE_VM_XML % {'domain': domain_type, + 'arch': arch}, + flags=libvirt.VIR_DOMAIN_START_AUTODESTROY) + rollback.prependDefer(dom.destroy) try: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, "<metatest/>", KIMCHI_NAMESPACE, -- 1.9.3

2 2

[PATCH] Bugfix: Kimchi: Better to list storage pool paths
by Wen Wang 05 Feb '15

05 Feb '15

Fix the defect that kimchi could not show the storage path properly when it's too long. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index e0ab290..b6df3c2 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -50,7 +50,7 @@ .storage-text { font-size: 12px; - height: 18px; + min-height: 18px; padding: 10px; color: #999999; font-weight: bold; -- 2.1.0

3 3

[PATCH V2] UI: Add widget messagebar with sample
by Wen Wang 05 Feb '15

05 Feb '15

V1 -> V2: Add a parameter "dismissTime" that allow delay time as well as "never" for the dismiss time. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/messagebar-flat.css | 64 ++++++++++++++++++++ ui/js/widgets/messagebar-flat.js | 71 +++++++++++++++++++++++ ui/js/widgets/samples/messagebar-flat-sample.html | 34 +++++++++++ 3 files changed, 169 insertions(+) create mode 100644 ui/css/theme-default/messagebar-flat.css create mode 100644 ui/js/widgets/messagebar-flat.js create mode 100644 ui/js/widgets/samples/messagebar-flat-sample.html diff --git a/ui/css/theme-default/messagebar-flat.css b/ui/css/theme-default/messagebar-flat.css new file mode 100644 index 0000000..d5efc8e --- /dev/null +++ b/ui/css/theme-default/messagebar-flat.css @@ -0,0 +1,64 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.messagebar { + height: 30px; +} + +.messagebar .messagebar-text { + text-align: left; + vertical-align: 50%; +} + +.messagebar .messageHead { + display: inline-block; + width: 5px; + height: 30px; +} + +.messagebar-close { + line-height: 30px; + vertical-align: middle; + margin-right: 10px; + cursor: pointer; + float: right; +} + +.green { + background-color: #DAE6CB; +} + +.dark-green { + background-color: #89C53A; +} + +.yellow { + background-color: #F1E3C2; +} + +.dark-yellow { + background-color: #FDB60D; +} + +.red { + background-color: #EAC3C7; +} + +.dark-red { + background-color: #D81227; +} \ No newline at end of file diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js new file mode 100644 index 0000000..203d194 --- /dev/null +++ b/ui/js/widgets/messagebar-flat.js @@ -0,0 +1,71 @@ +/* + * Project Kimchi + * + * Copyright IBM, Corp. 2015 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* +* Usage: + $(selector).messagebarFlat({ + content: "Test", //message you want to show in the messagebar + color: "red", //Three color supported: "red", "yellow" and "green", + dismissTime: 3000 //when set to "never", the messagebar will never disappear. + // Or setting it to numbers for the dismiss time you want to delay. + }); +*/ + +(function($) { + $.widget("kimchi.messagebarFlat", { + options : { + content : null, + color : "red", + dismissTime: 3000 + }, + + _create: function() { + var now = this._getTime(); + var that = this; + $("<div class='messagebar'><span class='messageHead'></span>" + + "<span class='messagebar-text'> " + this.options.content +": " + now + "</span></div>") + .addClass(this.options.color) + .appendTo(that.element); + $(".messageHead").addClass("dark-" + this.options.color); + $("<span class='messagebar-close icon-cancel-circled'></span>").on("click", function() { + that.destroy(); + }).appendTo($(".messagebar")); + var dismissDelay = this.options.dismissTime; + if (dismissDelay != "never") { + setTimeout(function() { + that.destroy() + }, dismissDelay); + } + }, + + _getTime: function() { + var CT = new Date(); + var currentDate = CT.getDate() + "/" + CT.getMonth()+1 + "/" +CT.getFullYear(); + var currentTime = CT.getHours() + ":" + CT.getMinutes() + ":" + CT.getSeconds(); + var now = currentDate + " " + currentTime; + return now; + }, + + destroy: function() { + var that = this; + that.element.fadeOut("normal", function() { + that.element.remove(); + }); + } + }); +})(jQuery); \ No newline at end of file diff --git a/ui/js/widgets/samples/messagebar-flat-sample.html b/ui/js/widgets/samples/messagebar-flat-sample.html new file mode 100644 index 0000000..5ab4c73 --- /dev/null +++ b/ui/js/widgets/samples/messagebar-flat-sample.html @@ -0,0 +1,34 @@ + + + +<!DOCTYPE html> +<html> + <head> + <meta charset="UTF-8"> + <title>Sample of messagebar</title> + <meta http-equiv="X-UA-Compatible" content="IE=edge"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> + <link rel="stylesheet" href="../../../css/fontello/css/fontello.css"> + <link rel="stylesheet" href="../../../css/fontello/css/animation.css"> + <link rel="stylesheet" href="../../../libs/themes/base/jquery-ui.min.css"> + <link rel="stylesheet" href="../../../css/theme-default/messagebar-flat.css"> + <script src="../../../libs/jquery-1.10.0.min.js"></script> + <script src="../../../libs/jquery-ui.min.js"></script> + <script src="../messagebar-flat.js"></script> + </head> + <body> + <div class="message"></div> + <script> + $(document).ready(function() { + $(".message").messagebarFlat({ + content: "This is a test", + color: "red", + dismissTime: 1000 + }); + }); + </script> + </body> + +</html> -- 2.1.0

2 5

[v3 0/2] UI: Tabs Widget(With Sample)
by huoyuxin＠linux.vnet.ibm.com 05 Feb '15

05 Feb '15

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): UI: Customize jQuery UI Tabs Widget UI: Tabs Widget Sample ui/css/theme-default/tabs.css | 46 ++++++++++++++++++++++++++ ui/css/theme-default/theme.css | 50 ++++++++++++++++++++++++++++ ui/js/widgets/samples/tabs.html | 68 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+), 0 deletions(-) create mode 100644 ui/css/theme-default/tabs.css create mode 100644 ui/css/theme-default/theme.css create mode 100644 ui/js/widgets/samples/tabs.html

2 3

[PATCH 0/2] Dialog widget with sample
by Wen Wang 05 Feb '15

05 Feb '15

Dialog widget with sample Wen Wang (2): UI; Add widget of dialog UI: Sample of dialog widget ui/css/theme-default/dialog-flat.css | 67 +++++++++++++++++++ ui/js/widgets/dialog-flat.js | 120 +++++++++++++++++++++++++++++++++++ ui/js/widgets/samples/dialog.html | 51 +++++++++++++++ 3 files changed, 238 insertions(+) create mode 100644 ui/css/theme-default/dialog-flat.css create mode 100644 ui/js/widgets/dialog-flat.js create mode 100644 ui/js/widgets/samples/dialog.html -- 2.1.0

2 3