diff options
Diffstat (limited to 'osdf/adapters')
| -rw-r--r-- | osdf/adapters/aaf/sms.py | 5 | ||||
| -rw-r--r-- | osdf/adapters/policy/interface.py | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/osdf/adapters/aaf/sms.py b/osdf/adapters/aaf/sms.py index 0168ba0..bcc449c 100644 --- a/osdf/adapters/aaf/sms.py +++ b/osdf/adapters/aaf/sms.py @@ -21,6 +21,7 @@ '''Secret Management Service Integration''' from onapsmsclient import Client + import osdf.config.base as cfg_base import osdf.config.credentials as creds import osdf.config.loader as config_loader @@ -71,6 +72,7 @@ def retrieve_secrets(): debug_log.debug("Secret Dictionary Retrieval Success") return secret_dict + def load_secrets(): config = osdf_config.deployment secret_dict = retrieve_secrets() @@ -107,7 +109,8 @@ def load_secrets(): def decrypt_pass(passwd): - if passwd == '' or passwd == 'NA': + config = osdf_config.deployment + if not config.get('appkey') or passwd == '' or passwd == 'NA': return passwd else: return cipherUtils.AESCipher.get_instance().decrypt(passwd) diff --git a/osdf/adapters/policy/interface.py b/osdf/adapters/policy/interface.py index 9ace75e..ccbd3dc 100644 --- a/osdf/adapters/policy/interface.py +++ b/osdf/adapters/policy/interface.py @@ -64,8 +64,8 @@ def get_by_scope(rest_client, req, config_local, type_service): for scopes in pscope: for key in scopes.keys(): for field in scopes[key]: - scope_fields[key] = set(list_flatten([get_scope_fields(field, references, req, policies) - if 'get_param' in field else field])) + scope_fields[key] = list_flatten([get_scope_fields(field, references, req, policies) + if 'get_param' in field else field]) if scope_fields.get('resources') and len(scope_fields['resources']) > 1: for s in scope_fields['resources']: scope_fields['resources'] = [s] @@ -122,7 +122,7 @@ def policy_api_call(rest_client, scope_fields): "ONAPComponent": "OOF_Component", "ONAPInstance": "OOF_Component_Instance", "action": "optimize", - "resources": "{}".format(scope_fields)} + "resource": scope_fields} return rest_client.request(json=api_call_body) def remote_api(req_json, osdf_config, service_type="placement"): @@ -133,9 +133,10 @@ def remote_api(req_json, osdf_config, service_type="placement"): :return: all related policies and provStatus retrieved from Subscriber policy """ config = osdf_config.deployment + headers = {"Content-type": "application/json"} uid, passwd = config['policyPlatformUsername'], config['policyPlatformPassword'] url = config['policyPlatformUrl'] - rc = RestClient(userid=uid, passwd=passwd, url=url, log_func=debug_log.debug) + rc = RestClient(userid=uid, passwd=passwd, headers=headers, url=url, log_func=debug_log.debug) if osdf_config.core['policy_info'][service_type]['policy_fetch'] == "by_name": policies = get_by_name(rc, req_json[service_type + "Info"]['policyId'], wildcards=True) |