Minor OpenStack plugin updates

[osm/MON.git] / plugins / OpenStack / Aodh / plugin_instance.py

diff --git a/plugins/OpenStack/Aodh/plugin_instance.py b/plugins/OpenStack/Aodh/plugin_instance.py
index 5b8bbd0..ade14f3 100644 (file)
--- a/plugins/OpenStack/Aodh/plugin_instance.py
+++ b/plugins/OpenStack/Aodh/plugin_instance.py
@@ -22,14 +22,8 @@
 """Aodh plugin for the OSM monitoring module."""
 
 import logging as log
-# import sys
-
-# path = "/opt/stack/MON"
-# if path not in sys.path:
-#    sys.path.append(path)
 
 from plugins.OpenStack.Aodh.alarming import Alarming
-from plugins.OpenStack.Aodh.notifier import Notifier
 from plugins.OpenStack.settings import Config
 
 __author__ = "Helena McGough"
@@ -39,24 +33,21 @@ def register_plugin():
     """Register the plugin."""
     # Initialize configuration and notifications
     config = Config.instance()
-    notifier = Notifier.instance()
 
     # Intialize plugin
-    instance = Plugin(config=config, notifier=notifier)
+    instance = Plugin(config=config)
     instance.config()
     instance.alarm()
-    instance.notify()
 
 
 class Plugin(object):
     """Aodh plugin for OSM MON."""
 
-    def __init__(self, config, notifier):
+    def __init__(self, config):
         """Plugin instance."""
         log.info("Initialze the plugin instance.")
         self._config = config
         self._alarming = Alarming()
-        self._notifier = notifier
 
     def config(self):
         """Configure plugin."""
@@ -68,11 +59,4 @@ class Plugin(object):
         log.info("Begin alarm functionality.")
         self._alarming.alarming()
 
-    def notify(self):
-        """Send notifications to the SO."""
-        # TODO(mcgoughh): Run simultaneously so that notifications
-        # can be sent while messages are being consumed
-        log.info("Sending Openstack notifications to the SO.")
-        self._notifier.notify(self._alarming)
-
 register_plugin()