Updated logging for both OpenStack plugins

[osm/MON.git] / plugins / OpenStack / common.py

diff --git a/plugins/OpenStack/common.py b/plugins/OpenStack/common.py
index 68ce4e6..fe72acc 100644 (file)
--- a/plugins/OpenStack/common.py
+++ b/plugins/OpenStack/common.py
@@ -1,6 +1,28 @@
-"""Common methods for the Aodh Sender/Receiver."""
+# Copyright 2017 Intel Research and Development Ireland Limited
+# *************************************************************
 
-import logging as log
+# 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
+##
+"""Common methods for the OpenStack plugins."""
+
+import logging
+log = logging.getLogger(__name__)
 
 from keystoneclient.v3 import client
 
@@ -8,8 +30,7 @@ from plugins.OpenStack.settings import Config
 
 import requests
 
-# from keystoneauth1.identity.v3 import AuthMethod
-# from keystoneclient.service_catalog import ServiceCatalog
+__author__ = "Helena McGough"
 
 
 class Common(object):
@@ -21,7 +42,7 @@ class Common(object):
         self._endpoint = None
         self._ks = None
 
-    def _authenticate(self, tenant_id=None):
+    def _authenticate(self):
         """Authenticate and/or renew the authentication token."""
         if self._auth_token is not None:
             return self._auth_token
@@ -35,8 +56,8 @@ class Common(object):
             self._auth_token = self._ks.auth_token
         except Exception as exc:
 
-            log.warn("Authentication failed with the following exception: %s",
-                     exc)
+            log.warn("Authentication failed: %s", exc)
+
             self._auth_token = None
 
         return self._auth_token
@@ -49,7 +70,7 @@ class Common(object):
                 endpoint_type='internalURL',
                 region_name='RegionOne')
         except Exception as exc:
-            log.warning("Failed to retreive endpoint for Aodh due to: %s",
+            log.warning("Failed to retreive endpoint for service due to: %s",
                         exc)
         return None
 
@@ -82,5 +103,8 @@ class Common(object):
 
         except Exception as e:
             log.warn("Exception thrown on request", e)
+            if response is not None:
+                log.warn("Request resulted in %s code and %s response",
+                         response.status_code, response.text)
 
         return response