From: gcalvino Date: Mon, 9 Apr 2018 22:04:16 +0000 (+0200) Subject: Region Name and endpoint type as parameters X-Git-Tag: v4.0.0~18 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F5957%2F1;hp=07698bb92ade3527c03b56470e053510e6e5acfe;p=osm%2FMON.git Region Name and endpoint type as parameters Signed-off-by: gcalvino --- diff --git a/osm_mon/core/auth.py b/osm_mon/core/auth.py index 7b61fe1..6f5e20a 100644 --- a/osm_mon/core/auth.py +++ b/osm_mon/core/auth.py @@ -42,6 +42,14 @@ class AuthManager: credentials.password = creds_dict['vim_password'] credentials.tenant_name = creds_dict['vim_tenant_name'] credentials.config = json.dumps(creds_dict['config']) + if creds_dict.get('OS_REGION_NAME'): + credentials.region_name = creds_dict['OS_REGION_NAME'] + else: + credentials.region_name = "RegionOne" + if creds_dict.get('OS_ENDPOINT_TYPE'): + credentials.endpoint_type = creds_dict['OS_ENDPOINT_TYPE'] + else: + credentials.endpoint_type = "publicURL" self.database_manager.save_credentials(credentials) def get_credentials(self, vim_uuid): diff --git a/osm_mon/plugins/OpenStack/common.py b/osm_mon/plugins/OpenStack/common.py index 57acf40..2540a3f 100644 --- 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,