Fix AAF Authentication CSIT issues

The value stored in perms.cache is throwing JSON load error on
subsequent calls. Returned the perms['roles'] from cache.
Fixed expected string or buffer error in plans.py
CSIT was stuck waiting for port 8100. Changed the aafsim internal port
to 8100 everywhere (same as the aaf-service port).

Change-Id: I00e72a0aee66bb0649996288c37c6c0aef2070d2
Issue-ID: OPTFRA-362
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/conductor.conf b/conductor.conf
index 654eddd..b2f0078 100755
--- a/conductor.conf
+++ b/conductor.conf
@@ -119,6 +119,30 @@ log_config_append = /usr/local/bin/log.conf
 # Enables or disables fatal status of deprecations. (boolean value)
 #fatal_deprecations = false
 
+[aaf_authentication]
+
+#
+# From conductor
+#
+
+# is_aaf_enabled. (boolean value)
+is_aaf_enabled = false
+
+# aaf_cache_expiry_hrs. (integer value)
+#aaf_cache_expiry_hrs = 3
+
+# aaf_url. (string value)
+aaf_url = http://aaf-service:8100/authz/perms/user/
+
+# aaf_retries. (integer value)
+#aaf_retries = 3
+
+# aaf_timeout. (integer value)
+#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_sms]