Reviewed-by: Chandra Shekhar Reddy Potula <chandra@linux.vnet.ibm.com> Suggestion why plugin ginger has folder name as 'controls' and all other plugins have it as 'control'. I guess this should be corrected to have consistency going forward. On 24/01/16 7:33 PM, dhbarboza82@gmail.com wrote:
From: Daniel Henrique Barboza <dhbarboza82@gmail.com>
Recent WoK changes were made considering that all WoK plug-ins have the control modules in a dir named 'control', but Ginger, for historical/unknown reasons, uses the dir 'controls'. The result is that WoK became unable of loading Ginger. This patch amends it.
It is needed to change both 'controls' and 'models' Ginger dirs to 'control' and 'model' so Ginger can be compliant with the rest of WoK plug-ins. Until then, WoK will need to consider this awkward Ginger design when doing plug-in wide changes like the one made.
Signed-off-by: Daniel Henrique Barboza <dhbarboza82@gmail.com> --- src/wok/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/wok/server.py b/src/wok/server.py index 4fd380c..42a88f7 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -170,8 +170,13 @@ class Server(object):
# dynamically add tools.wokauth.on = True to extra plugin APIs try: - sub_nodes = import_class('plugins.%s.control.sub_nodes' % - plugin_name) + # FIXME when Ginger padronizes its dir names. + if plugin_name != 'ginger': + sub_nodes = import_class('plugins.%s.control.sub_nodes' % + plugin_name) + else: + sub_nodes = import_class('plugins.%s.controls.sub_nodes' % + plugin_name) except ImportError, e: cherrypy.log.error_log.error( "Failed to import subnodes for plugin %s, "