X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=plugins%2FOpenStack%2FAodh%2Fplugin_instance.py;h=aaba1e46199684d2ddc6857b964527ac45b319ef;hb=1e3d6ce4b8e9e6b0962f8c9ea939ef23e6a45b49;hp=8096f3fef52533d131aa3b71a9108bcb6af3d99b;hpb=f358b4fdd006b427e5b653d467c29ae37a47406e;p=osm%2FMON.git

diff --git a/plugins/OpenStack/Aodh/plugin_instance.py b/plugins/OpenStack/Aodh/plugin_instance.py
index 8096f3f..aaba1e4 100644
--- a/plugins/OpenStack/Aodh/plugin_instance.py
+++ b/plugins/OpenStack/Aodh/plugin_instance.py
@@ -1,19 +1,51 @@
+# Copyright 2017 Intel Research and Development Ireland Limited
+# *************************************************************
+
+# This file is part of OSM Monitoring module
+# All Rights Reserved to Intel Corporation
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+
+#         http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact: helena.mcgough@intel.com or adrian.hoban@intel.com
+##
 """Aodh plugin for the OSM monitoring module."""
 
-import sys
 import logging
 
-path = "/home/stack/MON"
-if path not in sys.path:
-    sys.path.append(path)
+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__)
 
-from plugins.Openstack.Aodh.alarming import Alarming
-from plugins.Openstack.settings import Config
+
+try:
+    import aodhclient
+except ImportError:
+    log.warn("Failed to import the aodhclient")
+
+from plugins.OpenStack.Aodh.alarming import Alarming
+from plugins.OpenStack.settings import Config
+
+__author__ = "Helena McGough"
 
 
 def register_plugin():
     """Register the plugin."""
+    # Initialize configuration and notifications
     config = Config.instance()
+
+    # Intialize plugin
     instance = Plugin(config=config)
     instance.config()
     instance.alarm()
@@ -24,15 +56,19 @@ class Plugin(object):
 
     def __init__(self, config):
         """Plugin instance."""
+        log.info("Initialze the plugin instance.")
         self._config = config
-        self._alarm = Alarming()
+        self._alarming = Alarming()
 
     def config(self):
         """Configure plugin."""
-        self._config.read_environ()
+        log.info("Configure the plugin instance.")
+        self._config.read_environ("aodh")
 
     def alarm(self):
         """Allow alarm info to be received from Aodh."""
-        self._alarm.alarming()
+        log.info("Begin alarm functionality.")
+        self._alarming.alarming()
 
-register_plugin()
+if aodhclient:
+    register_plugin()