June 2016 - Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] [PATCH][Wok 4/5] Implements control/model of new plugin API
by Aline Manera 01 Jun '16

01 Jun '16

On 05/31/2016 02:51 PM, Rodrigo Trujillo wrote: > Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> > --- > src/wok/control/plugins.py | 19 ++++++++++++++++--- > src/wok/i18n.py | 3 +++ > src/wok/model/plugins.py | 30 ++++++++++++++++++++++++------ > 3 files changed, 43 insertions(+), 9 deletions(-) > > diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py > index 57dfa1b..c7c9554 100644 > --- a/src/wok/control/plugins.py > +++ b/src/wok/control/plugins.py > @@ -19,11 +19,24 @@ > # 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 > from wok.control.utils import UrlSubNode > > > -@UrlSubNode("plugins") > -class Plugins(SimpleCollection): > +@UrlSubNode("pluginsmanager") > +class Plugins(Collection): > def __init__(self, model): > super(Plugins, self).__init__(model) > + self.resource = Plugin > + > + > +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') > + > + @property > + def data(self): > + return self.info Please, set admin_methods to avoid any user be able to change the plugin settings. And also update test_authorization.py tests to cover that. > 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..1842dbc 100644 > --- a/src/wok/model/plugins.py > +++ b/src/wok/model/plugins.py > @@ -19,9 +19,9 @@ > # 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 PluginsModel(object): > @@ -29,7 +29,25 @@ 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): > + print "Enabling %s" % plugin_name > + Plugins().enable_plugin(plugin_name) > + > + def disable(self, plugin_name): > + print "Disabling %s" % plugin_name > + Plugins().disable_plugin(plugin_name) Please, use wok_log instead of print

2 1

[PATCH] [Kimchi 2/2] Update tests to reflect new behavior
by Lucio Correia 01 Jun '16

01 Jun '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- tests/test_model.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f4a145f..a0fe36f 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -227,14 +227,17 @@ class ModelTests(unittest.TestCase): # snapshot revert to the first created vm result = inst.vmsnapshot_revert(u'kimchi-vm-new', params['name']) - self.assertEquals(result, [u'kimchi-vm', snap['name']]) + self.assertEquals(result, [u'kimchi-vm-new', snap['name']]) - vm = inst.vm_lookup(u'kimchi-vm') + vm = inst.vm_lookup(u'kimchi-vm-new') self.assertEquals(vm['state'], snap['state']) - current_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm') + current_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm-new') self.assertEquals(params['name'], current_snap['name']) + # rename vm back + inst.vm_update('kimchi-vm-new', {'name': u'kimchi-vm'}) + self.assertRaises(NotFoundError, inst.vmsnapshot_delete, u'kimchi-vm', u'foobar') -- 1.9.1

1 0

[PATCH] [Kimchi 1/2] Always update snapshot XML with new name and UUID
by Lucio Correia 01 Jun '16

01 Jun '16

When a guest with snapshots is renamed, and afterwards guest is reverted to a snapshot created before the name change, the guest is also renamed back. This patch fixes this issue by updating snapshot XML when guest is renamed. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- model/vms.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/model/vms.py b/model/vms.py index b0b4eb2..3b09909 100644 --- a/model/vms.py +++ b/model/vms.py @@ -97,6 +97,8 @@ XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id' XPATH_CPU = './cpu' XPATH_NAME = './name' XPATH_NUMA_CELL = './cpu/numa/cell' +XPATH_SNAP_VM_NAME = './domain/name' +XPATH_SNAP_VM_UUID = './domain/uuid' XPATH_TOPOLOGY = './cpu/topology' XPATH_VCPU = './vcpu' XPATH_MAX_MEMORY = './maxMemory' @@ -728,7 +730,15 @@ class VMModel(object): if info['current']: flags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT - dom.snapshotCreateXML(info['xml'], flags) + # Snapshot XML contains the VM xml from the time it was created. + # Thus VM name and uuid must be updated to current ones. Otherwise, + # when reverted, the vm name will be inconsistent. + xml = info['xml'] + xml = xml_item_update(xml, XPATH_SNAP_VM_NAME, dom.name(), None) + xml = xml_item_update(xml, XPATH_SNAP_VM_UUID, dom.UUIDString(), + None) + + dom.snapshotCreateXML(xml, flags) def _update_metadata_name(self, dom, nonascii_name): if nonascii_name is not None: -- 1.9.1

1 0

[PATCH V2] [Kimchi 0/2] Fix VM name conflicts with snapshot reverts
by Lucio Correia 01 Jun '16

01 Jun '16

Changes in V2: * Fix tests Lucio Correia (2): Always update snapshot XML with new name and UUID Update tests to reflect new behavior model/vms.py | 12 +++++++++++- tests/test_model.py | 9 ++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) -- 1.9.1

1 0

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

01 Jun '16

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. 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")" >> } >

3 3

Re: [Kimchi-devel] Add missing test dependency: bc
by Aline Manera 31 May '16

31 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Add missing test dependency: bc
by Aline Manera 31 May '16

31 May '16

Hi Lucio, Don't we need to properly add this new dependency to control.in file to avoid issues while installing the .deb package? On 05/31/2016 01:44 PM, Lucio Correia wrote: > Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> > --- > docs/ubuntu-deps.md | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/ubuntu-deps.md b/docs/ubuntu-deps.md > index e21f6a8..b0b1562 100644 > --- a/docs/ubuntu-deps.md > +++ b/docs/ubuntu-deps.md > @@ -31,4 +31,4 @@ Packages required for UI development > Packages required for tests > --------------------------- > > - $ sudo apt-get install pep8 pyflakes python-requests python-mock > + $ sudo apt-get install pep8 pyflakes python-requests python-mock bc

1 1

[PATCH] [Kimchi] Use Wok session timeout value to configure serial console
by Aline Manera 31 May '16

31 May '16

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- kimchi.conf | 3 --- serialconsole.py | 10 ++++++---- tests/test_config.py.in | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kimchi.conf b/kimchi.conf index c451703..239b0b4 100644 --- a/kimchi.conf +++ b/kimchi.conf @@ -10,8 +10,5 @@ uri = "/plugins/kimchi" # in the same network. Check README-federation for more details. federation = False -# Serial console timeout (seconds) -SERIAL_CONSOLE_TIMEOUT = 120 - # Automatically create ISO pool on server start up create_iso_pool = True diff --git a/serialconsole.py b/serialconsole.py index d290798..13ef331 100644 --- a/serialconsole.py +++ b/serialconsole.py @@ -27,10 +27,11 @@ import time from multiprocessing import Process -from wok.plugins.kimchi import model -from wok.plugins.kimchi.config import config +from wok.config import config as wok_config from wok.utils import wok_log +from wok.plugins.kimchi import model + SOCKET_QUEUE_BACKLOG = 0 CTRL_Q = '\x11' @@ -207,8 +208,9 @@ class SocketServer(Process): client console. """ client, client_addr = self._socket.accept() - client.settimeout(config.get('kimchi', {}). - get('SERIAL_CONSOLE_TIMEOUT', 120)) + + session_timeout = wok_config.get('server', 'session_timeout') + client.settimeout(int(session_timeout) * 60) wok_log.info('[%s] Client connected to %s', self.name, self._guest_name) diff --git a/tests/test_config.py.in b/tests/test_config.py.in index 48abd5b..a6728e8 100644 --- a/tests/test_config.py.in +++ b/tests/test_config.py.in @@ -82,7 +82,6 @@ class ConfigTests(unittest.TestCase): 'kimchi': { 'federation': False, 'create_iso_pool': True, - 'SERIAL_CONSOLE_TIMEOUT': 120 }, '/': { 'tools.trailing_slash.on': False, -- 2.5.5

2 4

Re: [Kimchi-devel] [PATCH V2][Wok] Added extended locale list.
by Aline Manera 31 May '16

31 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH V2][Wok] Issue #115: _get_resources wok_log.error result into unicode error.
by Aline Manera 31 May '16

31 May '16

Applied. Thanks. Regards, Aline Manera

1 0