Region Name and endpoint type as parameters

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

diff --git a/osm_mon/plugins/OpenStack/common.py b/osm_mon/plugins/OpenStack/common.py
index 0c5e7c6..2540a3f 100644 (file)
--- a/osm_mon/plugins/OpenStack/common.py
+++ b/osm_mon/plugins/OpenStack/common.py
@@ -62,8 +62,8 @@ class Common(object):
                            tenant_name=creds.tenant_name)
         return ks.service_catalog.url_for(
             service_type=service_type,
-            endpoint_type='publicURL',
-            region_name='RegionOne')
+            endpoint_type=creds.endpoint_type,
+            region_name=creds.region_name)
 
     @staticmethod
     def perform_request(url, auth_token,
@@ -76,17 +76,17 @@ class Common(object):
         if req_type == "put":
             response = requests.put(
                 url, data=payload, headers=headers,
-                timeout=1)
+                timeout=10)
         elif req_type == "get":
             response = requests.get(
-                url, params=params, headers=headers, timeout=1)
+                url, params=params, headers=headers, timeout=10)
         elif req_type == "delete":
             response = requests.delete(
-                url, headers=headers, timeout=1)
+                url, headers=headers, timeout=10)
         else:
             response = requests.post(
                 url, data=payload, headers=headers,
-                timeout=1)
+                timeout=10)
 
         # Raises exception if there was an error
         try: