X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Futils%2Fopenstack.py;h=3a2b1b920687910da196dbe9e68be0649cf7030e;hb=4de60c537b56d7bf9767a8b3b027793c76bf02b5;hp=c77ac46a4309874b323eba4a79a64e30e0557334;hpb=985765e70747c8d3f32b17dca7596a20e4a0297b;p=osm%2FMON.git

diff --git a/osm_mon/collector/utils/openstack.py b/osm_mon/collector/utils/openstack.py
index c77ac46..3a2b1b9 100644
--- a/osm_mon/collector/utils/openstack.py
+++ b/osm_mon/collector/utils/openstack.py
@@ -21,31 +21,29 @@
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
-import json
 
 from keystoneauth1 import session
 from keystoneauth1.identity import v3
 
-from osm_mon.collector.utils.collector import CollectorUtils
-
 
 class OpenstackUtils:
 
     @staticmethod
-    def get_session(vim_account_id: str):
-        creds = CollectorUtils.get_credentials(vim_account_id)
-        verify_ssl = CollectorUtils.is_verify_ssl(creds)
-        vim_config = json.loads(creds.config)
+    def get_session(creds: dict):
+        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']
-        auth = v3.Password(auth_url=creds.url,
-                           username=creds.user,
-                           password=creds.password,
-                           project_name=creds.tenant_name,
+        if 'config' in creds:
+            vim_config = creds['config']
+            verify_ssl = False if 'insecure' in vim_config and vim_config['insecure'] else True
+            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)