- Kimchi-devel - oVirt List Archives

[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