June 2016 - Kimchi-devel - oVirt List Archives

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