From 8e5e875b3736d05c91ddca67c6d0276466953b5d Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Wed, 31 Oct 2018 10:41:35 -0700 Subject: Fix AAF integration config Change-Id: I70f07702ec8abcc431d4ce624d27d67b2b12ef44 Issue-ID: OPTFRA-331 Signed-off-by: Dileep Ranganathan --- scripts/optf-has/has/has-properties/conductor.conf.onap | 14 ++++++++++++-- scripts/optf-has/has/has-properties/has.json | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/scripts/optf-has/has/has-properties/conductor.conf.onap b/scripts/optf-has/has/has-properties/conductor.conf.onap index 768e81b3..7e81824f 100644 --- a/scripts/optf-has/has/has-properties/conductor.conf.onap +++ b/scripts/optf-has/has/has-properties/conductor.conf.onap @@ -131,7 +131,7 @@ log_dir = /var/log #fatal_deprecations = false -[aaf_authentication] +[aaf_api] # # From conductor @@ -146,6 +146,16 @@ log_dir = /var/log # aaf_url. (string value) aaf_url = http://localhost:8100/authz/perms/user/ +# aaf_cert_file. (string value) +#aaf_cert_file = + +# aaf_cert_key_file. (string value) +#aaf_cert_key_file = + +# aaf_ca_bundle_file. (string value) +#aaf_ca_bundle_file = +aaf_ca_bundle_file = /usr/local/bin/AAF_RootCA.cer + # aaf_retries. (integer value) #aaf_retries = 3 @@ -153,7 +163,7 @@ aaf_url = http://localhost:8100/authz/perms/user/ #aaf_timeout = 100 # aaf_user_roles. (list value) -#aaf_user_roles = {"type": "org.onap.oof","instance": "plans","action": "GET"},{"type": "org.onap.oof","instance": "plans","action": "POST"} +#aaf_permissions = {"type": "org.onap.oof.access","instance": "*","action": "*"} [aaf_sms] diff --git a/scripts/optf-has/has/has-properties/has.json b/scripts/optf-has/has/has-properties/has.json index ae990a9e..4f487712 100644 --- a/scripts/optf-has/has/has-properties/has.json +++ b/scripts/optf-has/has/has-properties/has.json @@ -30,6 +30,14 @@ "aafpass": "c0nduct0r", "aafns": "conductor" } + }, + { + "name": "aaf_api", + "values": { + "username": "aaf_admin@people.osaaf.org", + "password": "demo123456!", + "aaf_conductor_user": "oof@oof.onap.org" + } } ] } -- cgit 1.2.3-korg