Added support for fetching list of install notification rule/delivery python plugins
@@ -33,6 +33,8 @@ class PluginDiscovery(object):
plugins_list_north = cls.fetch_plugins_installed("north", is_config)
plugins_list_south = cls.fetch_plugins_installed("south", is_config)
plugins_list_filter = cls.fetch_plugins_installed("filter", is_config)
+ plugins_list_notify = cls.fetch_plugins_installed("notificationDelivery", is_config)
+ plugins_list_rule = cls.fetch_plugins_installed("notificationRule", is_config)
plugins_list_c_north = cls.fetch_c_plugins_installed("north", is_config)
plugins_list_c_south = cls.fetch_c_plugins_installed("south", is_config)
plugins_list_c_filter = cls.fetch_c_plugins_installed("filter", is_config)
@@ -44,10 +46,10 @@ class PluginDiscovery(object):
plugins_list.extend(plugins_list_c_south)
plugins_list.extend(plugins_list_filter)
plugins_list.extend(plugins_list_c_filter)
+ plugins_list.extend(plugins_list_notify)
plugins_list.extend(plugins_list_c_notify)
+ plugins_list.extend(plugins_list_rule)
plugins_list.extend(plugins_list_c_rule)
- elif plugin_type in ['notificationDelivery', 'notificationRule']:
- plugins_list = cls.fetch_c_plugins_installed(plugin_type, is_config)
else:
plugins_list = cls.fetch_plugins_installed(plugin_type, is_config)
plugins_list.extend(cls.fetch_c_plugins_installed(plugin_type, is_config))
@@ -56,6 +58,8 @@ class PluginDiscovery(object):
@classmethod
def fetch_plugins_installed(cls, plugin_type, is_config):
directories = cls.get_plugin_folders(plugin_type)
+ if directories is None:
+ directories = []
configs = []
for d in directories:
plugin_config = cls.get_plugin_config(d, plugin_type, is_config)
