diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-11-02 03:22:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-02 03:22:43 +0000 |
| commit | c51defc4bb5417827bd80c14d1c0e6bdd9688823 (patch) | |
| tree | 2926594d8565513f4f10b735397d374236fc1ec5 | |
| parent | bbfb8ee3e7ffdd69ac4173acb1bbb06dee0842f9 (diff) | |
| parent | 8e5e875b3736d05c91ddca67c6d0276466953b5d (diff) | |
Merge "Fix AAF integration config"
| -rw-r--r-- | scripts/optf-has/has/has-properties/conductor.conf.onap | 14 | ||||
| -rw-r--r-- | 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 = <None> + +# aaf_cert_key_file. (string value) +#aaf_cert_key_file = <None> + +# 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" + } } ] } |