X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcore%2Fauth.py;h=fa80256e1e90516cda0693fd05d2651516fde244;hb=a4ffa936b4f8a2bfcd1b64541e00c93aac449a56;hp=6f5e20ad30cead534c735aac27d0cf46bb043d86;hpb=6c10123aa1538801c01d20f659197918967a9b7f;p=osm%2FMON.git diff --git a/osm_mon/core/auth.py b/osm_mon/core/auth.py index 6f5e20a..fa80256 100644 --- a/osm_mon/core/auth.py +++ b/osm_mon/core/auth.py @@ -28,7 +28,6 @@ from osm_mon.core.database import VimCredentials, DatabaseManager class AuthManager: - def __init__(self): self.database_manager = DatabaseManager() @@ -41,22 +40,23 @@ class AuthManager: credentials.user = creds_dict['vim_user'] credentials.password = creds_dict['vim_password'] credentials.tenant_name = creds_dict['vim_tenant_name'] + if 'config' not in creds_dict: + creds_dict['config'] = {} 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): - return self.database_manager.get_credentials(vim_uuid) + creds = self.database_manager.get_credentials(vim_uuid) + return creds def delete_auth_credentials(self, creds_dict): credentials = self.get_credentials(creds_dict['_id']) if credentials: credentials.delete_instance() + def get_config(self, vim_uuid): + return json.loads(self.get_credentials(vim_uuid).config) + + def is_verify_ssl(self, vim_uuid): + vim_config = self.get_config(vim_uuid) + return 'insecure' not in vim_config or vim_config['insecure'] is False