X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Futils%2Fopenstack.py;h=09c472c26f98414f6d5ffbcade7cb81228aa775e;hb=9006f6d5af485dfb01e5f585fdff1bbcf44f42b1;hp=41e96e7670f58041be853d824462824ca63ab4d1;hpb=416a753c60f1ba9545f4aa36fb45e1730046e4b2;p=osm%2FMON.git diff --git a/osm_mon/collector/utils/openstack.py b/osm_mon/collector/utils/openstack.py index 41e96e7..09c472c 100644 --- a/osm_mon/collector/utils/openstack.py +++ b/osm_mon/collector/utils/openstack.py @@ -30,18 +30,23 @@ class OpenstackUtils: @staticmethod def get_session(creds: dict): - verify_ssl = False if 'insecure' in creds['config'] and creds['config']['insecure'] else True - vim_config = creds['config'] + verify_ssl = True project_domain_name = 'Default' user_domain_name = 'Default' - if 'project_domain_name' in vim_config: - project_domain_name = vim_config['project_domain_name'] - if 'user_domain_name' in vim_config: - user_domain_name = vim_config['user_domain_name'] + if 'config' in creds: + vim_config = creds['config'] + if 'insecure' in vim_config and vim_config['insecure']: + verify_ssl = False + if 'ca_cert' in vim_config: + verify_ssl = vim_config['ca_cert'] + if 'project_domain_name' in vim_config: + project_domain_name = vim_config['project_domain_name'] + if 'user_domain_name' in vim_config: + user_domain_name = vim_config['user_domain_name'] auth = v3.Password(auth_url=creds['vim_url'], username=creds['vim_user'], password=creds['vim_password'], project_name=creds['vim_tenant_name'], project_domain_name=project_domain_name, user_domain_name=user_domain_name) - return session.Session(auth=auth, verify=verify_ssl) + return session.Session(auth=auth, verify=verify_ssl, timeout=10)