Updated Openstack plugin logging and tests

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

diff --git a/plugins/OpenStack/common.py b/plugins/OpenStack/common.py
index 25cca45..c892a30 100644 (file)
--- a/plugins/OpenStack/common.py
+++ b/plugins/OpenStack/common.py
@@ -21,7 +21,8 @@
 ##
 """Common methods for the OpenStack plugins."""
 
-import logging as log
+import logging
+log = logging.getLogger(__name__)
 
 from keystoneclient.v3 import client
 
@@ -41,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
@@ -81,16 +82,11 @@ class Common(object):
         headers = {'X-Auth-Token': auth_token,
                    'Content-type': 'application/json'}
         # perform request and return its result
-        response = None
         try:
             if req_type == "put":
                 response = requests.put(
                     url, data=payload, headers=headers,
                     timeout=1)
-            elif req_type == "post":
-                response = requests.post(
-                    url, data=payload, headers=headers,
-                    timeout=1)
             elif req_type == "get":
                 response = requests.get(
                     url, params=params, headers=headers, timeout=1)
@@ -98,9 +94,14 @@ class Common(object):
                 response = requests.delete(
                     url, headers=headers, timeout=1)
             else:
-                log.warn("Invalid request type")
+                response = requests.post(
+                    url, data=payload, headers=headers,
+                    timeout=1)
 
         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