June 2016 - Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] [PATCH v2][Wok 7/8] Fix test utils imports and add auth tests
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch add auth test to GET and POST requests in API of Plugins > Manager. It also fixes imports in tests/utils.py > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > tests/test_plugin.py | 5 +++-- > tests/test_server.py | 10 +++++++++- > tests/utils.py | 7 ++++--- > 3 files changed, 16 insertions(+), 6 deletions(-) > > diff --git a/tests/test_plugin.py b/tests/test_plugin.py > index 7c5e8e8..d785cfa 100644 > --- a/tests/test_plugin.py > +++ b/tests/test_plugin.py > @@ -23,7 +23,8 @@ import json > import unittest > from functools import partial > > -from wok.utils import get_enabled_plugins > +#from wok.pluginsmanager import get_enabled_plugins > +from wok.pluginsmanager import Plugins > > import utils > > @@ -50,7 +51,7 @@ def tearDownModule(): > > > @unittest.skipUnless( > - 'sample' in [plugin for plugin, _config in get_enabled_plugins()], > + 'sample' in Plugins().get_enabled_plugins(), > 'sample plugin is not enabled, skip this test!') > class PluginTests(unittest.TestCase): > > diff --git a/tests/test_server.py b/tests/test_server.py > index 1f5a236..6e4749e 100644 > --- a/tests/test_server.py > +++ b/tests/test_server.py > @@ -188,12 +188,20 @@ class ServerTests(unittest.TestCase): > > def test_auth_protected(self): > hdrs = {'AUTHORIZATION': ''} > - uris = ['/tasks'] > + uris = ['/tasks', > + '/pluginsmanager', > + '/pluginsmanager/sample'] > > for uri in uris: > resp = self.request(uri, None, 'GET', hdrs) > self.assertEquals(401, resp.status) > > + uris = ['/pluginsmanager/sample/disable'] > + > + for uri in uris: > + resp = self.request(uri, {}, 'POST', hdrs) > + self.assertEquals(401, resp.status) > + > def test_auth_bad_creds(self): > # Test HTTPBA > hdrs = {'AUTHORIZATION': "Basic " + base64.b64encode("nouser:badpass")} > diff --git a/tests/utils.py b/tests/utils.py > index d158ba1..ed709e1 100644 > --- a/tests/utils.py > +++ b/tests/utils.py > @@ -38,8 +38,9 @@ from lxml import etree > > import wok.server > from wok.config import config, PluginPaths > -from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs Keep importing 'tabs' to do not parse the file multiple times. > +from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES > from wok.exception import NotFoundError, OperationFailed > +from wok.pluginsmanager import get_all_tabs > from wok.utils import wok_log > > > @@ -192,14 +193,14 @@ class FakeUser(User): > self.user = {} > self.user[USER_NAME] = username > self.user[USER_GROUPS] = None > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), 'user') > > def get_groups(self): > return sorted([group.gr_name for group in grp.getgrall()])[0:3] > > def get_roles(self): > if self.sudo: > - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') > + self.user[USER_ROLES] = dict.fromkeys(get_all_tabs(), 'admin') > return self.user[USER_ROLES] > > def get_user(self):

2 2

Re: [Kimchi-devel] [PATCH v2][Wok 6/8] Fix Sample plugin
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch adapts Sample plugin to work with new latest Wok plugin > changes and to work with Plugins Manager. > --- > src/wok/plugins/sample/__init__.py | 54 ++++++++++++++++++++-- > src/wok/plugins/sample/control/__init__.py | 26 +++++++++++ > src/wok/plugins/sample/sample.conf.in | 22 --------- > src/wok/plugins/sample/ui/config/tab-ext.xml | 9 ++-- > .../plugins/sample/ui/pages/sample-tab1.html.tmpl | 3 ++ > .../plugins/sample/ui/pages/sample-tab2.html.tmpl | 3 ++ > 6 files changed, 86 insertions(+), 31 deletions(-) > create mode 100644 src/wok/plugins/sample/control/__init__.py > > diff --git a/src/wok/plugins/sample/__init__.py b/src/wok/plugins/sample/__init__.py > index ff96b15..c65dd0d 100644 > --- a/src/wok/plugins/sample/__init__.py > +++ b/src/wok/plugins/sample/__init__.py > @@ -23,21 +23,22 @@ import json > import os > from cherrypy import expose > > - > -from wok.config import PluginPaths > +from wok.config import CACHEEXPIRES, PluginConfig, PluginPaths > from wok.control.base import Collection, Resource > from wok.root import WokRoot > > > -from plugins.sample.i18n import messages > -from plugins.sample.model import Model > +from wok.plugins.sample.i18n import messages > +from wok.plugins.sample.model import Model > > > model = Model() > > > -class Drawings(WokRoot): > +class Sample(WokRoot): > def __init__(self, wok_options): > + dev_env = wok_options.environment != 'production' > + super(Sample, self).__init__(model, dev_env) > Resource.__init__(self, model) As you are calling WokRoot.__init__, I don't think this Resource.__init__ is necessary anymore. > self.description = Description(model) > self.rectangles = Rectangles(model) > @@ -52,6 +53,49 @@ class Drawings(WokRoot): > def index(self): > return 'This is a sample plugin for Wok' > > + def get_custom_conf(self): > + return SampleConfig() > + > + > +class SampleConfig(PluginConfig): > + def __init__(self): > + super(SampleConfig, self).__init__('sample') > + > + sample_path = PluginPaths('sample') > + > + custom_config = { > + '/help': { > + 'tools.staticdir.on': True, > + 'tools.staticdir.dir': os.path.join(sample_path.ui_dir, > + 'pages/help'), > + 'tools.nocache.on': True > + }, > + '/images': { > + 'tools.staticdir.on': True, > + 'tools.staticdir.dir': os.path.join(sample_path.ui_dir, > + 'images'), > + 'tools.wokauth.on': False, > + 'tools.nocache.on': False > + }, I don't think sample plugin has any image to expose on server. So we don't need this there. > + '/description': {'tools.wokauth.on': True}, > + '/rectangles': {'tools.wokauth.on': True}, > + '/circles': {'tools.wokauth.on': True} > + } > + > + for dirname in ('css', 'js', 'images'): Same for js and css config. > + custom_config['/' + dirname] = { > + 'tools.staticdir.on': True, > + 'tools.staticdir.dir': os.path.join(sample_path.ui_dir, > + dirname), > + 'tools.wokauth.on': False, > + 'tools.nocache.on': False} > + if dirname != 'images': > + custom_config['/' + dirname].update({ > + 'tools.expires.on': True, > + 'tools.expires.secs': CACHEEXPIRES}) > + > + self.update(custom_config) > + > > class Description(Resource): > def __init__(self, model): > diff --git a/src/wok/plugins/sample/control/__init__.py b/src/wok/plugins/sample/control/__init__.py > new file mode 100644 > index 0000000..c87776e > --- /dev/null > +++ b/src/wok/plugins/sample/control/__init__.py > @@ -0,0 +1,26 @@ > +# > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# This library is free software; you can redistribute it and/or > +# modify it under the terms of the GNU Lesser General Public > +# License as published by the Free Software Foundation; either > +# version 2.1 of the License, or (at your option) any later version. > +# > +# This library is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +# Lesser General Public License for more details. > +# > +# You should have received a copy of the GNU Lesser General Public > +# License along with this library; if not, write to the Free Software > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + > +import os > + > + > +from wok.control.utils import load_url_sub_node > + > + > +sub_nodes = load_url_sub_node(os.path.dirname(__file__), __name__) > diff --git a/src/wok/plugins/sample/sample.conf.in b/src/wok/plugins/sample/sample.conf.in > index 9da33e1..1e1b8a4 100644 > --- a/src/wok/plugins/sample/sample.conf.in > +++ b/src/wok/plugins/sample/sample.conf.in > @@ -1,27 +1,5 @@ > [wok] > enable = @ENABLE_SAMPLE@ > -plugin_class = "Drawings" > uri = "/plugins/sample" > > -[/] > -tools.nocache.on = True > -tools.trailing_slash.on = False > -tools.sessions.on = True > -tools.sessions.name = 'wok' > -tools.sessions.httponly = True > -tools.sessions.locking = 'explicit' > -tools.sessions.storage_type = 'ram' > > -[/description] > -tools.wokauth.on = True > - > -[/rectangles] > -tools.wokauth.on = True > - > -[/circles] > -tools.wokauth.on = True > - > -[/help] > -tools.staticdir.on = True > -tools.nocache.on = True > -tools.staticdir.dir = wok.config.PluginPaths('sample').ui_dir + '/pages/help' > diff --git a/src/wok/plugins/sample/ui/config/tab-ext.xml b/src/wok/plugins/sample/ui/config/tab-ext.xml > index aff0d14..bcd20fe 100644 > --- a/src/wok/plugins/sample/ui/config/tab-ext.xml > +++ b/src/wok/plugins/sample/ui/config/tab-ext.xml > @@ -1,17 +1,18 @@ > <?xml version="1.0" encoding="utf-8"?> > <tabs-ext> > + <functionality>Sample</functionality> > <tab> > <access role="admin" mode="admin"/> > <access role="user" mode="none"/> > - > - <title>SampleTab 1</title> > + <title>SampleTab1</title> > <path>plugins/sample/sample-tab1.html</path> > + <order>10</order> > </tab> > <tab> > <access role="admin" mode="admin"/> > <access role="user" mode="none"/> > - > - <title>SampleTab 2</title> > + <title>SampleTab2</title> > <path>plugins/sample/sample-tab2.html</path> > + <order>20</order> > </tab> > </tabs-ext> > diff --git a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl > index 2777848..8e4b52b 100644 > --- a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl > +++ b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl > @@ -22,6 +22,9 @@ > <html> > <script type="text/javascript" src="plugins/sample/js/util.js"></script> > <body> > + <div> > + Sample PAGE 1 > + </div> > <div id="samplebody"/> > </body> > <script> > diff --git a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl > index 2777848..8f92b80 100644 > --- a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl > +++ b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl > @@ -22,6 +22,9 @@ > <html> > <script type="text/javascript" src="plugins/sample/js/util.js"></script> > <body> > + <div> > + Sample PAGE 2 > + </div> > <div id="samplebody"/> > </body> > <script>

2 1

Re: [Kimchi-devel] [PATCH v2][Wok 5/8] Load Wok Server after options checkings
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch moves Server.py import right before instanciate the class. > Then all following imports and initializations required by Server module > are done after command line options checkings. > This way avoid problems like init and load plugins then wokd stops due > to wrong command line option. Could you explain better the problem? I checked server.py and there is no function being called on this module. Seems it is an workaround to a deeper issue. > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wokd.in | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/wokd.in b/src/wokd.in > index 962581d..3cf90f8 100644 > --- a/src/wokd.in > +++ b/src/wokd.in > @@ -27,7 +27,6 @@ sys.path.insert(1, '@pythondir@') > > from optparse import OptionParser > > -import wok.server > import wok.config as config > > > @@ -100,6 +99,11 @@ def main(options): > setattr(options, 'max_body_size', > config.config.get('server', 'max_body_size')) > > + > + # Wok Server module must be imported after options checkings. Otherwise it > + # is possible that server start some functions and then fail due to wrong > + # parameters passed > + import wok.server > wok.server.main(options) > > if __name__ == '__main__':

2 1

[RFC] Change guest boot order on REST API
by Ramon Medeiros 08 Jun '16

08 Jun '16

Propose: Kimchi allow to change boot order ("fd", "hd", "cdrom" or "network") hd device can specify which disk will be booted Rest API will receive answer from /plugins/kimchi/<VM NAME>/bootorder {[{"dev": "hd"}]} or a list: {[{"dev": "hd"}, {"dev": "cdrom"}]} Doubts: How we can edit the bootloader? Like the list above or a kind of fixed list? Libvirt provides bootmenu too, which allows users to pick a device in the beginning. Must have it? -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

3 5

Re: [Kimchi-devel] [PATCH v2][Wok 3/8] Implements control/model of new plugin API
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/control/plugins.py | 31 ++++++++++++++++++++++++++++--- > src/wok/i18n.py | 3 +++ > src/wok/model/plugins.py | 38 ++++++++++++++++++++++++++++++-------- > 3 files changed, 61 insertions(+), 11 deletions(-) > > diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py > index 57dfa1b..5c125eb 100644 > --- a/src/wok/control/plugins.py > +++ b/src/wok/control/plugins.py > @@ -19,11 +19,36 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > -from wok.control.base import SimpleCollection > +from wok.control.base import Collection, Resource, SimpleCollection > from wok.control.utils import UrlSubNode > > > -@UrlSubNode("plugins") > -class Plugins(SimpleCollection): > +@UrlSubNode("plugins", False) > +class PluginsSimple(SimpleCollection): > + """ > + Returns only enabled plugins in order to built initial Wok UI > + """ > + def __init__(self, model): > + super(PluginsSimple, self).__init__(model) > + pass > + > + > +@UrlSubNode("pluginsmanager", True) > +class Plugins(Collection): > def __init__(self, model): > super(Plugins, self).__init__(model) > + self.resource = Plugin > + self.admin_methods = ['GET'] > + > + > +class Plugin(Resource): > + def __init__(self, model, id): > + super(Plugin, self).__init__(model, id) > + self.uri_fmt = "/pluginsmanager/%s" > + self.enable = self.generate_action_handler('enable') > + self.disable = self.generate_action_handler('disable') > + self.admin_methods = ['GET', 'POST'] > + > + @property > + def data(self): > + return self.info > diff --git a/src/wok/i18n.py b/src/wok/i18n.py > index 4fc21f1..bda3949 100644 > --- a/src/wok/i18n.py > +++ b/src/wok/i18n.py > @@ -60,4 +60,7 @@ messages = { > "WOKRES0001L": _("Request made on resource"), > "WOKROOT0001L": _("User '%(username)s' logged in"), > "WOKROOT0002L": _("User '%(username)s' logged out"), > + > + "WOKPLUG0001E": _("Plugin '%(plugin_name)s' not found."), > + "WOKPLUG0002E": _("Error updating configuration file of plugin '%(plugin)s'."), > } > diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py > index 4beff44..b0ac366 100644 > --- a/src/wok/model/plugins.py > +++ b/src/wok/model/plugins.py > @@ -3,8 +3,6 @@ > # > # Copyright IBM Corp, 2015-2016 > # > -# Code derived from Project Kimchi > -# Any reason to remove the above line? > # This library is free software; you can redistribute it and/or > # modify it under the terms of the GNU Lesser General Public > # License as published by the Free Software Foundation; either > @@ -19,9 +17,17 @@ > # License along with this library; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > > -import cherrypy > > -from wok.utils import get_enabled_plugins > +from wok.exception import NotFoundError > +from wok.pluginsmanager import Plugins > + > + > +class PluginsSimpleModel(object): > + def __init__(self, **kargs): > + pass > + > + def get_list(self): > + return Plugins().get_enabled_plugins() > > > class PluginsModel(object): > @@ -29,7 +35,23 @@ class PluginsModel(object): > pass > > def get_list(self): > - # Will only return plugins that were loaded correctly by WOK and are > - # properly configured in cherrypy > - return [plugin for (plugin, config) in get_enabled_plugins() > - if config.get('wok').get('uri') in cherrypy.tree.apps.keys()] > + return Plugins().get_all_plugins_names() > + > + > +class PluginModel(object): > + def __init__(self, **kargs): > + pass > + > + def lookup(self, plugin): > + info = Plugins().get_plugin_info(plugin) > + if not info: > + raise NotFoundError('WOKPLUG0001E', {'plugin_name': plugin}) > + > + return {'name': plugin, > + 'enabled': info['enabled']} > + > + def enable(self, plugin_name): > + Plugins().enable_plugin(plugin_name) > + > + def disable(self, plugin_name): > + Plugins().disable_plugin(plugin_name)

2 2

Re: [Kimchi-devel] [PATCH v2][Wok 4/8] Change plugins API documentation by pluginsmanager API
by Aline Manera 08 Jun '16

08 Jun '16

On 06/06/2016 04:13 PM, Rodrigo Trujillo wrote: > This patch creates the documentation for pluginsmanager API > > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > docs/API/plugins.md | 13 ---------- > docs/API/pluginsmanager.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 61 insertions(+), 13 deletions(-) > delete mode 100644 docs/API/plugins.md > create mode 100644 docs/API/pluginsmanager.md > > diff --git a/docs/API/plugins.md b/docs/API/plugins.md > deleted file mode 100644 > index aaa37b5..0000000 > --- a/docs/API/plugins.md > +++ /dev/null > @@ -1,13 +0,0 @@ > -## REST API Specification for Plugins > - > -### Collection: Plugins > - > -**URI:** /plugins > - > -**Methods:** > - > -* **GET**: Retrieve a summarized list names of all UI Plugins > - > -#### Examples > -GET /plugins > -[pluginA, pluginB, pluginC] You should keep this file there for the /plugins API. > diff --git a/docs/API/pluginsmanager.md b/docs/API/pluginsmanager.md > new file mode 100644 > index 0000000..b79c8ad > --- /dev/null > +++ b/docs/API/pluginsmanager.md > @@ -0,0 +1,61 @@ > +## REST API Specification for Plugins Manager > + > +### Collection: Plugins > + > +**URI:** /pluginsmanager > + > +**Methods:** > + > +* **GET**: Retrieve a list of all Plugins configured in Wok, showing name and state. > + > +#### Examples > +GET /pluginsmanager > +[ > + { > + "enabled":true, > + "name":"gingerbase" > + }, > + { > + "enabled":true, > + "name":"kimchi" > + }, > + { > + "enabled":false, > + "name":"sample" > + } > +] > + Maybe it would be good to have the 'uri' listed among of those plugin info. > +### Resource: Plugin > + > +**URI:** /pluginsmanager/*:name* > + > +A plugin represents a software that will make use of infrastructure provided > +by Wok. It should be installed in a directory with its <name> in Wok directory > +'plugins' and contains an <name>.conf file. > +Example: "/usr/lib/python2.7/site-packages/wok/plugins/kimchi" > + > +**Methods:** > + > +* **GET**: Retrieve the full description of the plugin. > + * name: The plugin name > + * enabled: State of the plugin. If not enabled, Wok will not load it > +* **POST**: *See Task Actions* > + > +**Actions (POST):** > + > +* enable: enable a plugin. Also changes plugin's configuration file > + > +* disable: disable a plugin. Also changes plugin's configuration file > + > +#### Examples > +GET /pluginsmanager/sample > +{ > + "enabled":false, > + "name":"sample" > +} > + > +POST /pluginsmanager/sample/enable > +{ > + "enabled":true, > + "name":"sample" > +} Add an example for 'disable' action

2 1

[PATCH] [Wok 0/6] Log failed user requests
by Lucio Correia 08 Jun '16

08 Jun '16

This patch requires "[Kimchi] Do not break the logging of failed requests". Otherwise, some tests will be broken. Lucio Correia (6): Revert "Use past verbs" Parse request before authorization check Use status code 200 for PUT requests on resource Log failed login/logout attempts Log failed user requests Add status code to request log message src/wok/control/base.py | 164 ++++++++++++++++++++++++++++++------------------ src/wok/i18n.py | 4 +- src/wok/reqlogger.py | 10 +-- src/wok/root.py | 44 +++++++++---- 4 files changed, 140 insertions(+), 82 deletions(-) -- 1.9.1

2 9

[PATCH][Kimchi 3/5] Update REST API
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- API.json | 12 ++++++++++++ i18n.py | 2 ++ 2 files changed, 14 insertions(+) diff --git a/API.json b/API.json index 8d4f725..d0e6831 100644 --- a/API.json +++ b/API.json @@ -294,6 +294,18 @@ "minLength": 1, "error": "KCHVM0011E" }, + "boot": { + "description": "Boot order and bootmenu configuration", + "type": "object", + "error": "KCHVM0052E", + "properties": { + "order": { + "description": "Boot order", + "type": "array", + "error": "KCHVM0053E" + } + } + }, "users": { "description": "Array of users who have permission to the VM", "type": "array", diff --git a/i18n.py b/i18n.py index 2d8390f..ec060ae 100644 --- a/i18n.py +++ b/i18n.py @@ -103,6 +103,8 @@ messages = { "KCHVM0049E": _("Cannot power off %(name)s. Virtual machine is shut off."), "KCHVM0050E": _("Cannot shutdown %(name)s. Virtual machine is shut off."), "KCHVM0051E": _("Cannot reset %(name)s. Virtual machine is already shut off."), + "KCHVM0052E": _("Boot configuration must have order list"), + "KCHVM0053E": _("Boot order must be a list of the devices"), "KCHVM0055E": _("Migrate to localhost %(host)s is not allowed."), "KCHVM0056E": _("To migrate a virtual machine to the remote host %(host)s the user %(user)s must have password-less login to the remote host."), -- 2.5.5

2 4

[PATCH][Kimchi 1/5] Create method to change bootorder of a guest
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index b0b4eb2..854cd04 100644 --- a/model/vms.py +++ b/model/vms.py @@ -81,7 +81,7 @@ VM_ONLINE_UPDATE_PARAMS = ['graphics', 'groups', 'memory', 'users'] # update parameters which are updatable when the VM is offline VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', - 'name', 'users'] + 'name', 'users', 'boot'] XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" @@ -736,6 +736,34 @@ class VMModel(object): else: remove_metadata_node(dom, 'name') + def _update_bootorder(self, xml, params): + # get element tree from xml + et = ET.fromstring(xml) + + # get machine type + os = et.find("os") + mtype = os.find("type") + + # create new element tree with new bootorder + new_os = E.os() + new_os.append(mtype) + + # iterate over new bootorder and build tag + for device in params["order"]: + + # skip devices not in list + if device not in ["hd", "cdrom", "network", "fd"]: + continue + + # add bootdevice + new_os.append(E.boot(dev=device)) + + # update <os> + et.remove(os) + et.append(new_os) + + return ET.tostring(et) + def _static_vm_update(self, vm_name, dom, params): old_xml = new_xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) params = copy.deepcopy(params) @@ -782,6 +810,10 @@ class VMModel(object): if ('memory' in params and params['memory'] != {}): new_xml = self._update_memory_config(new_xml, params, dom) + # update bootorder + if "boot" in params: + new_xml = self._update_bootorder(new_xml, params["boot"]) + snapshots_info = [] conn = self.conn.get() try: -- 2.5.5

3 5

[PATCH][Kimchi 2/5] Update documentation about bootorder on vm update
by Ramon Medeiros 08 Jun '16

08 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- docs/API.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/API.md b/docs/API.md index 7072ab2..41635ee 100644 --- a/docs/API.md +++ b/docs/API.md @@ -174,6 +174,8 @@ server. * sockets - The maximum number of sockets to use. * cores - The number of cores per socket. * threads - The number of threads per core. + * boot: Update boot order and bootmenu + * order: list of devices to boot * **POST**: *See Virtual Machine Actions* -- 2.5.5

3 2

[PATCH] [Wok] Externlise the size units such as Ki, Mi, Gi, etc.
by pkulkark＠linux.vnet.ibm.com 08 Jun '16

08 Jun '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch externalises the size units such as KiB, MiB, GiB, etc that are added in wok.formatMeasurement method, and also updates the .pot and *.po files. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- po/de_DE.po | 32 +++++++++++++++++++++++++++++++- po/en_US.po | 32 +++++++++++++++++++++++++++++++- po/es_ES.po | 32 +++++++++++++++++++++++++++++++- po/fr_FR.po | 32 +++++++++++++++++++++++++++++++- po/it_IT.po | 32 +++++++++++++++++++++++++++++++- po/ja_JP.po | 32 +++++++++++++++++++++++++++++++- po/ko_KR.po | 32 +++++++++++++++++++++++++++++++- po/pt_BR.po | 32 +++++++++++++++++++++++++++++++- po/ru_RU.po | 32 +++++++++++++++++++++++++++++++- po/wok.pot | 32 +++++++++++++++++++++++++++++++- po/zh_CN.po | 32 +++++++++++++++++++++++++++++++- po/zh_TW.po | 32 +++++++++++++++++++++++++++++++- ui/js/src/wok.utils.js | 7 ++++++- ui/pages/i18n.json.tmpl | 13 ++++++++++++- 14 files changed, 390 insertions(+), 14 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 0fb869d..c2b9a0a 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + 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 " diff --git a/po/en_US.po b/po/en_US.po index 73d7056..b31785b 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -195,6 +195,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 8acb513..d77c60e 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + 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 " diff --git a/po/fr_FR.po b/po/fr_FR.po index 9cc473a..065113b 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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/" @@ -204,6 +204,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + 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. " diff --git a/po/it_IT.po b/po/it_IT.po index ef3729d..d871172 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -201,6 +201,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "Il nome utente o la password immessi non sono corretti. Ripetere " diff --git a/po/ja_JP.po b/po/ja_JP.po index dc8926f..cde5d87 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -199,6 +199,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "入力したユーザー名またはパスワードが誤っています。やり直してください。" diff --git a/po/ko_KR.po b/po/ko_KR.po index 84b4750..2ef50fb 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -196,6 +196,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하십시오." diff --git a/po/pt_BR.po b/po/pt_BR.po index a4ae451..75a6c9b 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\n" "PO-Revision-Date: 2015-03-23 12:57+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -217,6 +217,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + 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." diff --git a/po/ru_RU.po b/po/ru_RU.po index 0e81ba4..392be6d 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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/" @@ -197,6 +197,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "Указано неверное имя пользователя или пароль. Введите еще раз." diff --git a/po/wok.pot b/po/wok.pot index 01b8a28..231cd33 100755 --- a/po/wok.pot +++ b/po/wok.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -195,6 +195,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0a66eec..5d81cc5 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -212,6 +212,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "用户名或密码错误，请重新输入。" diff --git a/po/zh_TW.po b/po/zh_TW.po index fd83384..ccd1d48 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: 2016-05-19 21:30+0530\n" +"POT-Creation-Date: 2016-05-25 15:08+0530\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" @@ -196,6 +196,36 @@ msgstr "" msgid "Actions" msgstr "" +msgid "Ki" +msgstr "" + +msgid "Mi" +msgstr "" + +msgid "Gi" +msgstr "" + +msgid "Ti" +msgstr "" + +msgid "Pi" +msgstr "" + +msgid "k" +msgstr "" + +msgid "M" +msgstr "" + +msgid "G" +msgstr "" + +msgid "T" +msgstr "" + +msgid "P" +msgstr "" + msgid "The username or password you entered is incorrect. Please try again." msgstr "您輸入的使用者名稱或密碼不正確。請重試。" diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 1fb3c9b..8eb6f08 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -150,9 +150,14 @@ wok.changetoProperUnit = function(numOrg, digits, base) { var fixed = settings['fixed']; var unitMapping = unitBaseMapping[base]; + var unitmap = { 'Ki': 'WOKFMT2001M', 'Mi': 'WOKFMT2002M', 'Gi': 'WOKFMT2003M', + 'Ti': 'WOKFMT2004M', 'Pi': 'WOKFMT2005M', 'k': 'WOKFMT2006M', + 'M': 'WOKFMT2007M', 'G': 'WOKFMT2008M', 'T': 'WOKFMT2009M', + 'P': 'WOKFMT2010M'} for(var i = unitMapping.length - 1; i >= 0; i--) { var mapping = unitMapping[i]; - var suffix = mapping['us']; + var s_key = mapping['us']; + var suffix = i18n[unitmap[s_key]]; var startingValue = mapping['v']; if(number < startingValue) { continue; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ca7ae4c..94e90ac 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,5 +49,16 @@ "WOKSETT0009M": "$_("Showing {{ctx.start}} to {{ctx.end}} of {{ctx.total}} entries")", "WOKSETT0010M": "$_("No results found!")", "WOKSETT0011M": "$_("Loading...")", - "WOKSETT0012M": "$_("Actions")" + "WOKSETT0012M": "$_("Actions")", + + "WOKFMT2001M": "$_("Ki")", + "WOKFMT2002M": "$_("Mi")", + "WOKFMT2003M": "$_("Gi")", + "WOKFMT2004M": "$_("Ti")", + "WOKFMT2005M": "$_("Pi")", + "WOKFMT2006M": "$_("k")", + "WOKFMT2007M": "$_("M")", + "WOKFMT2008M": "$_("G")", + "WOKFMT2009M": "$_("T")", + "WOKFMT2010M": "$_("P")" } -- 2.1.0

2 2

Re: [Kimchi-devel] [PATCH] [Wok] Externlise the size units such as Ki, Mi, Gi, etc.
by Aline Manera 08 Jun '16

08 Jun '16

OK. Thanks for the inputs, Archana and Pooja. On 06/01/2016 03:54 AM, Archana Singh wrote: > > > On 6/1/2016 7:07 AM, Aline Manera wrote: >> >> >> On 05/31/2016 10:34 PM, Aline Manera wrote: >>> >>> >>> On 05/31/2016 06:00 AM, Pooja Kulkarni wrote: >>>> Hi Aline, >>>> >>>> I do not have a good example for this, but I did come across >>>> something while searching around. >>>> French use Ko (kilo-octet) instead of Kb as a unit of size. So this >>>> leads me to believe there could be other such scenarios while >>>> dealing with different locales. >>>> >>> >>> Hi Pooja, >>> >>> I don't think Ko is the same of KB. From a quick search over the >>> internet I found Ko = 8KB. So it is wrong to 'translate' that as the >>> backend will send the data always in KB. >>> >> >> Maybe we need more references on that to decide on what to do. > Found some more references: wiki > https://fr.wikipedia.org/wiki/M%C3%A9ga it says: > "le mébioctet Mio (en anglais MiB, pour mébibyte) qui représente 1 024 > (210) kibioctets, soit 1 048 576 (220) octets" . > which when translated in English it is "Mio mébioctet (English MiB for > mebibyte ), which represents 1024 (210) kibibytes or 1 048 576 (220) > bytes". > > And also I have tried translation of English "Byte" to french which is > "octet". >> >>>> Thanks, >>>> Pooja >>>> >>>> On 05/30/2016 08:52 PM, Aline Manera wrote: >>>>> >>>>> Hi Pooja, >>>>> >>>>> Isn't KiB, MiB, GiB, ect international units for computing ? >>>>> Do you have any example on which language they are 'translated' to >>>>> a different unit name? >>>>> >>>>> Thanks, >>>>> Aline Manera >>>>> >>>>> On 05/25/2016 06:55 AM, pkulkark(a)linux.vnet.ibm.com wrote: >>>>>> From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >>>>>> >>>>>> This patch externalises the size >>>>>> units such as KiB, MiB, GiB, etc >>>>>> that are added in wok.formatMeasurement >>>>>> method, and also updates the .pot >>>>>> and *.po files. >>>>>> >>>>>> Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> >>>>>> --- >>>>>> po/de_DE.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/en_US.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/es_ES.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/fr_FR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/it_IT.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ja_JP.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ko_KR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/pt_BR.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/ru_RU.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/wok.pot | 32 +++++++++++++++++++++++++++++++- >>>>>> po/zh_CN.po | 32 +++++++++++++++++++++++++++++++- >>>>>> po/zh_TW.po | 32 +++++++++++++++++++++++++++++++- >>>>>> ui/js/src/wok.utils.js | 7 ++++++- >>>>>> ui/pages/i18n.json.tmpl | 13 ++++++++++++- >>>>>> 14 files changed, 390 insertions(+), 14 deletions(-) >>>>>> >>>>>> diff --git a/po/de_DE.po b/po/de_DE.po >>>>>> index 0fb869d..c2b9a0a 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> 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 " >>>>>> diff --git a/po/en_US.po b/po/en_US.po >>>>>> index 73d7056..b31785b 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -195,6 +195,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> >>>>>> diff --git a/po/es_ES.po b/po/es_ES.po >>>>>> index 8acb513..d77c60e 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> 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 " >>>>>> diff --git a/po/fr_FR.po b/po/fr_FR.po >>>>>> index 9cc473a..065113b 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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/" >>>>>> @@ -204,6 +204,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> 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. " >>>>>> diff --git a/po/it_IT.po b/po/it_IT.po >>>>>> index ef3729d..d871172 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -201,6 +201,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "Il nome utente o la password immessi non sono corretti. >>>>>> Ripetere " >>>>>> diff --git a/po/ja_JP.po b/po/ja_JP.po >>>>>> index dc8926f..cde5d87 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -199,6 +199,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "入力したユーザー名またはパスワードが誤っています。やり直し >>>>>> てください。" >>>>>> >>>>>> diff --git a/po/ko_KR.po b/po/ko_KR.po >>>>>> index 84b4750..2ef50fb 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -196,6 +196,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> "입력한 사용자 이름 또는 비밀번호가 올바르지 않습니다. 다시 시도하 >>>>>> 십시오." >>>>>> diff --git a/po/pt_BR.po b/po/pt_BR.po >>>>>> index a4ae451..75a6c9b 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\n" >>>>>> "PO-Revision-Date: 2015-03-23 12:57+0000\n" >>>>>> "Last-Translator: Crístian Deives dos Santos Viana >>>>>> <cristiandeives@gmail." >>>>>> "com>\n" >>>>>> @@ -217,6 +217,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> 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." >>>>>> diff --git a/po/ru_RU.po b/po/ru_RU.po >>>>>> index 0e81ba4..392be6d 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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/" >>>>>> @@ -197,6 +197,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "Указано неверное имя пользователя или пароль. Введите >>>>>> еще раз." >>>>>> >>>>>> diff --git a/po/wok.pot b/po/wok.pot >>>>>> index 01b8a28..231cd33 100755 >>>>>> --- a/po/wok.pot >>>>>> +++ b/po/wok.pot >>>>>> @@ -8,7 +8,7 @@ msgid "" >>>>>> msgstr "" >>>>>> "Project-Id-Version: PACKAGE VERSION\n" >>>>>> "Report-Msgid-Bugs-To: \n" >>>>>> -"POT-Creation-Date: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -195,6 +195,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "" >>>>>> >>>>>> diff --git a/po/zh_CN.po b/po/zh_CN.po >>>>>> index 0a66eec..5d81cc5 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -212,6 +212,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "用户名或密码错误，请重新输入。" >>>>>> >>>>>> diff --git a/po/zh_TW.po b/po/zh_TW.po >>>>>> index fd83384..ccd1d48 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: 2016-05-19 21:30+0530\n" >>>>>> +"POT-Creation-Date: 2016-05-25 15:08+0530\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" >>>>>> @@ -196,6 +196,36 @@ msgstr "" >>>>>> msgid "Actions" >>>>>> msgstr "" >>>>>> >>>>>> +msgid "Ki" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Mi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Gi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Ti" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "Pi" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "k" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "M" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "G" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "T" >>>>>> +msgstr "" >>>>>> + >>>>>> +msgid "P" >>>>>> +msgstr "" >>>>>> + >>>>>> msgid "The username or password you entered is incorrect. >>>>>> Please try again." >>>>>> msgstr "您輸入的使用者名稱或密碼不正確。請重試。" >>>>>> >>>>>> diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js >>>>>> index 1fb3c9b..8eb6f08 100644 >>>>>> --- a/ui/js/src/wok.utils.js >>>>>> +++ b/ui/js/src/wok.utils.js >>>>>> @@ -150,9 +150,14 @@ wok.changetoProperUnit = function(numOrg, >>>>>> digits, base) { >>>>>> var fixed = settings['fixed']; >>>>>> >>>>>> var unitMapping = unitBaseMapping[base]; >>>>>> + var unitmap = { 'Ki': 'WOKFMT2001M', 'Mi': >>>>>> 'WOKFMT2002M', 'Gi': 'WOKFMT2003M', >>>>>> + 'Ti': 'WOKFMT2004M', 'Pi': >>>>>> 'WOKFMT2005M', 'k': 'WOKFMT2006M', >>>>>> + 'M': 'WOKFMT2007M', 'G': 'WOKFMT2008M', >>>>>> 'T': 'WOKFMT2009M', >>>>>> + 'P': 'WOKFMT2010M'} >>>>>> for(var i = unitMapping.length - 1; i >= 0; i--) { >>>>>> var mapping = unitMapping[i]; >>>>>> - var suffix = mapping['us']; >>>>>> + var s_key = mapping['us']; >>>>>> + var suffix = i18n[unitmap[s_key]]; >>>>>> var startingValue = mapping['v']; >>>>>> if(number < startingValue) { >>>>>> continue; >>>>>> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl >>>>>> index ca7ae4c..94e90ac 100644 >>>>>> --- a/ui/pages/i18n.json.tmpl >>>>>> +++ b/ui/pages/i18n.json.tmpl >>>>>> @@ -49,5 +49,16 @@ >>>>>> "WOKSETT0009M": "$_("Showing {{ctx.start}} to {{ctx.end}} >>>>>> of {{ctx.total}} entries")", >>>>>> "WOKSETT0010M": "$_("No results found!")", >>>>>> "WOKSETT0011M": "$_("Loading...")", >>>>>> - "WOKSETT0012M": "$_("Actions")" >>>>>> + "WOKSETT0012M": "$_("Actions")", >>>>>> + >>>>>> + "WOKFMT2001M": "$_("Ki")", >>>>>> + "WOKFMT2002M": "$_("Mi")", >>>>>> + "WOKFMT2003M": "$_("Gi")", >>>>>> + "WOKFMT2004M": "$_("Ti")", >>>>>> + "WOKFMT2005M": "$_("Pi")", >>>>>> + "WOKFMT2006M": "$_("k")", >>>>>> + "WOKFMT2007M": "$_("M")", >>>>>> + "WOKFMT2008M": "$_("G")", >>>>>> + "WOKFMT2009M": "$_("T")", >>>>>> + "WOKFMT2010M": "$_("P")" >>>>>> } >>>>> >>>> >>> >>> _______________________________________________ >>> Kimchi-devel mailing list >>> Kimchi-devel(a)ovirt.org >>> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >> >> _______________________________________________ >> Kimchi-devel mailing list >> Kimchi-devel(a)ovirt.org >> http://lists.ovirt.org/mailman/listinfo/kimchi-devel >

1 0

[PATCH][Gingerbase] Do not use default value when declare a function
by Ramon Medeiros 08 Jun '16

08 Jun '16

For mutable object as a default parameter in function and method-declarations the problem is, that the evaluation and creation takes place at exactly the same moment. The python-parser reads the function-head and evaluates it at the same moment. Most beginers assume that a new object is created at every call, but that's not correct. One object (in your example a list) is created at the moment of declaration and not on demand when you are calling the method. For imutable objects that's not a problem, because even if all calls share the same object, it's imutable and therefore it's properties remain the same. As a convention, must be used the None object for defaults to indicate the use of a default initialization, which now can take place in the function-body, which naturally is evaluated at call-time. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- disks.py | 4 +++- model/packagesupdate.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/disks.py b/disks.py index 2883431..a1ba7c2 100644 --- a/disks.py +++ b/disks.py @@ -47,7 +47,9 @@ def _get_dev_node_path(maj_min): return "/dev/%s" % data["DEVNAME"] -def _get_lsblk_devs(keys, devs=[]): +def _get_lsblk_devs(keys, devs=None): + if devs is None: + devs = [] out, err, returncode = run_command( ["lsblk", "-Pbo"] + [','.join(keys)] + devs ) diff --git a/model/packagesupdate.py b/model/packagesupdate.py index 073667c..42011f7 100644 --- a/model/packagesupdate.py +++ b/model/packagesupdate.py @@ -56,11 +56,13 @@ class PackageUpdateModel(object): return self.host_swupdate.getUpdate(name) - def _resolve_dependencies(self, package=None, dep_list=[]): + def _resolve_dependencies(self, package=None, dep_list=None): """ Resolve the dependencies for a given package from the dictionary of eligible packages to be upgraded. """ + if dep_list is None: + dep_list = [] if package is None: return [] dep_list.append(package) -- 2.5.5

4 4

[PATCH] [Kimchi] Pass only those fields that have been modified in Edit Guest; Match maxmem to mem when guest is not running or paused
by Socorro Stoppler 08 Jun '16

08 Jun '16

v2: Made adjustments on how things were being done based on feedback. Also included the fix for github issue#: 941 - max memory should increase when mem is increased. v1: This patch fixes bugzilla#: 141686 -after memory hot plug seeing error 'KCHCPUHP0005E' This patch addresses the issue of what is being passed down to the backend when guest is modified. The issue was passing parameters that were not modified caused the backend to throw an error in the mem hotplug scenario. It now only passes down those parameters that have been modified regarding memory and cpu fields. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 159 ++++++++++++++++++++++++------------ ui/pages/guest-edit.html.tmpl | 2 +- 2 files changed, 108 insertions(+), 53 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 4cee8fe..fc67d82 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -668,10 +668,8 @@ kimchi.guest_edit_main = function() { guest['max-processor'] = guest.cpu_info['maxvcpus']; guest['icon'] = guest['icon'] || 'plugins/kimchi/images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); - $('#guest-edit-memory-textbox').val(parseInt(guest.memory.current)); $('#guest-edit-max-memory-textbox').val(parseInt(guest.memory.maxmemory)); - kimchi.thisVMState = guest['state']; refreshCDROMs(); $('#guest-edit-attach-cdrom-button').on('click', function(event) { @@ -706,6 +704,12 @@ kimchi.guest_edit_main = function() { $('#guest-show-max-processor i.fa').toggleClass('fa-plus-circle fa-minus-circle'); }); + if ((kimchi.thisVMState !== "running") && (kimchi.thisVMState !== "paused")) { + $("#guest-edit-memory-textbox").bind('keyup blur', function(e) { + $('#guest-edit-max-memory-textbox').val($(this).val()); + }); + } + var onAttached = function(params) { refreshCDROMs(); }; @@ -736,59 +740,110 @@ kimchi.guest_edit_main = function() { kimchi.retrieveVM(kimchi.selectedGuest, initContent); var generalSubmit = function(event) { - $(saveButton).prop('disabled', true); - var data = $('#form-guest-edit-general').serializeObject(); - if (data['memory'] !== undefined) { - data['memory'] = Number(data['memory']); - } - if (data['max-memory'] !== undefined) { - data['max-memory'] = Number(data['max-memory']); - } - - // Test memory values before submit. Avoid requests we know are going to fail - if (parseInt($('#guest-edit-memory-textbox').val()) > parseInt($('#guest-edit-max-memory-textbox').val())) { - wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); - $(saveButton).prop('disabled', false); - return; - } - - // Test CPU values before submit. Avoid requests we know are going to fail - if (parseInt($('#guest-edit-cores-textbox').val()) > parseInt($('#guest-edit-max-processor-textbox').val())) { - wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); - $(saveButton).prop('disabled', false); - return; - } - - if (data['vcpus'] !== undefined) { - var cpu = Number(data['vcpus']); - var maxCpu = Number(data['max-processor']); - if (data['max-processor'] !== undefined && data['max-processor'] !== "") { - if (maxCpu >= cpu || maxCpu < cpu ) { // if maxCpu < cpu, this will throw an error from backend - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: maxCpu - }; + kimchi.retrieveVM(kimchi.selectedGuest, function(org) { + $(saveButton).prop('disabled', true); + var data = $('#form-guest-edit-general').serializeObject(); + data['memory'] = {current: Number(data['memory-ui']), maxmemory: Number(data['max-memory'])}; + data['cpu_info'] = {maxvcpus: Number(data['max-processor']), vcpus: Number(data['vcpus']), topology: org['cpu_info']['topology']}; + var changedFields = {}; + for (var key in data) { + valueFromUI = data[key]; + if (valueFromUI instanceof Object) { + // Compare if Objects of original and data are identical + // Handle special case when key is memory and guest is running as valueFromUI will return a null for max mem + // since it is disabled; for cpu_info, when guest is running, just skip it since no processing is required + if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { + if (key === 'cpu_info') { + continue; + } + if (key === 'memory') { + // Replace valueFromUI of max mem with one from original as otherwise the value is undefined + data['memory']['maxmemory'] = org.memory.maxmemory; + } + } + // NOTE: Be aware of using this comparison as the order of the properties matter + if (JSON.stringify(valueFromUI) !== JSON.stringify(org[key])) { + changedFields[key] = valueFromUI; + } + } else { + if (org[key] !== undefined) { + if (data[key] != org[key]) { + changedFields[key] = valueFromUI; + } + } } - } else { - data['cpu_info'] = { - vcpus: cpu, - maxvcpus: cpu - }; } - delete data['vcpus']; - delete data['max-processor']; - } - - memory = {'current': data['memory'], 'maxmemory': data['max-memory']}; + var origMem = Number(org.memory.current); + var origMaxMem = Number(org.memory.maxmemory); + var origCpu = Number(org.cpu_info.vcpus); + var origMaxCpu = Number(org.cpu_info.maxvcpus); + var currentMem = data['memory-ui']; + var currentMaxMem = data['max-memory']; + var currentCpu = data['vcpus']; + var currentMaxCpu = data['max-processor']; + + if ('memory' in changedFields) { + if (currentMaxMem !== undefined) { + currentMaxMem = Number(currentMaxMem); + if (currentMaxMem === origMaxMem) { + delete changedFields.memory.maxmemory; + } + } else { + delete changedFields.memory.maxmemory; + } + if (currentMem !== undefined) { + currentMem = Number(currentMem); + if (kimchi.thisVMState === 'running' || kimchi.thisVMState === 'paused') { + // Compare to original max mem since current max mem is undefined in UI due to being disabled + if (currentMem > origMaxMem) { + wok.message.error(i18n['KCHVM0002E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } + } + if (currentMem === origMem) { + delete changedFields.memory.current; + } + } else { + delete changedFields.memory.current; + } + } + if ('cpu_info' in changedFields) { + if (currentMaxCpu !== undefined) { + currentMaxCpu = Number(currentMaxCpu); + if (currentMaxCpu === origMaxCpu) { + delete changedFields.cpu_info.maxvcpus; + } + } else { + delete changedFields.cpu_info.maxvcpus; + } + if (currentCpu !== undefined) { + currentCpu = Number(currentCpu); + if (currentMaxCpu !== undefined && currentCpu > currentMaxCpu) { + wok.message.error(i18n['KCHVM0003E'], '#alert-modal-container'); + $(saveButton).prop('disabled', false); + return; + } + if (currentCpu === origCpu) { + delete changedFields.cpu_info.vcpus; + } + if (currentMaxCpu === origMaxCpu) { + delete changedFields.cpu_info.maxvcpus; + } + } else { + delete changedFields.cpu_info.vcpus; + } + // Delete this as it is not applicable regardless + delete changedFields.cpu_info.topology; + } + kimchi.updateVM(kimchi.selectedGuest, changedFields, function() { + kimchi.listVmsAuto(); + wok.window.close(); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#alert-modal-container'); + $(saveButton).prop('disabled', false); + }); - data.memory = memory; - delete data['max-memory']; - kimchi.updateVM(kimchi.selectedGuest, data, function() { - kimchi.listVmsAuto(); - wok.window.close(); - }, function(err) { - wok.message.error(err.responseJSON.reason, '#alert-modal-container'); - $(saveButton).prop('disabled', false); }); }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 5b7155a..f18d42c 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -58,7 +58,7 @@ <div class="form-group"> <label for="guest-edit-memory-textbox">$_("Memory (MB)")</label> <div id="guest-memory"> - <input id="guest-edit-memory-textbox" class="form-control" name="memory" type="number" min="1024" step="1024" /> + <input id="guest-edit-memory-textbox" class="form-control" name="memory-ui" type="number" min="1024" step="1024" /> <button id="guest-show-max-memory" class="btn btn-primary" type="button"><i class="fa fa-plus-circle"></i> <span class="text">$_("More")</span></button> </div> </div> -- 2.5.0

2 2

[PATCH] [Kimchi] [PATCH] [Kimchi] Fixed Storage Volume upload error message when switching tabs
by sguimaraes943＠gmail.com 08 Jun '16

08 Jun '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch fixes a bug that would occur if the user starts uploading a volume and switches to a different tab or select a different Storage Pool and starts a new upload while the previous task is still in progress. It would return an error message as "KCHPOOL0002E: Storage pool undefined does not exist" and stop the upload progress but the upload task would keep returning "running" until Wok server is finished. This was happening because the global variabel kimchi.selectedSP was sent as an argument to the functions kimchi.createVolumeWithCapacity() and kimchi.uploadVolumeToSP(). The solution was creating a copy of the current kimchi.selectedSP value in each kimchi.sp_add_volume_main() function call. Samuel Guimarães (1): Fixed Storage Volume upload error message when switching tabs ui/js/src/kimchi.storagepool_add_volume_main.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 1.9.3

2 2

[PATCH][Kimchi] Do not use default value when declare a function
by Ramon Medeiros 08 Jun '16

08 Jun '16

For mutable object as a default parameter in function and method-declarations the problem is, that the evaluation and creation takes place at exactly the same moment. The python-parser reads the function-head and evaluates it at the same moment. Most beginers assume that a new object is created at every call, but that's not correct. One object (in your example a list) is created at the moment of declaration and not on demand when you are calling the method. For imutable objects that's not a problem, because even if all calls share the same object, it's imutable and therefore it's properties remain the same. As a convention, must be used the None object for defaults to indicate the use of a default initialization, which now can take place in the function-body, which naturally is evaluated at call-time. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- mockmodel.py | 5 ++++- model/networks.py | 5 ++++- model/templates.py | 5 ++++- model/vmsnapshots.py | 4 +++- network.py | 5 ++++- xmlutils/bootorder.py | 5 ++++- xmlutils/cpu.py | 4 +++- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/mockmodel.py b/mockmodel.py index 6c70472..9f9de52 100644 --- a/mockmodel.py +++ b/mockmodel.py @@ -714,7 +714,10 @@ class MockDevices(object): class MockVMSnapshot(object): - def __init__(self, name, params={}): + def __init__(self, name, params=None): + if params is None: + params = {} + self.name = name self.current = True diff --git a/model/networks.py b/model/networks.py index 3b2a9e2..4b722d3 100644 --- a/model/networks.py +++ b/model/networks.py @@ -123,7 +123,10 @@ class NetworksModel(object): names = conn.listNetworks() + conn.listDefinedNetworks() return sorted(map(lambda x: x.decode('utf-8'), names)) - def _get_available_address(self, addr_pools=[]): + def _get_available_address(self, addr_pools=None): + if addr_pools is None: + addr_pools = [] + invalid_addrs = [] for net_name in self.get_list(): network = NetworkModel.get_network(self.conn.get(), net_name) diff --git a/model/templates.py b/model/templates.py index 25bc017..a299c85 100644 --- a/model/templates.py +++ b/model/templates.py @@ -177,7 +177,10 @@ class TemplateModel(object): self.templates = TemplatesModel(**kargs) @staticmethod - def get_template(name, objstore, conn, overrides={}): + def get_template(name, objstore, conn, overrides=None): + if overrides is None: + overrides = {} + with objstore as session: params = session.get('template', name) if overrides and 'storagepool' in overrides: diff --git a/model/vmsnapshots.py b/model/vmsnapshots.py index fd17d2f..6f2483c 100644 --- a/model/vmsnapshots.py +++ b/model/vmsnapshots.py @@ -40,7 +40,7 @@ class VMSnapshotsModel(object): self.vmstorages = VMStoragesModel(**kargs) self.vmstorage = VMStorageModel(**kargs) - def create(self, vm_name, params={}): + def create(self, vm_name, params=None): """Create a snapshot with the current domain state. The VM must be stopped and contain only disks with format 'qcow2'; @@ -55,6 +55,8 @@ class VMSnapshotsModel(object): Return: A Task running the operation. """ + if params is None: + params = {} vir_dom = VMModel.get_vm(vm_name, self.conn) if DOM_STATE_MAP[vir_dom.info()[0]] != u'shutoff': raise InvalidOperation('KCHSNAP0001E', {'vm': vm_name}) diff --git a/network.py b/network.py index dd7b50f..ec567ca 100644 --- a/network.py +++ b/network.py @@ -52,7 +52,10 @@ def get_dev_netaddrs(): # used_nets should include all the subnet allocated in libvirt network # will get host network by get_dev_netaddrs -def get_one_free_network(used_nets, nets_pool=PrivateNets): +def get_one_free_network(used_nets, nets_pool=None): + if nets_pool is None: + nets_pool = PrivateNets + def _get_free_network(nets, used_nets): for net in nets.subnet(new_prefix=24): if not any(net.overlaps(used) for used in used_nets): diff --git a/xmlutils/bootorder.py b/xmlutils/bootorder.py index 28457e7..9e444bd 100644 --- a/xmlutils/bootorder.py +++ b/xmlutils/bootorder.py @@ -21,7 +21,7 @@ import lxml.etree as ET from lxml.builder import E -def get_bootorder_xml(boot_order=['hd', 'cdrom', 'network']): +def get_bootorder_xml(boot_order=None): """ Returns the XML for boot order. The default return includes the following: @@ -31,6 +31,9 @@ def get_bootorder_xml(boot_order=['hd', 'cdrom', 'network']): To a different boot order, specify the order by a list as argument. """ + if boot_order is None: + boot_order = ['hd', 'cdrom', 'network'] + boot_xml = '' for device in boot_order: boot = E.boot(dev=device) diff --git a/xmlutils/cpu.py b/xmlutils/cpu.py index 08a6afb..7548be2 100644 --- a/xmlutils/cpu.py +++ b/xmlutils/cpu.py @@ -45,7 +45,7 @@ def get_topology_xml(cpu_topo): return ET.tostring(xml) -def get_cpu_xml(cpus, memory, cpu_topo={}): +def get_cpu_xml(cpus, memory, cpu_topo=None): # Returns the libvirt CPU element based on given numa and topology # CPU element will always have numa element # <cpu> @@ -54,6 +54,8 @@ def get_cpu_xml(cpus, memory, cpu_topo={}): # </numa> # <topology sockets='1' cores='2' threads='1'/> # </cpu> + if cpu_topo is None: + cpu_topo = {} xml = E.cpu(ET.fromstring(get_numa_xml(cpus, memory))) if cpu_topo: xml.insert(0, ET.fromstring(get_topology_xml(cpu_topo))) -- 2.5.5

3 2

Re: [Kimchi-devel] Clean FEATURETEST_VM effectively.
by Aline Manera 07 Jun '16

07 Jun '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Substitute quotes by apostrophe in configuration file
by Aline Manera 07 Jun '16

07 Jun '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Wok 1/2] Include user IP address in request log messages
by Aline Manera 07 Jun '16

07 Jun '16

Hi Lucio, The patch looks good! But please, update API.md documentation and if possible, add/change test cases to confirm the API keeps working as expected. Thanks, Aline Manera On 06/03/2016 06:40 PM, Lucio Correia wrote: > * Allow advanced log searches by IP address > * Add RECORD_TEMPLATE_DICT to avoid versioning errors > with older log entries, which don't have IP address. > * Remove duplicated comment line > > Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> > --- > src/wok/control/base.py | 10 ++++++---- > src/wok/reqlogger.py | 17 ++++++++++++++--- > src/wok/root.py | 6 ++++-- > 3 files changed, 24 insertions(+), 9 deletions(-) > > diff --git a/src/wok/control/base.py b/src/wok/control/base.py > index 4b459ed..419179a 100644 > --- a/src/wok/control/base.py > +++ b/src/wok/control/base.py > @@ -146,7 +146,8 @@ class Resource(object): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(USER_NAME, 'N/A') > + user=cherrypy.session.get(USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > if destructive is False or \ > @@ -227,7 +228,8 @@ class Resource(object): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(USER_NAME, 'N/A') > + user=cherrypy.session.get(USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > return result > @@ -374,7 +376,6 @@ class Collection(object): > except Exception as e: > # In case of errors when fetching a resource info, pass and > # log the error, so, other resources are returned > - # log the error, so, other resources are returned. > # Encoding error message as ident is also encoded value. > # This has to be done to avoid unicode error, > # as combination of encoded and unicode value results into > @@ -455,7 +456,8 @@ class Collection(object): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(USER_NAME, 'N/A') > + user=cherrypy.session.get(USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > return result > diff --git a/src/wok/reqlogger.py b/src/wok/reqlogger.py > index bbd1bd0..2ec62b8 100644 > --- a/src/wok/reqlogger.py > +++ b/src/wok/reqlogger.py > @@ -34,10 +34,20 @@ from wok.utils import ascii_dict, remove_old_files > > > # Log search setup > -FILTER_FIELDS = ['app', 'date', 'download', 'req', 'user', 'time'] > +FILTER_FIELDS = ['app', 'date', 'download', 'ip', 'req', 'user', 'time'] > LOG_DOWNLOAD_URI = "/data/logs/%s" > LOG_DOWNLOAD_TIMEOUT = 6 > -LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(user)s: %(message)s\n" > +LOG_FORMAT = "[%(date)s %(time)s] %(req)-6s %(app)-11s %(ip)-15s %(user)s: " \ > + "%(message)s\n" > +RECORD_TEMPLATE_DICT = { > + 'date': '', > + 'time': '', > + 'req': '', > + 'app': '', > + 'ip': '', > + 'user': '', > + 'message': '', > +} > SECONDS_PER_HOUR = 360 > > # Log handler setup > @@ -86,7 +96,8 @@ class RequestParser(object): > > with fd: > for record in sortedList: > - asciiRecord = ascii_dict(record) > + asciiRecord = RECORD_TEMPLATE_DICT > + asciiRecord.update(ascii_dict(record)) > fd.write(LOG_FORMAT % asciiRecord) > > fd.close() > diff --git a/src/wok/root.py b/src/wok/root.py > index 29ea657..902e203 100644 > --- a/src/wok/root.py > +++ b/src/wok/root.py > @@ -172,7 +172,8 @@ class WokRoot(Root): > msg, > app=get_plugin_from_request(), > req=method, > - user=cherrypy.session.get(auth.USER_NAME, 'N/A') > + user=cherrypy.session.get(auth.USER_NAME, 'N/A'), > + ip=cherrypy.request.remote.ip > ).log() > > return json.dumps(user_info) > @@ -187,7 +188,8 @@ class WokRoot(Root): > msg, > app=get_plugin_from_request(), > req=method, > - user=params['username'] > + user=params['username'], > + ip=cherrypy.request.remote.ip > ).log() > > auth.logout()

1 0

[PATCH][Wok] Do not use default value when declare a function
by Ramon Medeiros 07 Jun '16

07 Jun '16

For mutable object as a default parameter in function and method-declarations the problem is, that the evaluation and creation takes place at exactly the same moment. The python-parser reads the function-head and evaluates it at the same moment. Most beginers assume that a new object is created at every call, but that's not correct. One object (in your example a list) is created at the moment of declaration and not on demand when you are calling the method. For imutable objects that's not a problem, because even if all calls share the same object, it's imutable and therefore it's properties remain the same. As a convention, must be used the None object for defaults to indicate the use of a default initialization, which now can take place in the function-body, which naturally is evaluated at call-time. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/exception.py | 4 +++- src/wok/message.py | 4 +++- src/wok/model/notifications.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/wok/exception.py b/src/wok/exception.py index 52f007e..90b6410 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -25,7 +25,9 @@ from wok.message import WokMessage class WokException(Exception): - def __init__(self, code='', args={}): + def __init__(self, code='', args=None): + if args is None: + args = {} self.code = code msg = WokMessage(code, args).get_text() cherrypy.log.error_log.error(msg) diff --git a/src/wok/message.py b/src/wok/message.py index a7162c7..4c35747 100644 --- a/src/wok/message.py +++ b/src/wok/message.py @@ -26,7 +26,9 @@ from wok.template import get_lang, validate_language class WokMessage(object): - def __init__(self, code='', args={}, plugin=None): + def __init__(self, code='', args=None, plugin=None): + if args is None: + args = {} # make all args unicode for key, value in args.iteritems(): if isinstance(value, unicode): diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py index e83ac56..bdb7c78 100644 --- a/src/wok/model/notifications.py +++ b/src/wok/model/notifications.py @@ -27,7 +27,9 @@ from wok.utils import wok_log notificationsStore = {} -def add_notification(code, args={}, plugin_name=None): +def add_notification(code, args=None, plugin_name=None): + if args is None: + args = {} if not code: wok_log.error("Unable to add notification: invalid code '%(code)s'" % {'code': str(code)}) -- 2.5.5

3 2

[PATCH] [Kimchi] Clean FEATURETEST_VM effectively.
by pvital＠linux.vnet.ibm.com 07 Jun '16

07 Jun '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> FEATURETEST_VM is defined at Kimchi start up to check if few QEMU and Libvirt features are enabled in the host system. Some bugs reported the existence of this VM running in the system, even after the Kimchi Feature Tests have completed. This patch adds a cleaning step before start the Kimchi Feature Tests. In addition, modified the has_mem_hotplug_support() to not use RollbackContext and guarantee that FEATURETEST_VM will be undefined. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- model/config.py | 3 +++ model/featuretests.py | 33 +++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/model/config.py b/model/config.py index fc4b285..78cdaeb 100644 --- a/model/config.py +++ b/model/config.py @@ -57,6 +57,9 @@ class CapabilitiesModel(object): self.mem_hotplug_support = False self.libvirtd_running = False + # make sure there're no Kimchi leftovers from previous executions + self._clean_leftovers() + # run feature tests self._set_capabilities() diff --git a/model/featuretests.py b/model/featuretests.py index 2b680c3..fca152d 100644 --- a/model/featuretests.py +++ b/model/featuretests.py @@ -24,7 +24,6 @@ import platform import subprocess from lxml.builder import E -from wok.rollbackcontext import RollbackContext from wok.utils import run_command, servermethod, wok_log @@ -220,22 +219,24 @@ class FeatureTests(object): # Libvirt < 1.2.14 does not support memory devices, so try to attach a # device. Then check if QEMU (>= 2.1) supports memory hotplug, starting # the guest These steps avoid errors with Libvirt 'test' driver for KVM - with RollbackContext() as rollback: + conn_type = conn.getType().lower() + domain_type = 'test' if conn_type == 'test' else 'kvm' + arch = 'i686' if conn_type == 'test' else platform.machine() + arch = 'ppc64' if arch == 'ppc64le' else arch + + dom = None + try: FeatureTests.disable_libvirt_error_logging() - rollback.prependDefer(FeatureTests.enable_libvirt_error_logging) - conn_type = conn.getType().lower() - domain_type = 'test' if conn_type == 'test' else 'kvm' - arch = 'i686' if conn_type == 'test' else platform.machine() - arch = 'ppc64' if arch == 'ppc64le' else arch dom = conn.defineXML(MAXMEM_VM_XML % {'name': FEATURETEST_VM_NAME, 'domain': domain_type, 'arch': arch}) - rollback.prependDefer(dom.undefine) - try: - dom.attachDeviceFlags(DEV_MEM_XML, - libvirt.VIR_DOMAIN_MEM_CONFIG) - dom.create() - rollback.prependDefer(dom.destroy) - return True - except libvirt.libvirtError: - return False + dom.attachDeviceFlags(DEV_MEM_XML, libvirt.VIR_DOMAIN_MEM_CONFIG) + dom.create() + except libvirt.libvirtError: + return False + finally: + if (dom and dom.isActive() == 1): + dom.destroy() + dom is None or dom.undefine() + FeatureTests.enable_libvirt_error_logging() + return True -- 2.5.5

2 1

[PATCH][Wok] Warn user when server is not reachable at login page
by Ramon Medeiros 07 Jun '16

07 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- ui/js/src/wok.login.js | 10 ++++++++-- ui/pages/login.html.tmpl | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index 7423f81..0b09508 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -74,8 +74,14 @@ wok.login_main = function() { } wok.cookie.set('roles',JSON.stringify(data.roles)); window.location.replace(window.location.pathname.replace(/\/+login.html/, '') + next_url); - }, function() { - $("#messUserPass").show(); + }, function(jqXHR, textStatus, errorThrown) { + if (jqXHR.responseText == "") { + $("#messUserPass").hide(); + $("#missServer").show(); + } else { + $("#missServer").hide(); + $("#messUserPass").show(); + } $("#messSession").hide(); $("#logging").hide(); $("#login").show(); diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 0357d64..d6daeb7 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -101,6 +101,7 @@ <div class="err-area"> <div id="messUserPass" class="alert alert-danger" style="display: none;">$_("The username or password you entered is incorrect. Please try again.")</div> <div id="messSession" class="alert alert-danger" style="display: none;">$_("Session timeout, please re-login.")</div> + <div id="missServer" class="alert alert-danger" style="display: none;">$_("Server unreachable")</div> </div> <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> -- 2.5.5

2 1

[PATCH][Kimchi 5/5] Add test to check bootorder
by Ramon Medeiros 07 Jun '16

07 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- tests/test_model.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_model.py b/tests/test_model.py index f4a145f..04c20df 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1125,6 +1125,11 @@ class ModelTests(unittest.TestCase): self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['users']) self.assertEquals([], inst.vm_lookup(u'пeω-∨м')['groups']) + # change bootorder + b_order = ["hd", "network", "cdrom"] + inst.vm_update(u'пeω-∨м', {"boot":{"order":b_order}}) + self.assertEquals(b_order, inst.vm_lookup(u'пeω-∨м')['boot']) + def test_get_interfaces(self): inst = model.Model('test:///default', objstore_loc=self.tmp_store) -- 2.5.5

2 1

Re: [Kimchi-devel] [PATCH][Kimchi 0/5] Make Kimchi able to change guest's boot order
by Ramon Medeiros 07 Jun '16

07 Jun '16

How to use: curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -k http://localhost:8010/plugins/kimchi/vms/fedora -X PUT -d '{"boot":{"order":["cdrom", "hd"]}}' Enter host password for user 'root': { "users":[], "screenshot":null, "persistent":true, "cpu_info":{ "maxvcpus":1, "vcpus":1, "topology":{} }, "groups":[], "graphics":{ "passwd":null, "passwdValidTo":null, "type":"vnc", "port":null, "listen":"127.0.0.1" }, "icon":"plugins/kimchi/images/icon-fedora.png", "stats":{ "cpu_utilization":0, "io_throughput":0, "io_throughput_peak":100, "net_throughput":0, "mem_utilization":0, "net_throughput_peak":100 }, "name":"fedora", "boot":[ "cdrom", "hd" ], "uuid":"98a82c16-c6ae-4253-b018-08ab3fde8f5e", "access":"full", "state":"shutoff", "memory":{ "current":1024, "maxmemory":1024 } } On 06/06/2016 06:13 PM, Ramon Medeiros wrote: > Ramon Medeiros (5): > Create method to change bootorder of a guest > Update documentation about bootorder on vm update > Update REST API > Add function to retrieve bootorder on vm lookup > Add test to check bootorder > > API.json | 12 ++++++++++++ > docs/API.md | 2 ++ > i18n.py | 2 ++ > model/vms.py | 41 +++++++++++++++++++++++++++++++++++++++-- > tests/test_model.py | 5 +++++ > 5 files changed, 60 insertions(+), 2 deletions(-) > -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH][Kimchi 4/5] Add function to retrieve bootorder on vm lookup
by Ramon Medeiros 06 Jun '16

06 Jun '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- model/vms.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index 854cd04..ad788bc 100644 --- a/model/vms.py +++ b/model/vms.py @@ -94,6 +94,7 @@ XPATH_DOMAIN_MEMORY_UNIT = '/domain/memory/@unit' XPATH_DOMAIN_UUID = '/domain/uuid' XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id' +XPATH_BOOT = 'os/boot/@dev' XPATH_CPU = './cpu' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' @@ -1250,6 +1251,9 @@ class VMModel(object): else: maxmemory = memory + # get boot order + boot = xpath_get_text(xml, XPATH_BOOT) + return {'name': name, 'state': state, 'stats': res, @@ -1267,7 +1271,8 @@ class VMModel(object): 'users': users, 'groups': groups, 'access': 'full', - 'persistent': True if dom.isPersistent() else False + 'persistent': True if dom.isPersistent() else False, + 'boot': boot } def _vm_get_disk_paths(self, dom): -- 2.5.5

1 0