Modifies MON to use mongodb directly for vim info and do vim pass decryption on demand
Change-Id: Id088f60bcbe7943661d088f949b55465c4939800
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
(cherry picked from commit 416a753c60f1ba9545f4aa36fb45e1730046e4b2)
diff --git a/osm_mon/collector/utils/collector.py b/osm_mon/collector/utils/collector.py
deleted file mode 100644
index 272426f..0000000
--- a/osm_mon/collector/utils/collector.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2018 Whitestack, LLC
-# *************************************************************
-
-# This file is part of OSM Monitoring module
-# All Rights Reserved to Whitestack, LLC
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# For those usages not covered by the Apache License, Version 2.0 please
-# contact: bdiaz@whitestack.com or glavado@whitestack.com
-##
-import json
-
-from osm_mon.collector.metric import Metric
-from osm_mon.core import database
-from osm_mon.core.database import VimCredentials, VimCredentialsRepository
-
-
-class CollectorUtils(Metric):
-
- @staticmethod
- def get_vim_type(vim_account_id) -> str:
- credentials = CollectorUtils.get_credentials(vim_account_id)
- config = json.loads(credentials.config)
- if 'vim_type' in config:
- vim_type = config['vim_type']
- return str(vim_type.lower())
- else:
- return str(credentials.type)
-
- @staticmethod
- def get_credentials(vim_account_id) -> VimCredentials:
- database.db.connect()
- try:
- with database.db.atomic():
- return VimCredentialsRepository.get(VimCredentials.uuid == vim_account_id)
- finally:
- database.db.close()
-
- @staticmethod
- def is_verify_ssl(vim_credentials: VimCredentials):
- vim_config = json.loads(vim_credentials.config)
- return 'insecure' not in vim_config or vim_config['insecure'] is False
diff --git a/osm_mon/collector/utils/openstack.py b/osm_mon/collector/utils/openstack.py
index c77ac46..41e96e7 100644
--- a/osm_mon/collector/utils/openstack.py
+++ b/osm_mon/collector/utils/openstack.py
@@ -21,31 +21,27 @@
# 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 = False if 'insecure' in creds['config'] and creds['config']['insecure'] else True
+ vim_config = creds['config']
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,
+ 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)