X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=plugins%2FOpenStack%2FAodh%2Fplugin_instance.py;h=b3a02acf1b82be079440a28a4f45e179d901f821;hb=refs%2Fchanges%2F78%2F5578%2F1;hp=5b8bbd000efdc79c4ae70ba3d6bb1e1abfc84c58;hpb=cda5f2f5df14f015829cd733d794223c0c370c41;p=osm%2FMON.git

diff --git a/plugins/OpenStack/Aodh/plugin_instance.py b/plugins/OpenStack/Aodh/plugin_instance.py
index 5b8bbd0..b3a02ac 100644
--- a/plugins/OpenStack/Aodh/plugin_instance.py
+++ b/plugins/OpenStack/Aodh/plugin_instance.py
@@ -21,15 +21,23 @@
 ##
 """Aodh plugin for the OSM monitoring module."""
 
-import logging as log
-# import sys
+import logging
+import sys
 
-# path = "/opt/stack/MON"
-# if path not in sys.path:
-#    sys.path.append(path)
+sys.path.append("MON/")
+
+logging.basicConfig(filename='aodh_MON.log', format='%(asctime)s %(message)s',
+                    datefmt='%m/%d/%Y %I:%M:%S %p', filemode='a',
+                    level=logging.INFO)
+log = logging.getLogger(__name__)
+
+
+try:
+    import aodhclient
+except ImportError:
+    log.warn("Failed to import the aodhclient")
 
 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 +47,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 +73,5 @@ 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()
+if aodhclient:
+    register_plugin()