May 2016 - Kimchi-devel - oVirt List Archives

[PATCH] [Wok] Fix for filter break for numbers formatted for locale fr-FR
by pkulkark＠linux.vnet.ibm.com 14 Jun '16

14 Jun '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> This patch fixes the filter breaking issue on numbers formatted as per fr-FR locale, by replacing the non-breaking spaces introduced by the formatting, with breaking spaces. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/js/src/wok.utils.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 1fb3c9b..76477fd 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -263,7 +263,11 @@ wok.localeConverters = { }, "number-locale-converter":{ to: function(number){ - return wok.numberLocaleConverter(number, wok.lang.get_locale()); + if (number == null) { + return 'Unknown'; + } + format_value = wok.numberLocaleConverter(number, wok.lang.get_locale()); + return format_value.toString().replace(/\s/g,' '); //replace non-breaking space with breaking space } } } -- 2.1.0

4 3

[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

[PATCHv2] [Kimchi] Properly display network interfaces when more than one exists
by Socorro Stoppler 03 Jun '16

03 Jun '16

v2: Fix for showing all of the interface(s) when creating a network. v1: Display all of the interfaces when more than one exists when listing networks. Tooltip is shown when hovering over the interface to show all of the interfaces. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 8 ++++++-- ui/css/src/modules/_network.scss | 9 ++++++--- ui/js/src/kimchi.network.js | 4 +++- ui/js/src/kimchi.network_add_main.js | 2 +- ui/pages/tabs/network.html.tmpl | 4 ++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 49ea39a..72f340c 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2156,12 +2156,16 @@ body.wok-gallery { #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-interface, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-space, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-space { - width: 30%; + width: 25%; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-action, diff --git a/ui/css/src/modules/_network.scss b/ui/css/src/modules/_network.scss index 4627ab5..ab47c89 100644 --- a/ui/css/src/modules/_network.scss +++ b/ui/css/src/modules/_network.scss @@ -93,18 +93,21 @@ } > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } > span.column-space { - width: 30%; + width: 25%; } > span.column-action { width: 25.909%; text-align: right; } - } .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span { diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 381449d..ac6bf74 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -35,6 +35,7 @@ kimchi.initNetwork = function() { kimchi.initNetworkListView = function() { $('.wok-mask').removeClass('hidden'); kimchi.listNetworks(function(data) { + $('[data-toggle="tooltip"]').tooltip(); for (var i = 0; i < data.length; i++) { var network = { name : data[i].name, @@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() { } else { network.type = data[i].connection; } - network.interface = data[i].interfaces ? data[i].interfaces[0] : null; + network.interface = data[i].interfaces ? data[i].interfaces : null; + network.interface.join(); network.addrSpace = data[i].subnet ? data[i].subnet : null; network.persistent = data[i].persistent; kimchi.addNetworkItem(network); diff --git a/ui/js/src/kimchi.network_add_main.js b/ui/js/src/kimchi.network_add_main.js index 85df203..fd45f34 100644 --- a/ui/js/src/kimchi.network_add_main.js +++ b/ui/js/src/kimchi.network_add_main.js @@ -44,7 +44,7 @@ kimchi.startNetworkCreation = function() { kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down"; - network.interface = result.interfaces ? result.interfaces[0] : i18n["KCHNET6001M"]; + network.interface = result.interfaces ? result.interfaces : i18n["KCHNET6001M"]; network.addrSpace = result.subnet ? result.subnet : i18n["KCHNET6001M"]; network.persistent = result.persistent; $('#networkGrid').dataGrid('addRow', kimchi.addNetworkItem(network)); diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 6ddabaa..7e2825d 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -85,11 +85,11 @@ </div> <div id="modalWindow" class="modal fade network-modal" tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" aria-hidden="true"> </div> <script id="networkItem" type="text/html"> - <div id='{name}' class='wok-nw-grid-body remove-when-logged-off '> + <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> <span class='column-state' val="{state}"><span class='network-state {state}'><i class="fa fa-power-off"></i><span class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" val="{name}">{name}</span><span class='column-type' val="{type}">{type}</span><span class='column-interface' val="{interface}">{interface}</span><span class='column-interface' data-placement="top" data-toggle="tooltip" title="{interface}" val="{interface}">{interface}</span><span class='column-space' val="{addrSpace}">{addrSpace}</span><span class='column-action' style="display:none"> <span class="pull-right"> -- 2.5.0

2 1

[PATCH] [Kimchi] Properly display network interfaces when more than one exists
by Socorro Stoppler 03 Jun '16

03 Jun '16

This patch fixes a bug in the listing of networks in that only one network interface is being shown regardless of the number of interfaces that exist for that network. In addition to now displaying all of the interfaces, in the case that there's too many to fit in the column, an ellipsis has been added to indicate that there's more interfaces than what it being shown. A tooltip will be seen when the user hovers over the interface(s) to show all of the interfaces. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/css/kimchi.css | 8 ++++++-- ui/css/src/modules/_network.scss | 9 ++++++--- ui/js/src/kimchi.network.js | 4 +++- ui/pages/tabs/network.html.tmpl | 4 ++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css index 49ea39a..72f340c 100644 --- a/ui/css/kimchi.css +++ b/ui/css/kimchi.css @@ -2156,12 +2156,16 @@ body.wok-gallery { #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-interface, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-space, #network-root-container .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span.column-space { - width: 30%; + width: 25%; } #network-root-container .wok-datagrid > .wok-datagrid-header > span.column-action, diff --git a/ui/css/src/modules/_network.scss b/ui/css/src/modules/_network.scss index 4627ab5..ab47c89 100644 --- a/ui/css/src/modules/_network.scss +++ b/ui/css/src/modules/_network.scss @@ -93,18 +93,21 @@ } > span.column-interface { - width: 10.3896%; + width: 15.3896%; + padding-right: 40px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } > span.column-space { - width: 30%; + width: 25%; } > span.column-action { width: 25.909%; text-align: right; } - } .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span { diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 381449d..ac6bf74 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -35,6 +35,7 @@ kimchi.initNetwork = function() { kimchi.initNetworkListView = function() { $('.wok-mask').removeClass('hidden'); kimchi.listNetworks(function(data) { + $('[data-toggle="tooltip"]').tooltip(); for (var i = 0; i < data.length; i++) { var network = { name : data[i].name, @@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() { } else { network.type = data[i].connection; } - network.interface = data[i].interfaces ? data[i].interfaces[0] : null; + network.interface = data[i].interfaces ? data[i].interfaces : null; + network.interface.join(); network.addrSpace = data[i].subnet ? data[i].subnet : null; network.persistent = data[i].persistent; kimchi.addNetworkItem(network); diff --git a/ui/pages/tabs/network.html.tmpl b/ui/pages/tabs/network.html.tmpl index 6ddabaa..7e2825d 100644 --- a/ui/pages/tabs/network.html.tmpl +++ b/ui/pages/tabs/network.html.tmpl @@ -85,11 +85,11 @@ </div> <div id="modalWindow" class="modal fade network-modal" tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" aria-hidden="true"> </div> <script id="networkItem" type="text/html"> - <div id='{name}' class='wok-nw-grid-body remove-when-logged-off '> + <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> <span class='column-state' val="{state}"><span class='network-state {state}'><i class="fa fa-power-off"></i><span class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" val="{name}">{name}</span><span class='column-type' val="{type}">{type}</span><span class='column-interface' val="{interface}">{interface}</span><span class='column-interface' data-placement="top" data-toggle="tooltip" title="{interface}" val="{interface}">{interface}</span><span class='column-space' val="{addrSpace}">{addrSpace}</span><span class='column-action' style="display:none"> <span class="pull-right"> -- 2.5.0

2 2

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

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

01 Jun '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

[PATCH] [Kimchi] Add missing test dependency: bc
by Lucio Correia 31 May '16

31 May '16

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.9.1

2 1

[PATCH][Wok 5/5] Change plugins API documentation by pluginsmanager API
by Rodrigo Trujillo 31 May '16

31 May '16

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] diff --git a/docs/API/pluginsmanager.md b/docs/API/pluginsmanager.md new file mode 100644 index 0000000..23381d3 --- /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" + } +] + +### 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 disabled plugin. Also changes plugin's configuration file + +* disable: disable a enabled plugin. Also changes plugin's configuration file + +#### Examples +GET /pluginsmanager/sample +{ + "enabled":false, + "name":"sample" +} + +POST /pluginsmanager/sample/enable +{ + "enabled":true, + "name":"sample" +} -- 2.1.0

1 0

[PATCH][Wok 4/5] Implements control/model of new plugin API
by Rodrigo Trujillo 31 May '16

31 May '16

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 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) -- 2.1.0

1 0

[PATCH][Wok 3/5] Changes server behavior to use pluginsmanager
by Rodrigo Trujillo 31 May '16

31 May '16

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/server.py | 32 +++++++++++++++++--------------- src/wok/utils.py | 36 +++--------------------------------- 2 files changed, 20 insertions(+), 48 deletions(-) diff --git a/src/wok/server.py b/src/wok/server.py index 902d4bf..d9f6ec5 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -21,6 +21,7 @@ # import cherrypy +import copy import logging import logging.handlers import os @@ -30,14 +31,15 @@ from string import Template from wok import auth from wok import config from wok.config import config as configParser -from wok.config import paths, PluginConfig, WokConfig +from wok.config import paths, WokConfig from wok.control import sub_nodes from wok.model import model +from wok.pluginsmanager import Plugins from wok.proxy import start_proxy, terminate_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot from wok.safewatchedfilehandler import SafeWatchedFileHandler -from wok.utils import get_enabled_plugins, import_class +from wok.utils import import_class LOGGING_LEVEL = {"debug": logging.DEBUG, @@ -171,6 +173,9 @@ class Server(object): self.app = cherrypy.tree.mount(WokRoot(model_instance, dev_env), config=self.configObj) + + # Initiate and handles plugins + self.plugins = Plugins() self._load_plugins(options) # Terminate proxy when cherrypy server is terminated @@ -179,18 +184,15 @@ class Server(object): cherrypy.lib.sessions.init() def _load_plugins(self, options): - for plugin_name, plugin_config in get_enabled_plugins(): - try: - plugin_class = ('plugins.%s.%s' % - (plugin_name, - plugin_name[0].upper() + plugin_name[1:])) - script_name = plugin_config['wok']['uri'] - del plugin_config['wok'] - - plugin_config.update(PluginConfig(plugin_name)) - except KeyError: + plugins_info = self.plugins.get_all_plugins_info() + for plugin_name in plugins_info: + if not plugins_info[plugin_name]['enabled']: continue + plugin_class = plugins_info[plugin_name]['plugin_class'] + script_name = plugins_info[plugin_name]['uri'] + plugin_cfg = copy.deepcopy(plugins_info[plugin_name]['config']) + try: plugin_app = import_class(plugin_class)(options) except ImportError, e: @@ -203,7 +205,7 @@ class Server(object): # dynamically extend plugin config with custom data, if provided get_custom_conf = getattr(plugin_app, "get_custom_conf", None) if get_custom_conf is not None: - plugin_config.update(get_custom_conf()) + plugin_cfg.update(get_custom_conf()) # dynamically add tools.wokauth.on = True to extra plugin APIs try: @@ -216,7 +218,7 @@ class Server(object): ident = "/%s" % ident urlSubNodes[ident] = {'tools.wokauth.on': True} - plugin_config.update(urlSubNodes) + plugin_cfg.update(urlSubNodes) except ImportError, e: cherrypy.log.error_log.error( @@ -224,7 +226,7 @@ class Server(object): "error: %s" % (plugin_class, e.message) ) - cherrypy.tree.mount(plugin_app, script_name, plugin_config) + cherrypy.tree.mount(plugin_app, script_name, plugin_cfg) def start(self): # Subscribe to SignalHandler plugin diff --git a/src/wok/utils.py b/src/wok/utils.py index 9a29084..e46e234 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -35,14 +35,14 @@ import traceback import xml.etree.ElementTree as ET import locale -from cherrypy.lib.reprconf import Parser from datetime import datetime, timedelta from multiprocessing import Process, Queue from threading import Timer from wok.asynctask import AsyncTask -from wok.config import paths, PluginPaths +from wok.config import PluginPaths from wok.exception import InvalidParameter, TimeoutExpired +from wok.pluginsmanager import Plugins wok_log = cherrypy.log.error_log @@ -76,40 +76,10 @@ def is_digit(value): return False -def _load_plugin_conf(name): - plugin_conf = PluginPaths(name).conf_file - if not os.path.exists(plugin_conf): - cherrypy.log.error_log.error("Plugin configuration file %s" - " doesn't exist." % plugin_conf) - return - try: - return Parser().dict_from_file(plugin_conf) - except ValueError as e: - cherrypy.log.error_log.error("Failed to load plugin " - "conf from %s: %s" % - (plugin_conf, e.message)) - - -def get_enabled_plugins(): - plugin_dir = paths.plugins_dir - try: - dir_contents = os.listdir(plugin_dir) - except OSError: - return - for name in dir_contents: - if os.path.isdir(os.path.join(plugin_dir, name)): - plugin_config = _load_plugin_conf(name) - try: - if plugin_config['wok']['enable']: - yield (name, plugin_config) - except (TypeError, KeyError): - continue - - def get_all_tabs(): files = [] - for plugin, _ in get_enabled_plugins(): + for plugin in Plugins().get_enabled_plugins(): files.append(os.path.join(PluginPaths(plugin).ui_dir, 'config/tab-ext.xml')) -- 2.1.0

1 0

[PATCH][Wok 2/5] Creates pluginmanager.py module
by Rodrigo Trujillo 31 May '16

31 May '16

Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/pluginsmanager.py | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 src/wok/pluginsmanager.py diff --git a/src/wok/pluginsmanager.py b/src/wok/pluginsmanager.py new file mode 100644 index 0000000..b7bb92b --- /dev/null +++ b/src/wok/pluginsmanager.py @@ -0,0 +1,133 @@ +# +# Project Wok +# +# Copyright IBM Corp, 2016 +# +# Code derived from Project Kimchi +# +# 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 cherrypy +import copy +import os +from cherrypy.lib.reprconf import Parser +from configobj import ConfigObj + + +from basemodel import Singleton +from wok.config import paths, PluginConfig, PluginPaths +from wok.exception import OperationFailed + + +wok_log = cherrypy.log.error_log + + +class Plugins(): + __metaclass__ = Singleton + + def __init__(self): + # { '<PLUGIN_NAME>': { + # config: <PLUGIN_CONFIG>, + # enabled: <TRUE/FALSE>, + # uri: <PLUGIN_URI_FROM_CONFIG>, + # plugin_class: <PLUGIN_CLASS_FROM_CONFIG> + self._plugins_dict = {} + self._init_all_plugins() + + def _load_plugin_conf(self, name): + plugin_conf = PluginPaths(name).conf_file + ret = {} + if not os.path.exists(plugin_conf): + cherrypy.log.error_log.error("Plugin configuration file %s" + " doesn't exist." % plugin_conf) + else: + try: + ret = Parser().dict_from_file(plugin_conf) + except ValueError as e: + msg = "Failed to load plugin conf from %s: %s" + cherrypy.log.error_log.error(msg % (plugin_conf, e.message)) + ret.update(PluginConfig(name)) + return ret + + def _init_all_plugins(self): + plugin_dir = paths.plugins_dir + try: + dir_contents = os.listdir(plugin_dir) + except OSError: + return + for name in dir_contents: + if os.path.isdir(os.path.join(plugin_dir, name)): + wok_log.info("Loading plugin: %s" % name) + cfg = self._load_plugin_conf(name) + plugin_cls = cfg.get('wok', {}).get('plugin_class', '') + if plugin_cls == '': + plugin_cls = ('plugins.%s.%s' % (name, name[0].upper() + + name[1:])) + self._plugins_dict[name] = { + 'config': cfg, + 'enabled': cfg.get('wok', {}).get('enable', False), + 'uri': cfg.get('wok', {}).get('uri', ''), + 'plugin_class': plugin_cls, + 'conf_file': PluginPaths(name).conf_file + } + + if 'wok' in self._plugins_dict[name]['config']: + del self._plugins_dict[name]['config']['wok'] + + def get_all_plugins_info(self): + return copy.deepcopy(self._plugins_dict) + + def get_plugin_info(self, name): + return copy.deepcopy(self._plugins_dict.get(name, {})) + + def get_all_plugins_names(self): + ret = self._plugins_dict.keys() + ret.sort() + return ret + + def get_enabled_plugins(self): + ret = [plugin for plugin in self._plugins_dict.keys() if + self._plugins_dict[plugin]['enabled']] + ret.sort() + return ret + + def _enable_plugin_conf_file(self, f_conf, enable=True): + try: + # 'unrepr' makes ConfigObj read and write characters like ("'?) + conf = ConfigObj(infile=f_conf, unrepr=True) + conf['wok']['enable'] = enable + with open(f_conf, 'wb') as f: + conf.write(f) + except Exception as e: + wok_log.error('Error updating plugin conf file. ' + e.message) + raise + + def _change_plugin_state(self, name, enable=True): + plugin = self._plugins_dict[name] + if plugin['enabled'] == enable: + return + try: + self._enable_plugin_conf_file(plugin['conf_file'], enable) + except: + raise OperationFailed('WOKPLUG0002E', {'plugin': name}) + plugin['enabled'] = enable + + def enable_plugin(self, plugin): + self._change_plugin_state(plugin, True) + + def disable_plugin(self, plugin): + self._change_plugin_state(plugin, False) -- 2.1.0

1 0

[PATCH][Wok 1/5] Adapt Wok UI to new Plugins API returns
by Rodrigo Trujillo 31 May '16

31 May '16

This patch avoids error in UI due to changes in Plugins API. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/wok.api.js | 2 +- ui/js/src/wok.logos.js | 10 +++++++--- ui/js/src/wok.main.js | 8 ++++++-- ui/js/wok.user-log.js | 3 ++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ui/js/src/wok.api.js b/ui/js/src/wok.api.js index 5238594..5b7e09a 100644 --- a/ui/js/src/wok.api.js +++ b/ui/js/src/wok.api.js @@ -99,7 +99,7 @@ var wok = { listPlugins : function(suc, err, sync) { wok.requestJSON({ - url : 'plugins', + url : 'pluginsmanager', type : 'GET', contentType : 'application/json', dataType : 'json', diff --git a/ui/js/src/wok.logos.js b/ui/js/src/wok.logos.js index a825108..98dcf5c 100644 --- a/ui/js/src/wok.logos.js +++ b/ui/js/src/wok.logos.js @@ -78,18 +78,22 @@ wok.logos = function(element, powered) { wok.listPlugins(function(plugins) { if(plugins && plugins.length > 0) { $(plugins).each(function(i, p) { + if (p.enabled == false) { + // Skip + return true; + } var url = wok.substitute(pluginUrl, { - plugin: p + plugin: p.name }); obj[i] = { - name : p + name : p.name } var pluginVersions; pluginVersions = retrieveVersion(url); if(pluginVersions && pluginVersions.length > 0){ obj[i].version = pluginVersions; } - var imagepath = url+'/images/'+p; + var imagepath = url+'/images/'+p.name; if(checkImage(imagepath+'.svg') == 200) { obj[i].image = imagepath+'.svg'; } diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 2146b3d..fcb7d84 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -129,11 +129,15 @@ wok.main = function() { var wokTabs = retrieveTabs(wokConfigUrl); wok.listPlugins(function(plugins) { $(plugins).each(function(i, p) { + if (p.enabled == false) { + // Skip plugin + return true; + } var url = wok.substitute(pluginConfigUrl, { - plugin: p + plugin: p.name }); var i18nUrl = wok.substitute(pluginI18nUrl, { - plugin: p + plugin: p.name }); wok.getI18n(function(i18nObj){ $.extend(i18n, i18nObj)}, function(i18nObj){ //i18n is not define by plugin diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index e787ee6..2c58827 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -170,7 +170,8 @@ wok.initUserLogWindow = function() { var pluginsData = []; wok.listPlugins(function(pluginReturn) { $.each(pluginReturn, function(i, obj) { - pluginsData.push({"app": obj}); + if (obj.enabled == false) { return true; } + pluginsData.push({"app": obj.name}); }); pluginsData.unshift({"app": "wok"}); var pluginsTt = new Bloodhound({ -- 2.1.0

1 0

[PATCH][Wok 0/5] Basic support to enable/disable plugins
by Rodrigo Trujillo 31 May '16

31 May '16

V1: This is initial basic version of Plugins Manager. Features: - Improve plugins load and initialization; - New API to enable/disable a given plugin; - Update plugin configuration file; - Fix UI in order make Wok work as usual; ToDos (improvements): - Implement automated test cases; - Update (enable/disable) plugin in cherrypy (live); - Support to plugins dependencies; Rodrigo Trujillo (5): Adapt Wok UI to new Plugins API returns Creates pluginmanager.py module Changes server behavior to use pluginsmanager Implements control/model of new plugin API Change plugins API documentation by pluginsmanager API docs/API/plugins.md | 13 ----- docs/API/pluginsmanager.md | 61 +++++++++++++++++++++ src/wok/control/plugins.py | 19 ++++++- src/wok/i18n.py | 3 + src/wok/model/plugins.py | 30 ++++++++-- src/wok/pluginsmanager.py | 133 +++++++++++++++++++++++++++++++++++++++++++++ src/wok/server.py | 32 ++++++----- src/wok/utils.py | 36 +----------- ui/js/src/wok.api.js | 2 +- ui/js/src/wok.logos.js | 10 +++- ui/js/src/wok.main.js | 8 ++- ui/js/wok.user-log.js | 3 +- 12 files changed, 273 insertions(+), 77 deletions(-) delete mode 100644 docs/API/plugins.md create mode 100644 docs/API/pluginsmanager.md create mode 100644 src/wok/pluginsmanager.py -- 2.1.0

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 00/12] FVT testcases wok framework
by Lucio Correia 31 May '16

31 May '16

Reviewed-By: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> On 31-05-2016 03:53, Archana Singh wrote: > > > On 5/30/2016 11:08 PM, Lucio Correia wrote: >> I'm getting 0 tests ran in my F23 x86, is that correct? > Yes, as currently we do not have any fvt testcases added. It just a > framework. Once this framework in place, testcases can be added. >> >> $ make check-fvt >> ./run_tests.sh >> New python executable in /home/dev/wok/tests/fvt/venv/bin/python >> Installing setuptools, pip, wheel...done. >> Collecting jsonschema (from -r >> /home/dev/wok/tests/fvt/requirements.txt (line 22)) >> Downloading jsonschema-2.5.1-py2.py3-none-any.whl >> Collecting requests (from -r /home/dev/wok/tests/fvt/requirements.txt >> (line 23)) >> Downloading requests-2.10.0-py2.py3-none-any.whl (506kB) >> 100% |████████████████████████████████| 512kB 2.2MB/s >> Collecting functools32; python_version == "2.7" (from jsonschema->-r >> /home/dev/wok/tests/fvt/requirements.txt (line 22)) >> Downloading functools32-3.2.3-2.zip >> Building wheels for collected packages: functools32 >> Running setup.py bdist_wheel for functools32 ... done >> Stored in directory: >> /home/dev/.cache/pip/wheels/3c/d0/09/cd78d0ff4d6cfecfbd730782a7815a4571cd2cd4d2ed6e69d9 >> >> Successfully built functools32 >> Installing collected packages: functools32, jsonschema, requests >> Successfully installed functools32-3.2.3.post2 jsonschema-2.5.1 >> requests-2.10.0 >> >> ---------------------------------------------------------------------- >> Ran 0 tests in 0.000s >> >> OK >> rm -fr venv >> >> >> On 30-05-2016 04:10, archus(a)linux.vnet.ibm.com wrote: >>> From: Archana Singh <archus(a)linux.vnet.ibm.com> >>> >>> Patch for adding FVT testcases wok framework which can be used across >>> plugins. >>> The changes are: >>> 1) Added fvt package inside tests directory. >>> 2) Added config file inside fvt package to have session details. >>> 3) restapilib.py to have common classes/methods for REST API calls. >>> 4) fvt_base.py, a base test class to take care of doing >>> common setup and treadown required for any fvt test cases like >>> creating/destroying session using config file and restapilib.py. >>> 5) run_test.sh.in script to install all the dependencies and to run >>> all FVT. >>> 6) make file changes to have 'make check-fvt' for running all the FVT. >>> 7) Instruction added in REDME.md for make check-fvt. >>> 8) Added tests/fvt/config into IBM license blacklist. >>> >>> Archana Singh (12): >>> FVT: Package for functional verification testcases. >>> FVT: Wok level config file to have 'sectionsi required for fvt common >>> across plugins. >>> FVT: Lists all dependecies for fvt testcases. >>> FVT: Common classes/methods for API calls as per config file >>> configuration. >>> FVT: Base test class, takes care common actions required for any FVT >>> test cases. >>> FVT: Install all the dependencies from requirements.txt and runs FVT >>> testcases >>> FVT: Makefile needed for build and run fvt. >>> FVT: Added fvt as subdirs and check-fvt to run fvt testcases using >>> make. >>> FVT: Added FVT Makefile path in AC_CONFIG_FILES list. >>> FVT: Added check-fvt to run FVT testcases using make and venv dir to >>> be cleaned. >>> FVT: Added Readme instruction for running fvt testcases. >>> Added tests/fvt/config file into backlist. >>> >>> IBM-license-blacklist | 1 + >>> Makefile.am | 6 + >>> configure.ac | 1 + >>> docs/README.md | 8 + >>> tests/Makefile.am | 7 + >>> tests/fvt/Makefile.am | 43 +++ >>> tests/fvt/__init__.py | 18 ++ >>> tests/fvt/config | 7 + >>> tests/fvt/fvt_base.py | 92 ++++++ >>> tests/fvt/requirements.txt | 23 ++ >>> tests/fvt/restapilib.py | 738 >>> +++++++++++++++++++++++++++++++++++++++++++++ >>> tests/fvt/run_tests.sh.in | 92 ++++++ >>> 12 files changed, 1036 insertions(+) >>> create mode 100644 tests/fvt/Makefile.am >>> create mode 100644 tests/fvt/__init__.py >>> create mode 100644 tests/fvt/config >>> create mode 100644 tests/fvt/fvt_base.py >>> create mode 100644 tests/fvt/requirements.txt >>> create mode 100644 tests/fvt/restapilib.py >>> create mode 100755 tests/fvt/run_tests.sh.in >>> >> >> > -- Lucio Correia Software Engineer IBM LTC Brazil

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Properly display network interfaces when more than one exists
by Socorro Stoppler 31 May '16

31 May '16

Did you make sure and build the css? Thanks! On 05/30/2016 07:37 PM, Aline Manera wrote: > Hi Socorro, > > I tried again and I was not able to get the 'unavailable' on > interfaces neither. > But the interface list only display one interface right after the > network creation. Only when I switched tabs, I could see more > interfaces listed there. > > > > > On 05/27/2016 07:37 PM, Socorro Stoppler wrote: >> Hi Aline, >> >> I tried this w/a test env (i.e. --test) so I could have an interface >> and when I created a VEPA network, it showed the interface. What >> showed up as unavailable was the Address Space column. Would you >> mind sending me a picture? >> >> Thanks >> -Socorro >> >> On 05/27/2016 12:36 PM, Aline Manera wrote: >>> >>> Hi Socorro, >>> >>> 1. Once I create a VEPA or Passthrough Bridged network, the >>> interface column displays "unavailable". If I switch tabs and go >>> back to Network tab, the interface column displays the interface >>> values as proposed by this patch. >>> >>> 2. I'd suggest to rename the variable name to 'interfaces' just to >>> reflect that this field can list multiple values. >>> >>> Regards, >>> Aline Manera >>> >>> On 05/25/2016 03:03 PM, Socorro Stoppler wrote: >>>> This patch fixes a bug in the listing of networks in that only one >>>> network >>>> interface is being shown regardless of the number of interfaces >>>> that exist for >>>> that network. >>>> >>>> In addition to now displaying all of the interfaces, in the case >>>> that there's too many to fit in the column, an ellipsis has been >>>> added to indicate >>>> that there's more interfaces than what it being shown. A tooltip >>>> will be seen when >>>> the user hovers over the interface(s) to show all of the interfaces. >>>> >>>> >>>> Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> >>>> --- >>>> ui/css/kimchi.css | 8 ++++++-- >>>> ui/css/src/modules/_network.scss | 9 ++++++--- >>>> ui/js/src/kimchi.network.js | 4 +++- >>>> ui/pages/tabs/network.html.tmpl | 4 ++-- >>>> 4 files changed, 17 insertions(+), 8 deletions(-) >>>> >>>> diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css >>>> index 49ea39a..72f340c 100644 >>>> --- a/ui/css/kimchi.css >>>> +++ b/ui/css/kimchi.css >>>> @@ -2156,12 +2156,16 @@ body.wok-gallery { >>>> >>>> #network-root-container .wok-datagrid > .wok-datagrid-header > >>>> span.column-interface, >>>> #network-root-container .wok-datagrid > .wok-datagrid-body > >>>> .wok-datagrid-row > span.column-interface { >>>> - width: 10.3896%; >>>> + width: 15.3896%; >>>> + padding-right: 40px; >>>> + white-space: nowrap; >>>> + overflow: hidden; >>>> + text-overflow: ellipsis; >>>> } >>>> >>>> #network-root-container .wok-datagrid > .wok-datagrid-header > >>>> span.column-space, >>>> #network-root-container .wok-datagrid > .wok-datagrid-body > >>>> .wok-datagrid-row > span.column-space { >>>> - width: 30%; >>>> + width: 25%; >>>> } >>>> >>>> #network-root-container .wok-datagrid > .wok-datagrid-header > >>>> span.column-action, >>>> diff --git a/ui/css/src/modules/_network.scss >>>> b/ui/css/src/modules/_network.scss >>>> index 4627ab5..ab47c89 100644 >>>> --- a/ui/css/src/modules/_network.scss >>>> +++ b/ui/css/src/modules/_network.scss >>>> @@ -93,18 +93,21 @@ >>>> } >>>> >>>> > span.column-interface { >>>> - width: 10.3896%; >>>> + width: 15.3896%; >>>> + padding-right: 40px; >>>> + white-space: nowrap; >>>> + overflow: hidden; >>>> + text-overflow: ellipsis; >>>> } >>>> >>>> > span.column-space { >>>> - width: 30%; >>>> + width: 25%; >>>> } >>>> >>>> > span.column-action { >>>> width: 25.909%; >>>> text-align: right; >>>> } >>>> - >>>> } >>>> >>>> .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span { >>>> diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js >>>> index 381449d..ac6bf74 100644 >>>> --- a/ui/js/src/kimchi.network.js >>>> +++ b/ui/js/src/kimchi.network.js >>>> @@ -35,6 +35,7 @@ kimchi.initNetwork = function() { >>>> kimchi.initNetworkListView = function() { >>>> $('.wok-mask').removeClass('hidden'); >>>> kimchi.listNetworks(function(data) { >>>> + $('[data-toggle="tooltip"]').tooltip(); >>>> for (var i = 0; i < data.length; i++) { >>>> var network = { >>>> name : data[i].name, >>>> @@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() { >>>> } else { >>>> network.type = data[i].connection; >>>> } >>>> - network.interface = data[i].interfaces ? >>>> data[i].interfaces[0] : null; >>>> + network.interface = data[i].interfaces ? >>>> data[i].interfaces : null; >>>> + network.interface.join(); >>>> network.addrSpace = data[i].subnet ? data[i].subnet : >>>> null; >>>> network.persistent = data[i].persistent; >>>> kimchi.addNetworkItem(network); >>>> diff --git a/ui/pages/tabs/network.html.tmpl >>>> b/ui/pages/tabs/network.html.tmpl >>>> index 6ddabaa..7e2825d 100644 >>>> --- a/ui/pages/tabs/network.html.tmpl >>>> +++ b/ui/pages/tabs/network.html.tmpl >>>> @@ -85,11 +85,11 @@ >>>> </div> >>>> <div id="modalWindow" class="modal fade network-modal" >>>> tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" >>>> aria-hidden="true"> </div> >>>> <script id="networkItem" type="text/html"> >>>> - <div id='{name}' class='wok-nw-grid-body >>>> remove-when-logged-off '> >>>> + <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> >>>> <span class='column-state' val="{state}"><span >>>> class='network-state {state}'><i class="fa fa-power-off"></i><span >>>> class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" >>>> val="{name}">{name}</span><span class='column-type' >>>> val="{type}">{type}</span><span class='column-interface' >>>> val="{interface}">{interface}</span><span class='column-interface' >>>> data-placement="top" data-toggle="tooltip" title="{interface}" >>>> val="{interface}">{interface}</span><span class='column-space' >>>> val="{addrSpace}">{addrSpace}</span><span class='column-action' >>>> style="display:none"> >>>> <span class="pull-right"> >>> >> >

1 0

[PATCH v2][Wok] UI: Remove notification array and make notifications persistent
by Rodrigo Trujillo 31 May '16

31 May '16

There is an issue in frontend that does not allow notification messages to be showed more than once if the problem happens again. When user clicks on message close ("X") button, the notification message is only removed from backend, but not from the UI array. This patch changes functions to not use the array anymore, instead, it checks if the message is being displayed by its message string, then shows if necessary. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/wok.main.js | 1 - ui/js/src/wok.utils.js | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 2146b3d..cf5b6a2 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -19,7 +19,6 @@ */ wok.NOTIFICATION_INTERVAL = 5000 -wok.postedNotifications = [] wok.tabMode = {}; wok.config = undefined; diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index 1fb3c9b..1b585f1 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -209,12 +209,12 @@ wok.notificationsLoop = function notificationsLoop() { function(notifications){ if(notifications && notifications.length > 0) { $.each(notifications, function(i, notif) { - if (wok.postedNotifications.indexOf(notif.message) == -1) { + // Check if notification is being displayed + if (($("#alert-container").contents().find("div:contains('" + notif.message + "')").length) == 0) { wok.message.notify(notif, '#message-container-area'); - wok.postedNotifications.push(notif.message); } - }) - }; + }); + } setTimeout(notificationsLoop, wok.NOTIFICATION_INTERVAL); }, function(data){ -- 2.1.0

2 3

[PATCH V2][Wok] Issue #115: _get_resources wok_log.error result into unicode error.
by archus＠linux.vnet.ibm.com 31 May '16

31 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> As ident is in encoded value but e.message is in unicode value, combination of which result into unicode value having encoded ident value. So when wok_log.error try to encode(encoded value) it result into error. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- src/wok/control/base.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/wok/control/base.py b/src/wok/control/base.py index be5f618..4b459ed 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -35,7 +35,7 @@ from wok.exception import MissingParameter, NotFoundError from wok.exception import OperationFailed, UnauthorizedError, WokException from wok.message import WokMessage from wok.reqlogger import RequestRecord -from wok.utils import get_plugin_from_request, utf8_dict, wok_log +from wok.utils import get_plugin_from_request, utf8_dict, wok_log, encode_value # Default request log messages @@ -374,8 +374,14 @@ 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 + # unicode error. wok_log.error("Problem in lookup of resource '%s'. " - "Detail: %s" % (ident, e.message)) + "Detail: %s" % (ident, + encode_value(e.message))) continue res_list.append(res) return res_list -- 2.5.0

1 0

[PATCH V2][Wok 00/12] FVT testcases wok framework
by archus＠linux.vnet.ibm.com 31 May '16

31 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Patch for adding FVT testcases wok framework which can be used across plugins. The changes are: 1) Added fvt package inside tests directory. 2) Added config file inside fvt package to have session details. 3) restapilib.py to have common classes/methods for REST API calls. 4) fvt_base.py, a base test class to take care of doing common setup and treadown required for any fvt test cases like creating/destroying session using config file and restapilib.py. 5) run_test.sh.in script to install all the dependencies and to run all FVT. 6) make file changes to have 'make check-fvt' for running all the FVT. 7) Instruction added in REDME.md for make check-fvt. 8) Added tests/fvt/config into IBM license blacklist. Archana Singh (12): FVT: Package for functional verification testcases. FVT: Wok level config file to have 'sectionsi required for fvt common across plugins. FVT: Lists all dependecies for fvt testcases. FVT: Common classes/methods for API calls as per config file configuration. FVT: Base test class, takes care common actions required for any FVT test cases. FVT: Install all the dependencies from requirements.txt and runs FVT testcases FVT: Makefile needed for build and run fvt. FVT: Added fvt as subdirs and check-fvt to run fvt testcases using make. FVT: Added FVT Makefile path in AC_CONFIG_FILES list. FVT: Added check-fvt to run FVT testcases using make and venv dir to be cleaned. FVT: Added Readme instruction for running fvt testcases. Added tests/fvt/config file into backlist. IBM-license-blacklist | 1 + Makefile.am | 6 + configure.ac | 1 + docs/README.md | 8 + tests/Makefile.am | 7 + tests/fvt/Makefile.am | 43 +++ tests/fvt/__init__.py | 18 ++ tests/fvt/config | 7 + tests/fvt/fvt_base.py | 92 ++++++ tests/fvt/requirements.txt | 23 ++ tests/fvt/restapilib.py | 738 +++++++++++++++++++++++++++++++++++++++++++++ tests/fvt/run_tests.sh.in | 92 ++++++ 12 files changed, 1036 insertions(+) create mode 100644 tests/fvt/Makefile.am create mode 100644 tests/fvt/__init__.py create mode 100644 tests/fvt/config create mode 100644 tests/fvt/fvt_base.py create mode 100644 tests/fvt/requirements.txt create mode 100644 tests/fvt/restapilib.py create mode 100755 tests/fvt/run_tests.sh.in -- 2.5.0

3 2

[PATCH V2][Wok] Added extended locale list.
by archus＠linux.vnet.ibm.com 31 May '16

31 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 194 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 172 insertions(+), 22 deletions(-) diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 52b81fd..0357d64 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -138,28 +138,178 @@ <div class="form-group"> <label for="userLocale">$_("Locale")</label> <select id="userLocale" class="selectpicker col-md-12 col-lg-12"> - <option value="af-NA">Afrikaans (Namibia)</option> - <option value="ar-DZ">Arabic (Algeria)</option> - <option value="az-AZ">Azerbaijani (Azerbaijan)</option> - <option value="en-US">English (US)</option> - <option value="hy-AM">Armenian (Armenia)</option> - <option value="hi-IN">Hindi (India)</option> - <option value="nl-BE">Dutch (Belgium)</option> - <option value="ms-MY">Malay (Malaysia)</option> - <option value="no-NO">Norwegian (Norway)</option> - <option value="sq-AL">Albanian (Albania)</option> - <option value="sv-SE">Swedish (Sweden)</option> - <option value="uz-UZ">Uzbek (Uzbekistan)</option> - <option value="zh-CN">中文（简体）</option> - <option value="pt-BR">Português (Brasil)</option> - <option value="de-DE">Deutsch (Deutschland)</option> - <option value="es-ES">Español (España)</option> - <option value="fr-FR">Français (France)</option> - <option value="it-IT">Italiano (Italia)</option> - <option value="ja-JP">日本語 (日本)</option> - <option value="ko-KR">한국어 (대한민국)</option> - <option value="ru-RU">Русский (Россия)</option> - <option value="zh-TW">中文（繁體）</option> + <option value="af-ZA">Afrikaans (South Africa)</option> + <option value="sq-AL">Albanian (Albania)</option> + <option value="am-ET">Amharic (Ethiopia)</option> + <option value="ar-DZ">Arabic (Algeria)</option> + <option value="ar-BH">Arabic (Bahrain)</option> + <option value="ar-EG">Arabic (Egypt)</option> + <option value="ar-IQ">Arabic (Iraq)</option> + <option value="ar-JO">Arabic (Jordan)</option> + <option value="ar-KW">Arabic (Kuwait)</option> + <option value="ar-LB">Arabic (Lebanon)</option> + <option value="ar-LY">Arabic (Libya)</option> + <option value="ar-MR">Arabic (Mauritania)</option> + <option value="ar-MA">Arabic (Morocco)</option> + <option value="ar-OM">Arabic (Oman)</option> + <option value="ar-QA">Arabic (Qatar)</option> + <option value="ar-SA">Arabic (Saudi Arabia)</option> + <option value="ar-SY">Arabic (Syria)</option> + <option value="ar-TN">Arabic (Tunisia)</option> + <option value="ar-AE">Arabic (United Arab Emirates)</option> + <option value="ar-YE">Arabic (Yemen)</option> + <option value="hy-AM">Armenian (Armenia)</option> + <option value="as-IN">Assamese (India)</option> + <option value="az-AZ">Azerbaijani (Azerbaijan)</option> + <option value="eu-ES">Basque (Spain)</option> + <option value="be-BY">Belarusian (Belarus)</option> + <option value="bn-BD">Bengali (Bangladesh)</option> + <option value="bn-IN">Bengali (India)</option> + <option value="bs-BA">Bosnian (Bosnia)</option> + <option value="bg-BG">Bulgarian (Bulgaria)</option> + <option value="my-MM">Burmese (Myanmar)</option> + <option value="ca-ES">Catalan (Spain)</option> + <option value="zh-CN">Chinese-simplified (China)</option> + <option value="zh-SG">Chinese-simplified (Singapore)</option> + <option value="zh-HK">Chinese-traditional (Hong Kong S.A.R. of China)</option> + <option value="zh-MO">Chinese-traditional (Macao)</option> + <option value="zh-TW">Chinese-traditional (Taiwan)</option> + <option value="hr-HR">Croatian (Croatia)</option> + <option value="cs-CZ">Czech (Czech Republic)</option> + <option value="da-DK">Danish (Denmark)</option> + <option value="nl-BE">Dutch (Belgium)</option> + <option value="nl-NL">Dutch (The Netherlands)</option> + <option value="en-AU">English (Australia)</option> + <option value="en-BE">English (Belgium)</option> + <option value="en-CM">English (Cameroon)</option> + <option value="en-CA">English (Canada)</option> + <option value="en-GH">English (Ghana)</option> + <option value="en-HK">English (Hong Kong S.A.R. of China)</option> + <option value="en-IN">English (India)</option> + <option value="en-IE">English (Ireland)</option> + <option value="en-KE">English (Kenya)</option> + <option value="en-MU">English (Mauritius)</option> + <option value="en-NZ">English (New Zealand)</option> + <option value="en-NG">English (Nigeria)</option> + <option value="en-PH">English (Philippines)</option> + <option value="en-SG">English (Singapore)</option> + <option value="en-ZA">English (South Africa)</option> + <option value="en-TZ">English (Tanzania)</option> + <option value="en-GB">English (United Kingdom)</option> + <option value="en-US">English (United States)</option> + <option value="en-ZM">English (Zambia)</option> + <option value="et-EE">Estonian (Estonia)</option> + <option value="tl-PH">Filipino (Philippines)</option> + <option value="fi-FI">Finnish (Finland)</option> + <option value="fr-DZ">French (Algeria)</option> + <option value="fr-CM">French (Cameroon)</option> + <option value="fr-CD">French (Democratic Republic of the Congo)</option> + <option value="fr-BE">French (Belgium)</option> + <option value="fr-CA">French (Canada)</option> + <option value="fr-FR">French (France)</option> + <option value="fr-CI">French (Ivory Coast [Côte d’Ivoire])</option> + <option value="fr-LU">French (Luxembourg)</option> + <option value="fr-MR">French (Mauritania)</option> + <option value="fr-MU">French (Mauritius)</option> + <option value="fr-MA">French (Morocco)</option> + <option value="fr-SN">French (Senegal)</option> + <option value="fr-CH">French (Switzerland)</option> + <option value="fr-TN">French (Tunisia)</option> + <option value="gl-ES">Galician (Spain)</option> + <option value="lg-UG">Ganda (Uganda)</option> + <option value="ka-GE">Georgian (Georgia)</option> + <option value="de-AT">German (Austria)</option> + <option value="de-DE">German (Germany)</option> + <option value="de-LU">German (Luxembourg)</option> + <option value="de-CH">German (Switzerland)</option> + <option value="el-GR">Greek (Greece)</option> + <option value="gu-IN">Gujarati (India)</option> + <option value="ha-NG">Hausa (Nigeria)</option> + <option value="he-IL">Hebrew (Israel)</option> + <option value="hi-IN">Hindi (India)</option> + <option value="hu-HU">Hungarian (Hungary)</option> + <option value="is-IS">Icelandic (Iceland)</option> + <option value="ig-NG">Igbo (Nigeria)</option> + <option value="id-ID">Indonesian (Indonesia)</option> + <option value="it-IT">Italian (Italy)</option> + <option value="it-CH">Italian (Switzerland)</option> + <option value="ja-JP">Japanese (Japan)</option> + <option value="kn-IN">Kannada (India)</option> + <option value="kk-KZ">Kazakh (Kazakhstan)</option> + <option value="km-KH">Khmer (Cambodia)</option> + <option value="rw-RW">Kinyarwanda (Rwanda)</option> + <option value="kok-IN">Konkani (India)</option> + <option value="ko-KR">Korean (Korea, South)</option> + <option value="lo-LA">Lao (Laos)</option> + <option value="lv-LV">Latvian (Latvia)</option> + <option value="lt-LT">Lithuanian (Lithuania)</option> + <option value="mk-MK">Macedonian (Macedonia)</option> + <option value="ms-MY">Malay-Latin (Malaysia)</option> + <option value="ml-IN">Malayalam (India)</option> + <option value="mt-MT">Maltese (Malta)</option> + <option value="mr-IN">Marathi (India)</option> + <option value="mn-Cyrl-MN">Mongolian-Cyrillic (Mongolia)</option> + <option value="ne-IN">Nepali (India)</option> + <option value="ne-NP">Nepali (Nepal)</option> + <option value="nb-NO">Norwegian Bokmål (Norway)</option> + <option value="nn-NO">Norwegian Nynorsk (Norway)</option> + <option value="or-IN">Oriya [aka, Odia] (India)</option> + <option value="om-ET">Oromo (Ethiopia)</option> + <option value="pl-PL">Polish (Poland)</option> + <option value="pt-AO">Portuguese (Angola)</option> + <option value="pt-BR">Portuguese (Brazil)</option> + <option value="pt-MO">Portuguese (Macao)</option> + <option value="pt-MZ">Portuguese (Mozambique)</option> + <option value="pt-PT">Portuguese (Portugal)</option> + <option value="pa-IN">Punjabi (India)</option> + <option value="ro-RO">Romanian (Romania)</option> + <option value="ru-RU">Russian (Russia)</option> + <option value="sr-RS">Serbian-Cyrillic (Serbia)</option> + <option value="sr-ME">Serbian-Latin (Montenegro)</option> + <option value="sr-Latn-RS">Serbian-Latin (Serbia)</option> + <option value="si-LK">Sinhala (Sri Lanka)</option> + <option value="sk-SK">Slovak (Slovakia)</option> + <option value="sl-SI">Slovenian (Slovenia)</option> + <option value="es-AR">Spanish (Argentina)</option> + <option value="es-BO">Spanish (Bolivia)</option> + <option value="es-CL">Spanish (Chile)</option> + <option value="es-CO">Spanish (Colombia)</option> + <option value="es-CR">Spanish (Costa Rica)</option> + <option value="es-DO">Spanish (Dominican Republic)</option> + <option value="es-EC">Spanish (Ecuador)</option> + <option value="es-SV">Spanish (El Salvador)</option> + <option value="es-GT">Spanish (Guatemala)</option> + <option value="es-HN">Spanish (Honduras)</option> + <option value="es-MX">Spanish (Mexico)</option> + <option value="es-NI">Spanish (Nicaragua)</option> + <option value="es-PA">Spanish (Panama)</option> + <option value="es-PY">Spanish (Paraguay)</option> + <option value="es-PE">Spanish (Peru)</option> + <option value="es-PR">Spanish (Puerto Rico)</option> + <option value="es-ES">Spanish (Spain)</option> + <option value="es-US">Spanish (United States)</option> + <option value="es-UY">Spanish (Uruguay)</option> + <option value="es-VE">Spanish (Venezuela)</option> + <option value="sw-KE">Swahili (Kenya)</option> + <option value="sw-TZ">Swahili (Tanzania)</option> + <option value="sv-SE">Swedish (Sweden)</option> + <option value="ta-IN">Tamil (India)</option> + <option value="te-IN">Telugu (India)</option> + <option value="th-TH">Thai (Thailand)</option> + <option value="tr-TR">Turkish (Turkey)</option> + <option value="uk-UA">Ukrainian (Ukraine)</option> + <option value="ur-IN">Urdu (India)</option> + <option value="ur-PK">Urdu (Pakistan)</option> + <option value="uz-Cyrl-UZ">Uzbek-Cyrillic (Uzbekistan)</option> + <option value="uz-Latn-UZ">Uzbek-Latin (Uzbekistan)</option> + <option value="vi-VN">Vietnamese (Vietnam)</option> + <option value="cy-GB">Welsh (United Kingdom)</option> + <option value="yo-NG">Yoruba (Nigeria)</option> + <option value="zu-ZA">Zulu (South Africa)</option> + <option value="az-AZ">Azerbaijani-Latin (Azerbaijan)</option> + <option value="sr-CS">Serbian-Cyrillic ()</option> + <option value="sr-Cyrl-CS">Serbian-Cyrillic (Serbia and Montenegro)</option> + <option value="sr-Latn-CS">Serbian-Latin (Serbia and Montenegro)</option> </select> </div> </form> -- 2.5.0

1 0

Re: [Kimchi-devel] [PATCH] [Wok] Log error when using tee arg on run_command.
by Aline Manera 31 May '16

31 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH v5] [Kimchi] Storage Volume management
by sguimaraes943＠gmail.com 31 May '16

31 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds Storage Volume management functions Wipe, Clone, Resize and Delete with multiple selection. It also includes a filter input for each Storage Pool and Gallery View for Storage Volumes. v1: - HTML and CSS v2: - Delete and Wipe with multi-selection - Confirm messages with list of selected volumes when wiping or deleting volumes (requires SCSS/CSS patch sent to Wok) - Filter working - Removed "Add Volume" link from Storage Pool action button - Added "Add Volume" to Volume box action button v3: - Clone function working with multiple selection - Progress bar working for clone and create volume - Temporary volume added to the volumes when cloning - Seamless refresh on the volumes once each task is finished - Fixed issue when list wouldn't refresh when all volumes are removed from the storage pool. v4: - Prevent scroll when Drop-down in volumes list is clicked - Dropdown is not clipped from volumes list when there's only one or two items on the list - Added Media Queries for small screen resolutions v5: - Fixed black border in Firefox and IE when switching from List View to Gallery View - Allocation and % Used in the parent table are now updated when wiping/resizing/deleting/cloning volumes - Removed success messages / duplicated messages - Changed scrollbar position in Volumes area - When applying multiple actions, the checkbox is hidden/disabled and a spinner is shown while the the queue of selected items is being processed Samuel Guimarães (1): Storage Volume management model/storagevolumes.py | 2 +- ui/css/kimchi.css | 396 +++++++++++++++-- ui/css/src/modules/_storage.scss | 375 ++++++++++++++-- ui/js/src/kimchi.api.js | 50 +++ ui/js/src/kimchi.storage_main.js | 488 +++++++++++++++++---- ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +- ui/js/src/kimchi.storagepool_resize_volume_main.js | 59 +++ ui/pages/i18n.json.tmpl | 4 + ui/pages/storagepool-resize-volume.html.tmpl | 51 +++ ui/pages/tabs/storage.html.tmpl | 155 ++++--- 10 files changed, 1323 insertions(+), 259 deletions(-) create mode 100644 ui/js/src/kimchi.storagepool_resize_volume_main.js create mode 100644 ui/pages/storagepool-resize-volume.html.tmpl -- 1.9.3

2 2

Re: [Kimchi-devel] [PATCH] [Kimchi] Properly display network interfaces when more than one exists
by Socorro Stoppler 31 May '16

31 May '16

Hi Aline, I tried this w/a test env (i.e. --test) so I could have an interface and when I created a VEPA network, it showed the interface. What showed up as unavailable was the Address Space column. Would you mind sending me a picture? Thanks -Socorro On 05/27/2016 12:36 PM, Aline Manera wrote: > > Hi Socorro, > > 1. Once I create a VEPA or Passthrough Bridged network, the interface > column displays "unavailable". If I switch tabs and go back to Network > tab, the interface column displays the interface values as proposed by > this patch. > > 2. I'd suggest to rename the variable name to 'interfaces' just to > reflect that this field can list multiple values. > > Regards, > Aline Manera > > On 05/25/2016 03:03 PM, Socorro Stoppler wrote: >> This patch fixes a bug in the listing of networks in that only one >> network >> interface is being shown regardless of the number of interfaces that >> exist for >> that network. >> >> In addition to now displaying all of the interfaces, in the case >> that there's too many to fit in the column, an ellipsis has been >> added to indicate >> that there's more interfaces than what it being shown. A tooltip >> will be seen when >> the user hovers over the interface(s) to show all of the interfaces. >> >> >> Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> >> --- >> ui/css/kimchi.css | 8 ++++++-- >> ui/css/src/modules/_network.scss | 9 ++++++--- >> ui/js/src/kimchi.network.js | 4 +++- >> ui/pages/tabs/network.html.tmpl | 4 ++-- >> 4 files changed, 17 insertions(+), 8 deletions(-) >> >> diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css >> index 49ea39a..72f340c 100644 >> --- a/ui/css/kimchi.css >> +++ b/ui/css/kimchi.css >> @@ -2156,12 +2156,16 @@ body.wok-gallery { >> >> #network-root-container .wok-datagrid > .wok-datagrid-header > >> span.column-interface, >> #network-root-container .wok-datagrid > .wok-datagrid-body > >> .wok-datagrid-row > span.column-interface { >> - width: 10.3896%; >> + width: 15.3896%; >> + padding-right: 40px; >> + white-space: nowrap; >> + overflow: hidden; >> + text-overflow: ellipsis; >> } >> >> #network-root-container .wok-datagrid > .wok-datagrid-header > >> span.column-space, >> #network-root-container .wok-datagrid > .wok-datagrid-body > >> .wok-datagrid-row > span.column-space { >> - width: 30%; >> + width: 25%; >> } >> >> #network-root-container .wok-datagrid > .wok-datagrid-header > >> span.column-action, >> diff --git a/ui/css/src/modules/_network.scss >> b/ui/css/src/modules/_network.scss >> index 4627ab5..ab47c89 100644 >> --- a/ui/css/src/modules/_network.scss >> +++ b/ui/css/src/modules/_network.scss >> @@ -93,18 +93,21 @@ >> } >> >> > span.column-interface { >> - width: 10.3896%; >> + width: 15.3896%; >> + padding-right: 40px; >> + white-space: nowrap; >> + overflow: hidden; >> + text-overflow: ellipsis; >> } >> >> > span.column-space { >> - width: 30%; >> + width: 25%; >> } >> >> > span.column-action { >> width: 25.909%; >> text-align: right; >> } >> - >> } >> >> .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span { >> diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js >> index 381449d..ac6bf74 100644 >> --- a/ui/js/src/kimchi.network.js >> +++ b/ui/js/src/kimchi.network.js >> @@ -35,6 +35,7 @@ kimchi.initNetwork = function() { >> kimchi.initNetworkListView = function() { >> $('.wok-mask').removeClass('hidden'); >> kimchi.listNetworks(function(data) { >> + $('[data-toggle="tooltip"]').tooltip(); >> for (var i = 0; i < data.length; i++) { >> var network = { >> name : data[i].name, >> @@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() { >> } else { >> network.type = data[i].connection; >> } >> - network.interface = data[i].interfaces ? >> data[i].interfaces[0] : null; >> + network.interface = data[i].interfaces ? >> data[i].interfaces : null; >> + network.interface.join(); >> network.addrSpace = data[i].subnet ? data[i].subnet : >> null; >> network.persistent = data[i].persistent; >> kimchi.addNetworkItem(network); >> diff --git a/ui/pages/tabs/network.html.tmpl >> b/ui/pages/tabs/network.html.tmpl >> index 6ddabaa..7e2825d 100644 >> --- a/ui/pages/tabs/network.html.tmpl >> +++ b/ui/pages/tabs/network.html.tmpl >> @@ -85,11 +85,11 @@ >> </div> >> <div id="modalWindow" class="modal fade network-modal" >> tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" >> aria-hidden="true"> </div> >> <script id="networkItem" type="text/html"> >> - <div id='{name}' class='wok-nw-grid-body remove-when-logged-off '> >> + <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> >> <span class='column-state' val="{state}"><span >> class='network-state {state}'><i class="fa fa-power-off"></i><span >> class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" >> val="{name}">{name}</span><span class='column-type' >> val="{type}">{type}</span><span class='column-interface' >> val="{interface}">{interface}</span><span class='column-interface' >> data-placement="top" data-toggle="tooltip" title="{interface}" >> val="{interface}">{interface}</span><span class='column-space' >> val="{addrSpace}">{addrSpace}</span><span class='column-action' >> style="display:none"> >> <span class="pull-right"> >

2 1

[PATCH] [Wok] Log error when using tee arg on run_command.
by pvital＠linux.vnet.ibm.com 31 May '16

31 May '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Make the error, not only the output, of run_command execution be logged when using the tee argument. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/wok/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index b37518f..0ee4964 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -280,6 +280,8 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: wok_log.error(msg) + if tee is not None: + tee_log(msg, tee) elif error: wok_log.debug("error: %s returned from cmd: %s", error, ' '.join(cmd)) -- 2.5.5

1 0

Re: [Kimchi-devel] [PATCH v2] [Kimchi 0/2] Implement multi-function pci hotplug
by Aline Manera 31 May '16

31 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Always update snapshot XML with new name and UUID
by Aline Manera 30 May '16

30 May '16

Hi Lucio, I am getting the following errors while running the tests. Could you fix it and resend? I tested on Fedora 23. ***** Running unit test: test_model... FAILED ====================================================================== ERROR: test_vm_edit (test_model.ModelTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_model.py", line 1080, in test_vm_edit inst.vm_update('kimchi-vm1', params) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 290, in update vm_name, dom = self._static_vm_update(name, dom, params) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 816, in _static_vm_update self._redefine_snapshots(dom, snapshots_info) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 737, in _redefine_snapshots xml = xml_item_update(xml, XPATH_SNAP_VM_NAME, dom.name(), None) File "/home/alinefm/wok/src/wok/xmlutils/utils.py", line 52, in xml_item_update item.text = value File "lxml.etree.pyx", line 951, in lxml.etree._Element.text.__set__ (src/lxml/lxml.etree.c:46377) File "apihelpers.pxi", line 695, in lxml.etree._setNodeText (src/lxml/lxml.etree.c:20989) File "apihelpers.pxi", line 683, in lxml.etree._createTextNode (src/lxml/lxml.etree.c:20865) File "apihelpers.pxi", line 1393, in lxml.etree._utf8 (src/lxml/lxml.etree.c:27155) ValueError: All strings must be XML compatible: Unicode or ASCII, no NULL bytes or control characters ====================================================================== FAIL: test_vm_lifecycle (test_model.ModelTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_model.py", line 230, in test_vm_lifecycle self.assertEquals(result, [u'kimchi-vm', snap['name']]) AssertionError: Lists differ: ['kimchi-vm-new', u'mysnap'] != [u'kimchi-vm', u'mysnap'] First differing element 0: kimchi-vm-new kimchi-vm - ['kimchi-vm-new', u'mysnap'] ? ---- + [u'kimchi-vm', u'mysnap'] ? + ---------------------------------------------------------------------- Ran 25 tests in 96.215s FAILED (failures=1, errors=1, skipped=1) On 05/30/2016 05:32 PM, Lucio Correia wrote: > 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 5c1b4e6..f5fbd16 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 0