Code Review / aaf / authz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: e092a5c)
Merge "Sonar fix: ListUsers.java"
authorJonathan Gathman <jonathan.gathman@att.com>
Thu, 10 Jan 2019 09:10:30 +0000 (09:10 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 10 Jan 2019 09:10:30 +0000 (09:10 +0000)
13 files changed:
auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java patch | blob | history
auth/sample/cass_data/artifact.dat patch | blob | history
auth/sample/cass_data/cred.dat patch | blob | history
auth/sample/cass_data/ns.dat patch | blob | history
auth/sample/cass_data/perm.dat patch | blob | history
auth/sample/cass_data/role.dat patch | blob | history
auth/sample/cass_data/user_role.dat patch | blob | history
auth/sample/data/sample.identities.dat patch | blob | history
misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java patch | blob | history
misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/Api.java [new file with mode: 0644] patch | blob
misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaData.java [new file with mode: 0644] patch | blob
misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaEnv.java [new file with mode: 0644] patch | blob
misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/marshal/JU_FieldBlob.java [new file with mode: 0644] patch | blob

diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java
index eb4e6bb..a1c83ee 100644 (file)
--- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java
+++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/mgmt/Mgmt.java
@@ -3,6 +3,8 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2018 IBM.
  * ===========================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +25,6 @@ package org.onap.aaf.auth.cmd.mgmt;
 
 import org.onap.aaf.auth.cmd.AAFcli;
 import org.onap.aaf.auth.cmd.BaseCmd;
-import org.onap.aaf.misc.env.APIException;
 
 public class Mgmt extends BaseCmd<Mgmt> {
     public Mgmt(AAFcli aafcli) {
diff --git a/auth/sample/cass_data/artifact.dat b/auth/sample/cass_data/artifact.dat
index 2a6753d..ffcdda4 100644 (file)
--- a/auth/sample/cass_data/artifact.dat
+++ b/auth/sample/cass_data/artifact.dat
@@ -1,34 +1,35 @@
 oof@oof.onap.org|oof.onap|local|/opt/app/osaaf/local||mailto:|org.onap.oof|root|30|{'oof-onap', 'oof.api.simpledemo.onap.org', 'oof.onap'}|aaf_admin@osaaf.org|{'file', 'pkcs12'}
+vfc@vfc.onap.org|vfc|local|/opt/app/osaaf/local||mailto:|org.onap.vfc|root|30|{'vfc.api.simpledemo.onap.org vfc.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
 dmaap-dr-node@dmaap-dr.onap.org|dmaap-dr-node|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-dr|root|30|{'dmaap-dr-node', 'dmaap-dr-node.api.simpledemo.onap.org', 'dmaap-dr-node.onap'}|aaf_admin@osaaf.org|{'jks', 'pkcs12', 'script'}
-tester1@test.portal.onap.org|tester1|aaf|/||mailto:|org.onap.portal.test|root|30||@osaaf.org|{'file', 'jks', 'pkcs12', 'script'}
 dmaap-mr@dmaap-mr.onap.org|dmaap-mr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-mr|root|30|{'dmaap-mr', 'dmaap-mr.onap', 'message-router', 'message-router.onap', 'mr.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
 dmaap-dr-prov@dmaap-dr-prov.onap.org|dmaap-dr-prov|local|/opt/app/osaaf/local||mailto:|onap.dmaap-dr-prov|root|30|{'dmaap-dr-prov', 'dmaap-dr-prov.api.simpledemo.onap.org', 'dmaap-dr-prov.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-vfc@vfc.onap.org|vfc|local|/opt/app/osaaf/local||mailto:|org.onap.vfc|root|30|{'vfc.api.simpledemo.onap.org vfc.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-pomba@pomba.onap.org|onap.pomba|local|/opt/app/osaaf/local||mailto:|org.onap.pomba|root|30|{'onap.pomba', 'onap_pomba', 'pomba', 'pomba.api.simpledemo.onap.org', 'pomba.onap', 'pomba_onap'}|aaf_admin@osaaf.org|{'jks', 'pkcs12', 'script'}
+holmes@holmes.onap.org|holmes|local|/opt/app/osaaf/local||mailto:|org.onap.holmes|root|30|{'holmes.api.simpledemo.onap.org', 'holmes.onap'}|aaf_admin@osaaf.org|{'pkcs12'}
+tester1@test.portal.onap.org|tester1|aaf|/||mailto:|org.onap.portal.test|root|30||@osaaf.org|{'file', 'jks', 'pkcs12', 'script'}
 appc@appc.onap.org|appc|local|/opt/app/osaaf/local||mailto:|org.onap.appc|root|30|{'appc.api.simpledemo.onap.org', 'appc.onap', 'appc.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
-policy@policy.onap.org|policy|local|/opt/app/osaaf/local||mailto:|org.onap.policy|root|30|{'*.pdp', '*.pdp.onap.svc.cluster.local', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'policy', 'policy.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
-policy@policy.onap.org|policy_onap|local|/opt/app/osaaf/local||mailto:|org.onap.policy|root|30|{'*.pdp', '*.pdp.onap.svc.cluster.local', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'policy', 'policy.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
+so@so.onap.org|so|local|/opt/app/osaaf/local||mailto:|org.onap.so|root|30|{'so.api.simpledemo.onap.org', 'so.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+pomba@pomba.onap.org|onap.pomba|local|/opt/app/osaaf/local||mailto:|org.onap.pomba|root|30|{'onap.pomba', 'onap_pomba', 'pomba', 'pomba.api.simpledemo.onap.org', 'pomba.onap', 'pomba_onap'}|aaf_admin@osaaf.org|{'jks', 'pkcs12', 'script'}
 dmaap-dr-prov@dmaap-dr.onap.org|dmaap-dr-prov|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-dr|root|30|{'dmaap-dr-prov', 'dmaap-dr-prov.api.simpledemo.onap.org', 'dmaap-dr-prov.onap'}|aaf_admin@osaaf.org|{'jks', 'script'}
 vid@vid.onap.org|vid|local|/opt/app/osaaf/local||mailto:|org.onap.vid|root|30|{'vid.api.simpledemo.onap.org', 'vid.onap'}|aaf_admin@osaaf.org|{'jks', 'pkcs12'}
-so@so.onap.org|so|local|/opt/app/osaaf/local||mailto:|org.onap.so|root|30|{'so.api.simpledemo.onap.org', 'so.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-aai@aai.onap.org|aai|local|/opt/app/osaaf/local||mailto:|org.onap.aai|root|30|{'aai.api.simpledemo.onap.org', 'aai.elasticsearch.simpledemo.onap.org', 'aai.gremlinserver.simpledemo.onap.org', 'aai.hbase.simpledemo.onap.org', 'aai.onap', 'aai.searchservice.simpledemo.onap.org', 'aai.simpledemo.onap.org', 'aai.ui.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
-sdnc@sdnc.onap.org|sdnc|local|/opt/app/osaaf/local||mailto:|org.onap.sdnc|root|30|{'c1.vm1.sdnc.simpledemo.onap', 'c2.vm1.sdnc.simpledemo.onap', 'c3.vm1.sdnc.simpledemo.onap', 'c4.vm1.sdnc.simpledemo.onap', 'onap-sdnc', 'onap-sdnc.onap', 'sdnc.api.simpledemo.onap.org', 'vm1.sdnc.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
-dmaap-bc-mm-prov@dmaap-bc-mm-prov.onap.org|dmaap-bc-mm-prov|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-bc-mm-prov|root|30|{'dmaap-bc-mm-prov', 'dmaap-bc-mm-prov.api.simpledemo.onap.org', 'dmaap-bc-mm-prov.onap', 'onap.dmaap-bc-mm-prov'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-dmaap.mr@mr.dmaap.onap.org|dmaap-mr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap.mr|root|30|{'message-router mr.api.simpledemo.onap.org message-router.onap dmaapmr dmaap.mr dmaap-mr dmaap.mr.onap dmaap-mr.onap dmaap-mr dmaapmr.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-dmaap.mr@mr.dmaap.onap.org|dmaap.mr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap.mr|root|30|{'message-router mr.api.simpledemo.onap.org message-router.onap dmaapmr dmaap.mr dmaap-mr dmaap.mr.onap dmaap-mr.onap dmaap-mr dmaapmr.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-dmaap.mr@mr.dmaap.onap.org|dmaapmr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap.mr|root|30|{'message-router mr.api.simpledemo.onap.org message-router.onap dmaapmr dmaap.mr dmaap-mr dmaap.mr.onap dmaap-mr.onap dmaap-mr dmaapmr.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
 aaf@aaf.osaaf.org|aaf|local|/opt/app/osaaf/local||mailto:|org.osaaf.aaf|root|30|{'aaf', 'aaf.api.simpledemo.onap.org', 'aaf.onap', 'onap.aaf'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
 dmaap-bc@dmaap-bc.onap.org|dmaap-bc|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-bc|root|30|{'dmaap-bc', 'dmaap-bc.api.simpledemo.onap.org', 'dmaap-bc.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-clamp@clamp.onap.org|clamp|local|/opt/app/osaaf/local||mailto:|org.onap.clamp|root|30|{'clamp.api.simpledemo.onap.org', 'clamp.onap'}|aaf_admin@osaaf.org|{'pkcs12'}
-vid2@vid2.onap.org|vid2|local|/opt/app/osaaf/local||mailto:|org.onap.vid2|root|30|{'onap.vid2', 'vid2', 'vid2.api.simpledemo.onap.org', 'vid2.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+policy@policy.onap.org|policy|local|/opt/app/osaaf/local||mailto:|org.onap.policy|root|30|{'*.pdp', '*.pdp.onap.svc.cluster.local', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'policy', 'policy-apex-pdp', 'policy-apex-pdp.onap', 'policy-distribution', 'policy-distribution.onap', 'policy.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
+policy@policy.onap.org|policy_onap|local|/opt/app/osaaf/local||mailto:|org.onap.policy|root|30|{'*.pdp', '*.pdp.onap.svc.cluster.local', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'policy', 'policy-apex-pdp', 'policy-apex-pdp.onap', 'policy-distribution', 'policy-distribution.onap', 'policy.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
+dmaap-bc-mm-prov@dmaap-bc-mm-prov.onap.org|dmaap-bc-mm-prov|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-bc-mm-prov|root|30|{'dmaap-bc-mm-prov', 'dmaap-bc-mm-prov.api.simpledemo.onap.org', 'dmaap-bc-mm-prov.onap', 'onap.dmaap-bc-mm-prov'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+aai@aai.onap.org|aai|local|/opt/app/osaaf/local||mailto:|org.onap.aai|root|30|{'aai-sparky-be.onap', 'aai.api.simpledemo.onap.org', 'aai.elasticsearch.simpledemo.onap.org', 'aai.gremlinserver.simpledemo.onap.org', 'aai.hbase.simpledemo.onap.org', 'aai.onap', 'aai.searchservice.simpledemo.onap.org', 'aai.simpledemo.onap.org', 'aai.ui.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
 sdc@sdc.onap.org|sdc|local|/opt/app/osaaf/local||mailto:|org.onap.sdc|root|30|{'sdc-fe.onap', 'sdc.api.simpledemo.onap.org', 'sdc.onap'}|aaf_admin@osaaf.org|{'jks', 'pkcs12', 'script'}
 sdc@sdc.onap.org|sdc-fe.onap|local|/opt/app/osaaf/local||mailto:|org.onap.sdc|root|30|{'sdc-fe.onap', 'sdc.api.simpledemo.onap.org', 'sdc.onap'}|aaf_admin@osaaf.org|{'file', 'jks', 'script'}
-dmaap-dr-node@dmaap-dr-node.onap.org|dmaap-dr-node|local|/opt/app/osaaf/local||mailto:|onap.dmaap-dr-node|root|30|{'dmaap-dr-node', 'dmaap-dr-node.api.simpledemo.onap.org', 'dmaap-dr-node.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+sdnc@sdnc.onap.org|sdnc|local|/opt/app/osaaf/local||mailto:|org.onap.sdnc|root|30|{'c1.vm1.sdnc.simpledemo.onap', 'c2.vm1.sdnc.simpledemo.onap', 'c3.vm1.sdnc.simpledemo.onap', 'c4.vm1.sdnc.simpledemo.onap', 'onap-sdnc', 'onap-sdnc.onap', 'sdnc.api.simpledemo.onap.org', 'vm1.sdnc.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
 dmaap-dr@dmaap-dr.onap.org|dmaap-dr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-dr|root|30|{'dmaap-dr', 'dmaap-dr.api.simpledemo.onap.org', 'dmaap-dr.onap', 'onap.dmaap-dr'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-vid1@vid1.onap.org|vid1|local|/opt/app/osaaf/local||mailto:|org.onap.vid1|root|30|{'onap', 'onap.vid1', 'vid1', 'vid1.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-aaf-sms@aaf-sms.onap.org|aaf-sms|local|/opt/app/osaaf/local||mailto:|org.onap.aaf-sms|root|30|{'aaf-sms-db.onap', 'aaf-sms.api.simpledemo.onap.org', 'aaf-sms.onap', 'aaf-sms.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
-dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|dmaap-bc-topic-mgr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-bc-topic-mgr|root|30|{'dmaap-bc-topic-mgr', 'dmaap-bc-topic-mgr.api.simpledemo.onap.org', 'dmaap-bc-topic-mgr.onap', 'onap.dmaap-bc-topic-mgr'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
 dcae@dcae.onap.org|dcae|local|/opt/app/osaaf/local||mailto:|org.onap.dcae|root|30|{'config-binding-service', 'config-binding-service.onap', 'config-binding-service.onap.svc.cluster.local', 'dcae-cloudify-manager', 'dcae-cloudify-manager.onap', 'dcae-cloudify-manager.onap.svc.cluster.local', 'dcae-datafile-collector', 'dcae-datafile-collector.onap', 'dcae-datafile-collector.onap.svc.cluster.local', 'dcae-hv-ves-collector', 'dcae-hv-ves-collector.onap', 'dcae-hv-ves-collector.onap.svc.cluster.local', 'dcae-prh', 'dcae-prh.onap', 'dcae-prh.onap.svc.cluster.local', 'dcae-tca-analytics', 'dcae-tca-analytics.onap', 'dcae-tca-analytics.onap.svc.cluster.local', 'dcae-ves-collector', 'dcae-ves-collector.onap', 'dcae-ves-collector.onap.svc.cluster.local', 'deployment-handler', 'deployment-handler.onap', 'deployment-handler.onap.svc.cluster.local', 'holmes-engine-mgmt', 'holmes-engine-mgmt.onap', 'holmes-engine-mgmt.onap.svc.cluster.local', 'holmes-rule-mgmt', 'holmes-rules-mgmt.onap', 'holmes-rules-mgmt.onap.svc.cluster.local', 'inventory', 'inventory.onap', 'inventory.onap.svc.cluster.local', 'policy-handler', 'policy-handler.onap', 'policy-handler.onap.svc.cluster.local'}|aaf_admin@osaaf.org|{'file', 'jks', 'script'}
 portal@portal.onap.org|onap.portal|local|/opt/app/osaaf/local||mailto:|org.onap.portal|root|30|{'onap_portal', 'portal', 'portal.api.simpledemo.onap.org', 'portal_onap'}|aaf_admin@osaaf.org|{'jks', 'script'}
 portal@portal.onap.org|portal-app|local|/opt/app/osaaf/local||mailto:|org.onap.portal|root|30|{'onap_portal', 'portal', 'portal.api.simpledemo.onap.org', 'portal_onap'}|aaf_admin@osaaf.org|{'jks', 'script'}
+dmaap.mr@mr.dmaap.onap.org|dmaap-mr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap.mr|root|30|{'message-router mr.api.simpledemo.onap.org message-router.onap dmaapmr dmaap.mr dmaap-mr dmaap.mr.onap dmaap-mr.onap dmaap-mr dmaapmr.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+dmaap.mr@mr.dmaap.onap.org|dmaap.mr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap.mr|root|30|{'message-router mr.api.simpledemo.onap.org message-router.onap dmaapmr dmaap.mr dmaap-mr dmaap.mr.onap dmaap-mr.onap dmaap-mr dmaapmr.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+dmaap.mr@mr.dmaap.onap.org|dmaapmr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap.mr|root|30|{'message-router mr.api.simpledemo.onap.org message-router.onap dmaapmr dmaap.mr dmaap-mr dmaap.mr.onap dmaap-mr.onap dmaap-mr dmaapmr.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+aaf-sms@aaf-sms.onap.org|aaf-sms|local|/opt/app/osaaf/local||mailto:|org.onap.aaf-sms|root|30|{'aaf-sms-db.onap', 'aaf-sms.api.simpledemo.onap.org', 'aaf-sms.onap', 'aaf-sms.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
+vid1@vid1.onap.org|vid1|local|/opt/app/osaaf/local||mailto:|org.onap.vid1|root|30|{'onap', 'onap.vid1', 'vid1', 'vid1.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|dmaap-bc-topic-mgr|local|/opt/app/osaaf/local||mailto:|org.onap.dmaap-bc-topic-mgr|root|30|{'dmaap-bc-topic-mgr', 'dmaap-bc-topic-mgr.api.simpledemo.onap.org', 'dmaap-bc-topic-mgr.onap', 'onap.dmaap-bc-topic-mgr'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+clamp@clamp.onap.org|clamp|local|/opt/app/osaaf/local||mailto:|org.onap.clamp|root|30|{'clamp.api.simpledemo.onap.org', 'clamp.onap'}|aaf_admin@osaaf.org|{'pkcs12'}
+vid2@vid2.onap.org|vid2|local|/opt/app/osaaf/local||mailto:|org.onap.vid2|root|30|{'onap.vid2', 'vid2', 'vid2.api.simpledemo.onap.org', 'vid2.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+dmaap-dr-node@dmaap-dr-node.onap.org|dmaap-dr-node|local|/opt/app/osaaf/local||mailto:|onap.dmaap-dr-node|root|30|{'dmaap-dr-node', 'dmaap-dr-node.api.simpledemo.onap.org', 'dmaap-dr-node.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
 shi@shi.onap.org|onap.shi|local|/opt/app/osaaf/local||mailto:|onap.shi|root|30|{'onap_shi', 'shi', 'shi.api.simpledemo.onap.org', 'shi_onap'}|aaf_admin@osaaf.org|{'jks', 'pkcs12', 'script'}
diff --git a/auth/sample/cass_data/cred.dat b/auth/sample/cass_data/cred.dat
index 7138cf7..bff48d4 100644 (file)
--- a/auth/sample/cass_data/cred.dat
+++ b/auth/sample/cass_data/cred.dat
@@ -1,43 +1,44 @@
-portal@portal.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.portal|53344|
-shi@shi.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.shi|53344|
-aaf@aaf.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.aaf|53344|
-aaf-sms@aaf-sms.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.aaf-sms|53344|
-clamp@clamp.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.clamp|53344|
-aai@aai.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.aai|53344|
-appc@appc.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.appc|53344|
-dcae@dcae.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dcae|53344|
-oof@oof.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.oof|53344|
-so@so.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.so|53344|
-sdc@sdc.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.sdc|53344|
-sdnc@sdnc.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.sdnc|53344|
-vfc@vfc.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vfc|53344|
-policy@policy.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.policy|53344|
-pomba@pomba.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.pomba|53344|
-vid@vid.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid|53344|
-vid1@vid1.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid1|53344|
-vid2@vid2.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid2|53344|
-dmaap-bc@dmaap-bc.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc|53344|
-dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc-topic-mgr|53344|
-dmaap-bc-mm-prov@dmaap-bc-mm-prov.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc-mm-prov|53344|
-dmaap-dr@dmaap-dr.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr|53344|
-dmaap-dr-prov@dmaap-dr-prov.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr-prov|53344|
-dmaap-dr-node@dmaap-dr-node.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr-node|53344|
-dmaap-mr@dmaap-mr.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-mr|53344|
-dmaapmr@dmaapmr.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaapmr|53344|
-dmaap.mr@dmaap.mr.onap.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.mr.dmaap|53344|
-iowna@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-mmanager@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-bdevl@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-mmarket@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-demo@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-jh0003@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-cs0008@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-jm0007@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-op0001@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-gv0001@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-pm0001@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-gs0001@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-ps0001@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-aaf_admin@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-deployer@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
-portal_admin@people.osaaf.org|2|2019-05-13 09:56:44.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+portal@portal.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.portal|53344|
+shi@shi.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.shi|53344|
+aaf@aaf.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.aaf|53344|
+aaf-sms@aaf-sms.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.aaf-sms|53344|
+clamp@clamp.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.clamp|53344|
+aai@aai.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.aai|53344|
+appc@appc.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.appc|53344|
+dcae@dcae.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dcae|53344|
+oof@oof.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.oof|53344|
+so@so.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.so|53344|
+sdc@sdc.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.sdc|53344|
+sdnc@sdnc.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.sdnc|53344|
+vfc@vfc.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vfc|53344|
+policy@policy.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.policy|53344|
+pomba@pomba.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.pomba|53344|
+holmes@holmes.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.holmes|53344|
+vid@vid.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid|53344|
+vid1@vid1.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid1|53344|
+vid2@vid2.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid2|53344|
+dmaap-bc@dmaap-bc.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc|53344|
+dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc-topic-mgr|53344|
+dmaap-bc-mm-prov@dmaap-bc-mm-prov.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc-mm-prov|53344|
+dmaap-dr@dmaap-dr.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr|53344|
+dmaap-dr-prov@dmaap-dr-prov.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr-prov|53344|
+dmaap-dr-node@dmaap-dr-node.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr-node|53344|
+dmaap-mr@dmaap-mr.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-mr|53344|
+#dmaapmr@#dmaapmr.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.#dmaapmr|53344|
+#dmaap.mr@#dmaap.mr.onap.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.mr.#dmaap|53344|
+iowna@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+mmanager@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+bdevl@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+mmarket@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+demo@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+jh0003@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+cs0008@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+jm0007@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+op0001@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+gv0001@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+pm0001@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+gs0001@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+ps0001@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+aaf_admin@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+deployer@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+portal_admin@people.osaaf.org|2|2019-07-04 09:57:55.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
diff --git a/auth/sample/cass_data/ns.dat b/auth/sample/cass_data/ns.dat
index f0eb150..dcee840 100644 (file)
--- a/auth/sample/cass_data/ns.dat
+++ b/auth/sample/cass_data/ns.dat
@@ -1,39 +1,40 @@
-org.onap.vfc||org.onap||3
-org.onap.dmaap-bc||org.onap||3
 org.onap.portal.test||org.onap.portal||3
-org.onap.sdnc||org.onap||3
-org.onap.dmaap-mr.test||org.onap.dmaap-mr||3
 org.onap.dmaap-dr||org.onap||3
-org.onap.oof||org.onap||3
 org.onap.dmaap-mr||org.onap||3
+org.onap.sdnc||org.onap||3
+org.onap.vfc||org.onap||3
+org.onap.dmaap-bc||org.onap||3
+org.onap.dmaap-mr.test||org.onap.dmaap-mr||3
+org.onap.dmaap-bc-mm-prov||org.onap||3
+org.onap.sdc||org.onap||3
 org.onap.so||org.onap||3
-org.onap.vid1||org.onap||3
+org|Root Namespace|.|1|1
+org.onap.portal|ONAP Portal|org.onap.portal|3|3
 org.onap.dmaap||org.onap||3
-org.onap.clamptest|Onap clamp test NS|org.onap|2|2
+org.onap|ONAP|org|2|2
 org.onap.vid||org.onap||3
-org.onap.dmaap-bc-mm-prov||org.onap||3
-org.onap.sdc||org.onap||3
+org.onap.dmaapbc||org.onap||3
+org.onap.oof||org.onap||3
 org.onap.dmaap-bc.api||org.onap.dmaap-bc||3
 org.onap.clamp||org.onap||3
-org.onap.dmaapbc||org.onap||3
+org.onap.holmes||org.onap||3
 org.openecomp.dcae|DCAE Namespace Org|org.openecomp|3|3
-org|Root Namespace|.|1|1
-org.onap.portal|ONAP Portal|org.onap.portal|3|3
 org.openecomp.dmaapBC|DMaap NS|org.openecomp|3|3
-org.onap|ONAP|org|2|2
+org.onap.vid1||org.onap||3
+org.onap.dmaap.mr||org.onap||3
+org.onap.clamptest|Onap clamp test NS|org.onap|2|2
 org.onap.pomba||org.onap||3
 org.onap.vid2||org.onap||3
-org.onap.appc||org.onap||3
-org.onap.dmaap-mr.sunil||org.onap.dmaap-mr||3
 org.osaaf|OSAAF Namespace|org|2|2
 org.onap.dmaap-bc-topic-mgr||org.onap||3
-org.onap.dmaap.mr||org.onap||3
+org.onap.appc||org.onap||3
+org.onap.dmaap-mr.sunil||org.onap.dmaap-mr||3
 org.onap.clampdemo|Onap clamp demo NS|org.onap|2|2
 org.osaaf.aaf|Application Authorization Framework|org.osaaf|3|3
-org.onap.aai||org.onap||3
 org.onap.policy||org.onap||3
 org.onap.aaf-sms||org.onap||3
-org.openecomp|Open EComp NS|org|2|2
+org.onap.dmaap.bc||org.onap||3
 org.osaaf.people||org.osaaf||3
 org.onap.dcae||org.onap||3
-org.onap.dmaap.bc||org.onap||3
+org.onap.aai||org.onap||3
+org.openecomp|Open EComp NS|org|2|2
diff --git a/auth/sample/cass_data/perm.dat b/auth/sample/cass_data/perm.dat
index 992d2c0..2b1804a 100644 (file)
--- a/auth/sample/cass_data/perm.dat
+++ b/auth/sample/cass_data/perm.dat
@@ -1,13 +1,51 @@
+org.onap.portal.test|aaaa|*|write||
+org.onap.portal.test|access|*|*|AAF Namespace Write Access|"{'org.onap.portal.test|admin'}"
+org.onap.portal.test|access|*|read|AAF Namespace Read Access|"{'org.onap.portal.test|owner'}"
+org.onap.portal.test|access1|*|read||
+org.onap.portal.test|myaccess|*|read||
+org.onap.portal.test|user1.access|*|read||
+org.onap.portal.test|user1.myaccess|*|read||
+org.onap.vfc|access|*|*|AAF Namespace Write Access|"{'org.onap.vfc|admin', 'org.onap.vfc|service'}"
+org.onap.vfc|access|*|read|AAF Namespace Read Access|"{'org.onap.vfc|owner'}"
+org.onap.vfc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.dmaap-bc|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-bc|admin'}"
+org.onap.dmaap-bc|access|*|read|AAF Namespace Read Access|"{'org.onap.dcae|admin', 'org.onap.dmaap-bc|owner'}"
+org.onap.dmaap-bc|certman|local|request,ignoreIPs,showpass||"{'org.onap.dmaap-bc|seeCerts', 'org.osaaf.aaf|deploy'}"
+org.onap.sdnc|access|*|*|AAF Namespace Write Access|"{'org.onap.sdnc|admin'}"
+org.onap.sdnc|access|*|read|AAF Namespace Read Access|"{'org.onap.sdnc|owner'}"
+org.onap.sdnc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.sdnc|odl|odl-api|*||"{'org.onap.sdnc|admin', 'org.onap.sdnc|service'}"
+org.onap.dmaap-mr.test|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-mr.test|admin'}"
+org.onap.dmaap-mr.test|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-mr.test|owner'}"
+org.onap.dmaap-dr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-dr|admin'}"
+org.onap.dmaap-dr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-dr|owner'}"
+org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass||"{'org.onap.dmaap-dr|seeCerts', 'org.osaaf.aaf|deploy'}"
+org.onap.so|access|*|*|AAF Namespace Write Access|"{'org.onap.so|admin', 'org.onap.so|app'}"
+org.onap.so|access|*|read|AAF Namespace Read Access|"{'org.onap.so|owner'}"
+org.onap.so|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.dmaap|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap|admin'}"
+org.onap.dmaap|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap|owner'}"
 org.onap.dmaap-mr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-mr|admin'}"
 org.onap.dmaap-mr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-mr|owner'}"
 org.onap.dmaap-mr|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 org.onap.dmaap-mr|saitest|:topic.org.onap.dmaap-bc.mr.dglTest201810100535|pub||"{'org.onap.dmaap-mr|admin', 'org.onap.dmaap-mr|sai'}"
+org.onap.oof|access|*|*|AAF Namespace Write Access|"{'org.onap.oof|admin'}"
+org.onap.oof|access|*|read|AAF Namespace Read Access|"{'org.onap.oof|owner'}"
+org.onap.oof|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.vid1|access|*|*|AAF Namespace Write Access|"{'org.onap.vid1|admin'}"
+org.onap.vid1|access|*|read|AAF Namespace Read Access|"{'org.onap.vid1|owner'}"
+org.onap.vid1|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 org.onap.dmaap-bc-mm-prov|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-bc-mm-prov|admin'}"
 org.onap.dmaap-bc-mm-prov|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-bc-mm-prov|owner'}"
 org.onap.dmaap-bc-mm-prov|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 org.onap.sdc|access|*|*|AAF Namespace Write Access|"{'org.onap.sdc|admin'}"
 org.onap.sdc|access|*|read|AAF Namespace Read Access|"{'org.onap.sdc|owner'}"
+org.onap.sdc|administrator.access|*|*||"{'org.onap.sdc|admin'}"
 org.onap.sdc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.sdc|designer.access|*|*||"{'org.onap.sdc|designer'}"
+org.onap.sdc|governance.access|*|*||"{'org.onap.sdc|governor'}"
+org.onap.sdc|operations.access|*|*||"{'org.onap.sdc|ops'}"
+org.onap.sdc|tester.access|*|*||"{'org.onap.sdc|tester'}"
 org|access|*|*|Org Write Access|{'org.admin'}
 org|access|*|read|Org Read Access|{'org.owner'}
 org|access|*|read,approve|Org Read Access|{'org.owner'}
@@ -63,16 +101,13 @@ org.onap.portal|url|userApps|*|User Apps|"{'org.onap.portal|Account_Administrato
 org.onap.portal|url|view_reports|*|View Raptor reports|
 org.onap|access|*|*|Onap Write Access|{'org.onap.admin'}
 org.onap|access|*|read|Onap Read Access|{'org.onap.owner'}
-org.onap.portal.test|aaaa|*|write||
-org.onap.portal.test|access|*|*|AAF Namespace Write Access|"{'org.onap.portal.test|admin'}"
-org.onap.portal.test|access|*|read|AAF Namespace Read Access|"{'org.onap.portal.test|owner'}"
-org.onap.portal.test|access1|*|read||
-org.onap.portal.test|myaccess|*|read||
-org.onap.portal.test|user1.access|*|read||
-org.onap.portal.test|user1.myaccess|*|read||
-org.onap.dmaap-dr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-dr|admin'}"
-org.onap.dmaap-dr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-dr|owner'}"
-org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass||"{'org.onap.dmaap-dr|seeCerts', 'org.osaaf.aaf|deploy'}"
+org.onap.clamptest|access|*|*|Onap Write Access|{'org.onap.clamptest.admin'}
+org.onap.clamptest|access|*|read|Onap Read Access|{'org.onap.clamptest.owner'}
+org.osaaf.aaf|access|*|*|AAF Write Access|{'org.osaaf.aaf.admin'}
+org.osaaf.aaf|access|*|read,approve|AAF Read Access|{'org.osaaf.aaf.owner'}
+org.osaaf.aaf|cache|all|clear||"{'org.osaaf.aaf|admin'}"
+org.osaaf.aaf|cache|role|clear||"{'org.osaaf.aaf|admin'}"
+org.osaaf.aaf|password|*|create,reset||"{'org.osaaf.aaf|admin'}"
 org.onap.dmaap.mr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap.mr|admin'}"
 org.onap.dmaap.mr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap.mr|owner', 'org.onap.dmaap.mr|service'}"
 org.onap.dmaap.mr|topic|*|view||"{'org.onap.dmaap.mr|view'}"
@@ -131,33 +166,16 @@ org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|create
 org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|destroy||"{'org.onap.dmaap-bc-topic-mgr|client', 'org.onap.dmaap.mr|destroy'}"
 org.onap.dmaap.mr|topictest|*|view||
 org.onap.dmaap.mr|viewtest|*|view||"{'org.onap.dmaap.mr|viewtest'}"
-org.onap.sdnc|access|*|*|AAF Namespace Write Access|"{'org.onap.sdnc|admin'}"
-org.onap.sdnc|access|*|read|AAF Namespace Read Access|"{'org.onap.sdnc|owner'}"
-org.onap.sdnc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
-org.onap.sdnc|odl|odl-api|*||"{'org.onap.sdnc|admin', 'org.onap.sdnc|service'}"
-org.onap.dmaap-mr.test|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-mr.test|admin'}"
-org.onap.dmaap-mr.test|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-mr.test|owner'}"
-org.onap.vfc|access|*|*|AAF Namespace Write Access|"{'org.onap.vfc|admin', 'org.onap.vfc|service'}"
-org.onap.vfc|access|*|read|AAF Namespace Read Access|"{'org.onap.vfc|owner'}"
-org.onap.vfc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
-org.onap.dmaap-bc|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-bc|admin'}"
-org.onap.dmaap-bc|access|*|read|AAF Namespace Read Access|"{'org.onap.dcae|admin', 'org.onap.dmaap-bc|owner'}"
-org.onap.dmaap-bc|certman|local|request,ignoreIPs,showpass||"{'org.onap.dmaap-bc|seeCerts', 'org.osaaf.aaf|deploy'}"
-org.onap.so|access|*|*|AAF Namespace Write Access|"{'org.onap.so|admin', 'org.onap.so|app'}"
-org.onap.so|access|*|read|AAF Namespace Read Access|"{'org.onap.so|owner'}"
-org.onap.so|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
-org.onap.oof|access|*|*|AAF Namespace Write Access|"{'org.onap.oof|admin'}"
-org.onap.oof|access|*|read|AAF Namespace Read Access|"{'org.onap.oof|owner'}"
-org.onap.oof|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
-org.onap.dmaap|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap|admin'}"
-org.onap.dmaap|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap|owner'}"
-org.osaaf.people|access|*|*|AAF Namespace Write Access|"{'org.osaaf.people|admin'}"
-org.osaaf.people|access|*|read|AAF Namespace Read Access|"{'org.osaaf.people|owner'}"
-org.onap.dcae|access|*|*|AAF Namespace Write Access|"{'org.onap.dcae|admin'}"
-org.onap.dcae|access|*|read|AAF Namespace Read Access|"{'org.onap.dcae|owner'}"
-org.onap.dcae|certman|local|request,ignoreIPs,showpass||"{'org.onap.dcae|seeCerts', 'org.osaaf.aaf|deploy'}"
-org.onap.dmaap.bc|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap.bc|admin', 'org.onap.dmaap.bc|service'}"
-org.onap.dmaap.bc|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap.bc|owner'}"
+org.onap.aai|access|*|*|AAF Namespace Write Access|"{'org.onap.aai|admin'}"
+org.onap.aai|access|*|read|AAF Namespace Read Access|"{'org.onap.aai|owner'}"
+org.onap.aai|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.aai|resources|*|delete||"{'org.onap.aai|resources_all'}"
+org.onap.aai|resources|*|get||"{'org.onap.aai|resources_all', 'org.onap.aai|resources_readonly'}"
+org.onap.aai|resources|*|patch||"{'org.onap.aai|resources_all'}"
+org.onap.aai|resources|*|post||"{'org.onap.aai|resources_all'}"
+org.onap.aai|resources|*|put||"{'org.onap.aai|resources_all'}"
+org.onap.aai|traversal|*|advanced||"{'org.onap.aai|traversal_advanced'}"
+org.onap.aai|traversal|*|basic||"{'org.onap.aai|traversal_basic'}"
 org.onap.vid|access|*|*|AAF Namespace Write Access|"{'org.onap.vid|admin'}"
 org.onap.vid|access|*|read|AAF Namespace Read Access|"{'org.onap.vid|owner'}"
 org.onap.vid|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
@@ -196,13 +214,8 @@ org.onap.vid|url|doclib|*|Document Library|"{'org.onap.vid|System_Administrator'
 org.onap.vid|url|doclib_admin|*|Document Library Admin|"{'org.onap.vid|System_Administrator'}"
 org.onap.vid|url|login|*|Login|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"
 org.onap.vid|url|view_reports|*|View Raptor reports|
-org.onap.vid1|access|*|*|AAF Namespace Write Access|"{'org.onap.vid1|admin'}"
-org.onap.vid1|access|*|read|AAF Namespace Read Access|"{'org.onap.vid1|owner'}"
-org.onap.vid1|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 org.onap.dmaapbc|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaapbc|admin'}"
 org.onap.dmaapbc|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaapbc|owner'}"
-org.onap.clamptest|access|*|*|Onap Write Access|{'org.onap.clamptest.admin'}
-org.onap.clamptest|access|*|read|Onap Read Access|{'org.onap.clamptest.owner'}
 org.onap.dmaap-bc.api|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-bc.api|admin', 'org.onap.dmaap-bc|admin'}"
 org.onap.dmaap-bc.api|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-bc.api|owner', 'org.onap.dmaap-bc|admin'}"
 org.onap.dmaap-bc.api|bridge|onapdemo|GET||"{'org.onap.dmaap-bc.api|Metrics'}"
@@ -259,31 +272,27 @@ org.onap.clamp|clds.template|dev|*||"{'org.onap.clamp|service'}"
 org.onap.clamp|clds.template|dev|read|Onap Clamp Dev Read Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|clds.admin.dev'}"
 org.onap.clamp|clds.template|dev|update|Onap Clamp Dev Update Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|clds.admin.dev'}"
 org.onap.clamp|clds.tosca|dev|*||"{'org.onap.clamp|service'}"
-org.osaaf.aaf|access|*|*|AAF Write Access|{'org.osaaf.aaf.admin'}
-org.osaaf.aaf|access|*|read,approve|AAF Read Access|{'org.osaaf.aaf.owner'}
-org.osaaf.aaf|cache|all|clear||"{'org.osaaf.aaf|admin'}"
-org.osaaf.aaf|cache|role|clear||"{'org.osaaf.aaf|admin'}"
-org.osaaf.aaf|password|*|create,reset||"{'org.osaaf.aaf|admin'}"
+org.onap.holmes|access|*|*|AAF Namespace Write Access|"{'org.onap.holmes|admin'}"
+org.onap.holmes|access|*|read|AAF Namespace Read Access|"{'org.onap.holmes|owner'}"
+org.osaaf.people|access|*|*|AAF Namespace Write Access|"{'org.osaaf.people|admin'}"
+org.osaaf.people|access|*|read|AAF Namespace Read Access|"{'org.osaaf.people|owner'}"
+org.onap.dcae|access|*|*|AAF Namespace Write Access|"{'org.onap.dcae|admin'}"
+org.onap.dcae|access|*|read|AAF Namespace Read Access|"{'org.onap.dcae|owner'}"
+org.onap.dcae|certman|local|request,ignoreIPs,showpass||"{'org.onap.dcae|seeCerts', 'org.osaaf.aaf|deploy'}"
+org.onap.dcae|dmaap.topicFactory|:com.att.dcae.dmaap.FTL.mr.topic:com.att.dcae.dmaap.FTL|create||
+org.onap.dcae|dmaap.topicFactory|:null.FTL.mr.topic:null.FTL|create||
+org.onap.dmaap.bc|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap.bc|admin', 'org.onap.dmaap.bc|service'}"
+org.onap.dmaap.bc|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap.bc|owner'}"
 org.openecomp.dmaapBC|access|*|*|DMaap Write Access|{'org.openecomp.dmaapBC.admin'}
 org.openecomp.dmaapBC|access|*|read|DMaap Read Access|{'org.openecomp.dmaapBC.owner'}
-org.onap.aai|access|*|*|AAF Namespace Write Access|"{'org.onap.aai|admin'}"
-org.onap.aai|access|*|read|AAF Namespace Read Access|"{'org.onap.aai|owner'}"
-org.onap.aai|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
-org.onap.aai|resources|*|delete||"{'org.onap.aai|resources_all'}"
-org.onap.aai|resources|*|get||"{'org.onap.aai|resources_all', 'org.onap.aai|resources_readonly'}"
-org.onap.aai|resources|*|patch||"{'org.onap.aai|resources_all'}"
-org.onap.aai|resources|*|post||"{'org.onap.aai|resources_all'}"
-org.onap.aai|resources|*|put||"{'org.onap.aai|resources_all'}"
-org.onap.aai|traversal|*|advanced||"{'org.onap.aai|traversal_advanced'}"
-org.onap.aai|traversal|*|basic||"{'org.onap.aai|traversal_basic'}"
+org.openecomp|access|*|*|OpenEcomp Write Access|{'org.openecomp.admin'}
+org.openecomp|access|*|read|OpenEcomp Read Access|{'org.openecomp.owner'}
 org.onap.pomba|access|*|*|AAF Namespace Write Access|"{'org.onap.pomba|admin'}"
 org.onap.pomba|access|*|read|AAF Namespace Read Access|"{'org.onap.pomba|owner'}"
 org.onap.pomba|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 org.onap.vid2|access|*|*|AAF Namespace Write Access|"{'org.onap.vid2|admin'}"
 org.onap.vid2|access|*|read|AAF Namespace Read Access|"{'org.onap.vid2|owner'}"
 org.onap.vid2|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
-org.openecomp|access|*|*|OpenEcomp Write Access|{'org.openecomp.admin'}
-org.openecomp|access|*|read|OpenEcomp Read Access|{'org.openecomp.owner'}
 org.onap.appc|access|*|*|AAF Namespace Write Access|"{'org.onap.appc|admin', 'org.onap.appc|service'}"
 org.onap.appc|access|*|read|AAF Namespace Read Access|"{'org.onap.appc|owner'}"
 org.onap.appc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
@@ -291,13 +300,13 @@ org.onap.appc|odl|odl-api|*|Appc ODL API Access|"{'org.onap.appc.odl', 'org.onap
 org.onap.dmaap-mr.sunil|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-mr.sunil|admin'}"
 org.onap.dmaap-mr.sunil|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-mr.sunil|owner'}"
 org.onap.dmaap-mr.sunil|test|:topic.org.onap.dmaap-bc.mr.dglTest201810100535|pub||"{'org.onap.dmaap-mr.sunil|admin2'}"
-org.onap.clampdemo|access|*|*|ClampDemo Write Access|{'org.onap.clampdemo.admin'}
-org.onap.clampdemo|access|*|read|ClampDemo Read Access|{'org.onap.clampdemo.owner'}
 org.osaaf|access|*|*|OSAAF Write Access|{'org.osaaf.admin'}
 org.osaaf|access|*|read,appove|OSAAF Read Access|{'org.osaaf.owner'}
 org.onap.dmaap-bc-topic-mgr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-bc-topic-mgr|admin'}"
 org.onap.dmaap-bc-topic-mgr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-bc-topic-mgr|owner'}"
 org.onap.dmaap-bc-topic-mgr|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.clampdemo|access|*|*|ClampDemo Write Access|{'org.onap.clampdemo.admin'}
+org.onap.clampdemo|access|*|read|ClampDemo Read Access|{'org.onap.clampdemo.owner'}
 org.onap.policy|access|*|*|AAF Namespace Write Access|"{'org.onap.policy|admin', 'org.onap.policy|pdpd.admin'}"
 org.onap.policy|access|*|read|AAF Namespace Read Access|"{'org.onap.policy|owner', 'org.onap.policy|pdpd.admin'}"
 org.onap.policy|certman|local|request,ignoreIPs,showpass||"{'org.onap.policy|seeCerts', 'org.osaaf.aaf|deploy'}"
diff --git a/auth/sample/cass_data/role.dat b/auth/sample/cass_data/role.dat
index 6efa70d..64b8d96 100644 (file)
--- a/auth/sample/cass_data/role.dat
+++ b/auth/sample/cass_data/role.dat
@@ -4,33 +4,30 @@ org.onap.vfc|service||"{'org.onap.vfc|access|*|*'}"
 org.onap.dmaap-bc|admin|AAF Namespace Administrators|"{'org.onap.dmaap-bc.api|access|*|*', 'org.onap.dmaap-bc.api|access|*|read', 'org.onap.dmaap-bc|access|*|*'}"
 org.onap.dmaap-bc|owner|AAF Namespace Owners|"{'org.onap.dmaap-bc|access|*|read'}"
 org.onap.dmaap-bc|seeCerts||"{'org.onap.dmaap-bc|certman|local|request,ignoreIPs,showpass'}"
+org.onap.dmaap-mr|Publisher||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic-1540491614|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic-1540491614|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic-1540491614|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539385466|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539385466|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539385466|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539628418|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539628418|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539628418|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539370708|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539370708|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539371800|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539371800|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539371800|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539385250|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539385250|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539385250|view'}"
+org.onap.dmaap-mr|admin|AAF Namespace Administrators|"{'org.onap.dmaap-mr|access|*|*', 'org.onap.dmaap-mr|saitest|:topic.org.onap.dmaap-bc.mr.dglTest201810100535|pub'}"
+org.onap.dmaap-mr|owner|AAF Namespace Owners|"{'org.onap.dmaap-mr|access|*|read'}"
+org.onap.dmaap-mr|sai||"{'org.onap.dmaap-mr|saitest|:topic.org.onap.dmaap-bc.mr.dglTest201810100535|pub'}"
 org.onap.sdnc|admin|AAF Namespace Administrators|"{'org.onap.sdnc|access|*|*', 'org.onap.sdnc|odl|odl-api|*'}"
 org.onap.sdnc|owner|AAF Namespace Owners|"{'org.onap.sdnc|access|*|read'}"
 org.onap.sdnc|service||"{'org.onap.sdnc|access|*|*', 'org.onap.sdnc|odl|odl-api|*'}"
 org.onap.dmaap-mr.test|admin|AAF Namespace Administrators|"{'org.onap.dmaap-mr.test|access|*|*'}"
 org.onap.dmaap-mr.test|owner|AAF Namespace Owners|"{'org.onap.dmaap-mr.test|access|*|read'}"
-org.onap.portal.test|admin|AAF Namespace Administrators|"{'org.onap.portal.test|access|*|*'}"
-org.onap.portal.test|oof-homing||
-org.onap.portal.test|owner|AAF Namespace Owners|"{'org.onap.portal.test|access|*|read'}"
-org.onap.portal.test|user1||
 org.onap.oof|admin|AAF Namespace Administrators|"{'org.onap.oof|access|*|*'}"
 org.onap.oof|owner|AAF Namespace Owners|"{'org.onap.oof|access|*|read'}"
 org.onap.oof|service||"{'org.onap.oof|access|*|*'}"
-org.onap.dmaap-dr|admin|AAF Namespace Administrators|"{'org.onap.dmaap-dr|access|*|*'}"
-org.onap.dmaap-dr|owner|AAF Namespace Owners|"{'org.onap.dmaap-dr|access|*|read'}"
-org.onap.dmaap-dr|seeCerts||"{'org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass'}"
-org.onap.dmaap-mr|Publisher||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic-1540491614|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic-1540491614|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic-1540491614|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aSimpleTopic|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539385466|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539385466|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539385466|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539628418|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539628418|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aafIntegTest-1539628418|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539370708|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539370708|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539371800|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539371800|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539371800|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539385250|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539385250|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.dglTest1539385250|view'}"
-org.onap.dmaap-mr|admin|AAF Namespace Administrators|"{'org.onap.dmaap-mr|access|*|*', 'org.onap.dmaap-mr|saitest|:topic.org.onap.dmaap-bc.mr.dglTest201810100535|pub'}"
-org.onap.dmaap-mr|owner|AAF Namespace Owners|"{'org.onap.dmaap-mr|access|*|read'}"
-org.onap.dmaap-mr|sai||"{'org.onap.dmaap-mr|saitest|:topic.org.onap.dmaap-bc.mr.dglTest201810100535|pub'}"
 org.onap.dmaap-bc-mm-prov|admin|AAF Namespace Administrators|"{'org.onap.dmaap-bc-mm-prov|access|*|*'}"
 org.onap.dmaap-bc-mm-prov|owner|AAF Namespace Owners|"{'org.onap.dmaap-bc-mm-prov|access|*|read'}"
 org.onap.sdc|ADMIN|ADMIN|
 org.onap.sdc|Account_Administrator||
 org.onap.sdc|TESTOR|TESTOR|
-org.onap.sdc|admin|AAF Namespace Administrators|"{'org.onap.sdc|access|*|*'}"
+org.onap.sdc|admin|AAF Namespace Administrators|"{'org.onap.sdc|access|*|*', 'org.onap.sdc|administrator.access|*|*'}"
 org.onap.sdc|app|app|
+org.onap.sdc|designer||"{'org.onap.sdc|designer.access|*|*'}"
+org.onap.sdc|governor||"{'org.onap.sdc|governance.access|*|*'}"
+org.onap.sdc|ops||"{'org.onap.sdc|operations.access|*|*'}"
 org.onap.sdc|owner|AAF Namespace Owners|"{'org.onap.sdc|access|*|read'}"
+org.onap.sdc|tester||"{'org.onap.sdc|tester.access|*|*'}"
 org|admin|Org Admins|"{'org.access|*|*'}"
 org|owner|Org Owners|"{'org.access|*|read,approve'}"
 org.onap.portal|Account_Administrator|Account Administrator|"{'org.onap.portal|menu|menu_acc_admin|*', 'org.onap.portal|url|centralizedApps|*', 'org.onap.portal|url|getAdminNotifications|*', 'org.onap.portal|url|getAllWebAnalytics|*', 'org.onap.portal|url|getFunctionalMenuRole|*', 'org.onap.portal|url|getNotificationAppRoles|*', 'org.onap.portal|url|getUserAppsWebAnalytics|*', 'org.onap.portal|url|getUserJourneyAnalyticsReport|*', 'org.onap.portal|url|get_role_functions%2f%2a|*', 'org.onap.portal|url|get_roles%2f%2a|*', 'org.onap.portal|url|notification_code|*', 'org.onap.portal|url|role_function_list%2fsaveRoleFunction%2f%2a|*', 'org.onap.portal|url|syncRoles|*', 'org.onap.portal|url|userAppRoles|*', 'org.onap.portal|url|userApps|*'}"
@@ -42,13 +39,17 @@ org.onap.portal|System_Administrator|System Administrator|"{'org.onap.portal|men
 org.onap.portal|Usage_Analyst|Usage Analyst|"{'org.onap.portal|menu|menu_admin|*', 'org.onap.portal|menu|menu_task_search|*', 'org.onap.portal|menu|menu_task|*', 'org.onap.portal|menu|menu_web_analytics|*'}"
 org.onap.portal|admin|Portal Admins|"{'org.onap.portal.access|*|*'}"
 org.onap.portal|owner|Portal Owner|"{'org.onap.portal.access|*|read'}"
-org.onap.so|admin|AAF Namespace Administrators|"{'org.onap.so|access|*|*'}"
-org.onap.so|app||"{'org.onap.so|access|*|*'}"
-org.onap.so|owner|AAF Namespace Owners|"{'org.onap.so|access|*|read'}"
+org.onap.portal.test|admin|AAF Namespace Administrators|"{'org.onap.portal.test|access|*|*'}"
+org.onap.portal.test|oof-homing||
+org.onap.portal.test|owner|AAF Namespace Owners|"{'org.onap.portal.test|access|*|read'}"
+org.onap.portal.test|user1||
 org.onap|admin|Onap Admins|"{'org.onap.access|*|*'}"
 org.onap|owner|onap Owners|"{'org.onap.access|*|read'}"
-org.onap.dmaap|admin|AAF Namespace Administrators|"{'org.onap.dmaap|access|*|*'}"
-org.onap.dmaap|owner|AAF Namespace Owners|"{'org.onap.dmaap|access|*|read'}"
+org.onap.vid1|admin|AAF Namespace Administrators|"{'org.onap.vid1|access|*|*'}"
+org.onap.vid1|owner|AAF Namespace Owners|"{'org.onap.vid1|access|*|read'}"
+org.onap.dmaap-dr|admin|AAF Namespace Administrators|"{'org.onap.dmaap-dr|access|*|*'}"
+org.onap.dmaap-dr|owner|AAF Namespace Owners|"{'org.onap.dmaap-dr|access|*|read'}"
+org.onap.dmaap-dr|seeCerts||"{'org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass'}"
 org.onap.dmaap.mr|PNF_READY.pub||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.PolandSpring1540393649|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.PolandSpring1540393649|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.PolandSpring1540398384|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.PolandSpring1540398384|view', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.PolandSpring1540398410|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.PolandSpring1540398410|view'}"
 org.onap.dmaap.mr|PNF_READY.sub||
 org.onap.dmaap.mr|PNF_REGISTRATION.pub||
@@ -64,6 +65,34 @@ org.onap.dmaap.mr|service||"{'org.onap.dmaap.mr|access|*|read'}"
 org.onap.dmaap.mr|test1||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.test1|pub'}"
 org.onap.dmaap.mr|view||"{'org.onap.dmaap.mr|topic|*|view'}"
 org.onap.dmaap.mr|viewtest||"{'org.onap.dmaap.mr|viewtest|*|view'}"
+org.onap.clamptest|admin|Onap Clamp Test  Admins|"{'org.onap.clamptest.access|*|*'}"
+org.onap.clamptest|owner|onap clamp Test Owners|"{'org.onap.clamptest.access|*|read'}"
+org.osaaf.people|admin|AAF Namespace Administrators|"{'org.osaaf.people|access|*|*'}"
+org.osaaf.people|owner|AAF Namespace Owners|"{'org.osaaf.people|access|*|read'}"
+org.onap.dcae|admin|AAF Namespace Administrators|"{'org.onap.dcae|access|*|*', 'org.onap.dmaap-bc|access|*|read'}"
+org.onap.dcae|owner|AAF Namespace Owners|"{'org.onap.dcae|access|*|read'}"
+org.onap.dcae|pnfPublisher||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|view'}"
+org.onap.dcae|pnfSubscriber||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|view'}"
+org.onap.dcae|seeCerts||"{'org.onap.dcae|certman|local|request,ignoreIPs,showpass'}"
+org.onap.dmaap.bc|admin|AAF Namespace Administrators|"{'org.onap.dmaap.bc|access|*|*'}"
+org.onap.dmaap.bc|owner|AAF Namespace Owners|"{'org.onap.dmaap.bc|access|*|read'}"
+org.onap.dmaap.bc|service||"{'org.onap.dmaap.bc|access|*|*'}"
+org.osaaf.aaf|admin|AAF Admins|"{'org.osaaf.aaf.access|*|*', 'org.osaaf.aaf|cache|all|clear', 'org.osaaf.aaf|cache|role|clear', 'org.osaaf.aaf|password|*|create,reset'}"
+org.osaaf.aaf|deploy|ONAP Deployment Role|"{'org.onap.aaf-sms|certman|local|request,ignoreIPs,showpass', 'org.onap.aai|certman|local|request,ignoreIPs,showpass', 'org.onap.appc|certman|local|request,ignoreIPs,showpass', 'org.onap.clamp|certman|local|request,ignoreIPs,showpass', 'org.onap.dcae|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-bc-mm-prov|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-bc-topic-mgr|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-bc|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-mr|certman|local|request,ignoreIPs,showpass', 'org.onap.oof|certman|local|request,ignoreIPs,showpass', 'org.onap.policy|certman|local|request,ignoreIPs,showpass', 'org.onap.pomba|certman|local|request,ignoreIPs,showpass', 'org.onap.portal|certman|local|request,ignoreIPs,showpass', 'org.onap.sdc|certman|local|request,ignoreIPs,showpass', 'org.onap.sdnc|certman|local|request,ignoreIPs,showpass', 'org.onap.so|certman|local|request,ignoreIPs,showpass', 'org.onap.vfc|certman|local|request,ignoreIPs,showpass', 'org.onap.vid1|certman|local|request,ignoreIPs,showpass', 'org.onap.vid2|certman|local|request,ignoreIPs,showpass', 'org.onap.vid|certman|local|request,ignoreIPs,showpass'}"
+org.osaaf.aaf|owner|AAF Owners|"{'org.osaaf.aaf.access|*|read,approve'}"
+org.osaaf.aaf|service||
+org.onap.so|admin|AAF Namespace Administrators|"{'org.onap.so|access|*|*'}"
+org.onap.so|app||"{'org.onap.so|access|*|*'}"
+org.onap.so|owner|AAF Namespace Owners|"{'org.onap.so|access|*|read'}"
+org.onap.dmaap|admin|AAF Namespace Administrators|"{'org.onap.dmaap|access|*|*'}"
+org.onap.dmaap|owner|AAF Namespace Owners|"{'org.onap.dmaap|access|*|read'}"
+org.onap.aai|Account_Administrator||
+org.onap.aai|admin|AAF Namespace Administrators|"{'org.onap.aai|access|*|*'}"
+org.onap.aai|owner|AAF Namespace Owners|"{'org.onap.aai|access|*|read'}"
+org.onap.aai|resources_all|resources_all|"{'org.onap.aai|resources|*|delete', 'org.onap.aai|resources|*|get', 'org.onap.aai|resources|*|patch', 'org.onap.aai|resources|*|post', 'org.onap.aai|resources|*|put'}"
+org.onap.aai|resources_readonly|resources_readonly|"{'org.onap.aai|resources|*|get'}"
+org.onap.aai|traversal_advanced|traversal_advanced|"{'org.onap.aai|traversal|*|advanced'}"
+org.onap.aai|traversal_basic|traversal_basic|"{'org.onap.aai|traversal|*|basic'}"
 org.onap.vid|Account_Administrator||
 org.onap.vid|Demonstration___gNB||
 org.onap.vid|Demonstration___vCPE||
@@ -78,8 +107,8 @@ org.onap.vid|member|member|
 org.onap.vid|owner|AAF Namespace Owners|"{'org.onap.vid|access|*|read'}"
 org.onap.vid|seeCerts|seeCerts|
 org.onap.vid|service|service|
-org.onap.vid1|admin|AAF Namespace Administrators|"{'org.onap.vid1|access|*|*'}"
-org.onap.vid1|owner|AAF Namespace Owners|"{'org.onap.vid1|access|*|read'}"
+org.openecomp|admin|OpenEcomp Admins|"{'org.openecomp.access|*|*'}"
+org.openecomp|owner|OpenEcomp Owners|"{'org.openecomp.access|*|read'}"
 org.onap.dmaap-bc.api|Controller||"{'org.onap.dmaap-bc.api|dcaeLocations|onapdemo|DELETE', 'org.onap.dmaap-bc.api|dcaeLocations|onapdemo|GET', 'org.onap.dmaap-bc.api|dcaeLocations|onapdemo|POST', 'org.onap.dmaap-bc.api|dcaeLocations|onapdemo|PUT', 'org.onap.dmaap-bc.api|dmaap|boot|DELETE', 'org.onap.dmaap-bc.api|dmaap|boot|GET', 'org.onap.dmaap-bc.api|dmaap|boot|POST', 'org.onap.dmaap-bc.api|dmaap|boot|PUT', 'org.onap.dmaap-bc.api|dmaap|onapdemo|DELETE', 'org.onap.dmaap-bc.api|dmaap|onapdemo|GET', 'org.onap.dmaap-bc.api|dmaap|onapdemo|POST', 'org.onap.dmaap-bc.api|dmaap|onapdemo|PUT', 'org.onap.dmaap-bc.api|dr_nodes|onapdemo|DELETE', 'org.onap.dmaap-bc.api|dr_nodes|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_nodes|onapdemo|POST', 'org.onap.dmaap-bc.api|dr_nodes|onapdemo|PUT', 'org.onap.dmaap-bc.api|dr_pubs|onapdemo|DELETE', 'org.onap.dmaap-bc.api|dr_pubs|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_pubs|onapdemo|POST', 'org.onap.dmaap-bc.api|dr_pubs|onapdemo|PUT', 'org.onap.dmaap-bc.api|dr_subs|onapdemo|DELETE', 'org.onap.dmaap-bc.api|dr_subs|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_subs|onapdemo|POST', 'org.onap.dmaap-bc.api|dr_subs|onapdemo|PUT', 'org.onap.dmaap-bc.api|feeds|onapdemo|DELETE', 'org.onap.dmaap-bc.api|feeds|onapdemo|GET', 'org.onap.dmaap-bc.api|feeds|onapdemo|POST', 'org.onap.dmaap-bc.api|feeds|onapdemo|PUT', 'org.onap.dmaap-bc.api|mr_clients|onapdemo|DELETE', 'org.onap.dmaap-bc.api|mr_clients|onapdemo|GET', 'org.onap.dmaap-bc.api|mr_clients|onapdemo|POST', 'org.onap.dmaap-bc.api|mr_clients|onapdemo|PUT', 'org.onap.dmaap-bc.api|mr_clusters|onapdemo|DELETE', 'org.onap.dmaap-bc.api|mr_clusters|onapdemo|GET', 'org.onap.dmaap-bc.api|mr_clusters|onapdemo|POST', 'org.onap.dmaap-bc.api|mr_clusters|onapdemo|PUT', 'org.onap.dmaap-bc.api|topics|onapdemo|DELETE', 'org.onap.dmaap-bc.api|topics|onapdemo|GET', 'org.onap.dmaap-bc.api|topics|onapdemo|POST', 'org.onap.dmaap-bc.api|topics|onapdemo|PUT'}"
 org.onap.dmaap-bc.api|Inventory||"{'org.onap.dmaap-bc.api|dcaeLocations|onapdemo|GET', 'org.onap.dmaap-bc.api|dmaap|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_nodes|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_pubs|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_subs|onapdemo|GET', 'org.onap.dmaap-bc.api|feeds|onapdemo|GET', 'org.onap.dmaap-bc.api|mr_clients|onapdemo|GET', 'org.onap.dmaap-bc.api|mr_clusters|onapdemo|GET', 'org.onap.dmaap-bc.api|topics|onapdemo|GET'}"
 org.onap.dmaap-bc.api|Metrics||"{'org.onap.dmaap-bc.api|bridge|onapdemo|GET', 'org.onap.dmaap-bc.api|dcaeLocations|onapdemo|GET', 'org.onap.dmaap-bc.api|dmaap|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_pubs|onapdemo|GET', 'org.onap.dmaap-bc.api|dr_subs|onapdemo|GET', 'org.onap.dmaap-bc.api|feeds|onapdemo|GET', 'org.onap.dmaap-bc.api|mr_clients|onapdemo|GET', 'org.onap.dmaap-bc.api|mr_clusters|onapdemo|GET', 'org.onap.dmaap-bc.api|topics|onapdemo|GET'}"
@@ -93,32 +122,17 @@ org.onap.clamp|clds.designer.dev|Onap clamp  Designer Dev|"{'org.onap.clamp.clds
 org.onap.clamp|clds.vf_filter_all.dev|Onap clamp Filter All Dev|"{'org.onap.clamp.clds.filter.vf|dev|*'}"
 org.onap.clamp|owner|AAF Namespace Owners|
 org.onap.clamp|service||"{'org.onap.clamp|access|*|*', 'org.onap.clamp|clds.cl.manage|dev|*', 'org.onap.clamp|clds.cl|dev|*', 'org.onap.clamp|clds.filter.vf|dev|*', 'org.onap.clamp|clds.template|dev|*', 'org.onap.clamp|clds.tosca|dev|*'}"
-org.onap.clamptest|admin|Onap Clamp Test  Admins|"{'org.onap.clamptest.access|*|*'}"
-org.onap.clamptest|owner|onap clamp Test Owners|"{'org.onap.clamptest.access|*|read'}"
 org.onap.dmaapbc|admin|AAF Namespace Administrators|"{'org.onap.dmaapbc|access|*|*'}"
 org.onap.dmaapbc|owner|AAF Namespace Owners|"{'org.onap.dmaapbc|access|*|read'}"
+org.onap.holmes|admin|AAF Namespace Administrators|"{'org.onap.holmes|access|*|*'}"
+org.onap.holmes|owner|AAF Namespace Owners|"{'org.onap.holmes|access|*|read'}"
+org.onap.holmes|service||
 org.openecomp.dmaapBC|admin|AAF Admins|"{'org.openecomp.dmaapBC.access|*|*', 'org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|pub', 'org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|sub', 'org.openecomp.dmaapBC.topicFactory|:org.openecomp.dmaapBC.topic:org.openecomp.dmaapBC|create'}"
 org.openecomp.dmaapBC|owner|AAF Owners|"{'org.openecomp.dmaapBC.access|*|read'}"
-org.osaaf.aaf|admin|AAF Admins|"{'org.osaaf.aaf.access|*|*', 'org.osaaf.aaf|cache|all|clear', 'org.osaaf.aaf|cache|role|clear', 'org.osaaf.aaf|password|*|create,reset'}"
-org.osaaf.aaf|deploy|ONAP Deployment Role|"{'org.onap.aaf-sms|certman|local|request,ignoreIPs,showpass', 'org.onap.aai|certman|local|request,ignoreIPs,showpass', 'org.onap.appc|certman|local|request,ignoreIPs,showpass', 'org.onap.clamp|certman|local|request,ignoreIPs,showpass', 'org.onap.dcae|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-bc-mm-prov|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-bc-topic-mgr|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-bc|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass', 'org.onap.dmaap-mr|certman|local|request,ignoreIPs,showpass', 'org.onap.oof|certman|local|request,ignoreIPs,showpass', 'org.onap.policy|certman|local|request,ignoreIPs,showpass', 'org.onap.pomba|certman|local|request,ignoreIPs,showpass', 'org.onap.portal|certman|local|request,ignoreIPs,showpass', 'org.onap.sdc|certman|local|request,ignoreIPs,showpass', 'org.onap.sdnc|certman|local|request,ignoreIPs,showpass', 'org.onap.so|certman|local|request,ignoreIPs,showpass', 'org.onap.vfc|certman|local|request,ignoreIPs,showpass', 'org.onap.vid1|certman|local|request,ignoreIPs,showpass', 'org.onap.vid2|certman|local|request,ignoreIPs,showpass', 'org.onap.vid|certman|local|request,ignoreIPs,showpass'}"
-org.osaaf.aaf|owner|AAF Owners|"{'org.osaaf.aaf.access|*|read,approve'}"
-org.osaaf.aaf|service||
 org.onap.pomba|admin|AAF Namespace Administrators|"{'org.onap.pomba|access|*|*'}"
 org.onap.pomba|owner|AAF Namespace Owners|"{'org.onap.pomba|access|*|read'}"
-org.onap.aai|Account_Administrator||
-org.onap.aai|admin|AAF Namespace Administrators|"{'org.onap.aai|access|*|*'}"
-org.onap.aai|owner|AAF Namespace Owners|"{'org.onap.aai|access|*|read'}"
-org.onap.aai|resources_all|resources_all|"{'org.onap.aai|resources|*|delete', 'org.onap.aai|resources|*|get', 'org.onap.aai|resources|*|patch', 'org.onap.aai|resources|*|post', 'org.onap.aai|resources|*|put'}"
-org.onap.aai|resources_readonly|resources_readonly|"{'org.onap.aai|resources|*|get'}"
-org.onap.aai|traversal_advanced|traversal_advanced|"{'org.onap.aai|traversal|*|advanced'}"
-org.onap.aai|traversal_basic|traversal_basic|"{'org.onap.aai|traversal|*|basic'}"
 org.onap.vid2|admin|AAF Namespace Administrators|"{'org.onap.vid2|access|*|*'}"
 org.onap.vid2|owner|AAF Namespace Owners|"{'org.onap.vid2|access|*|read'}"
-org.osaaf|admin|OSAAF Admins|"{'org.osaaf.access|*|*'}"
-org.osaaf|owner|OSAAF Owners|"{'org.osaaf.access|*|read,approve'}"
-org.onap.dmaap-bc-topic-mgr|admin|AAF Namespace Administrators|"{'org.onap.dmaap-bc-topic-mgr|access|*|*'}"
-org.onap.dmaap-bc-topic-mgr|client||"{'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|create', 'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|destroy'}"
-org.onap.dmaap-bc-topic-mgr|owner|AAF Namespace Owners|"{'org.onap.dmaap-bc-topic-mgr|access|*|read'}"
 org.onap.appc|admin|AAF Namespace Administrators|"{'org.onap.appc|access|*|*'}"
 org.onap.appc|odl|Onap APPC ODL  Admins|"{'org.onap.appc.odl|odl-api|*'}"
 org.onap.appc|owner|AAF Namespace Owners|"{'org.onap.appc|access|*|read'}"
@@ -126,6 +140,11 @@ org.onap.appc|service||"{'org.onap.appc|access|*|*'}"
 org.onap.dmaap-mr.sunil|admin|AAF Namespace Administrators|"{'org.onap.dmaap-mr.sunil|access|*|*'}"
 org.onap.dmaap-mr.sunil|admin2||"{'org.onap.dmaap-mr.sunil|test|:topic.org.onap.dmaap-bc.mr.dglTest201810100535|pub'}"
 org.onap.dmaap-mr.sunil|owner|AAF Namespace Owners|"{'org.onap.dmaap-mr.sunil|access|*|read'}"
+org.osaaf|admin|OSAAF Admins|"{'org.osaaf.access|*|*'}"
+org.osaaf|owner|OSAAF Owners|"{'org.osaaf.access|*|read,approve'}"
+org.onap.dmaap-bc-topic-mgr|admin|AAF Namespace Administrators|"{'org.onap.dmaap-bc-topic-mgr|access|*|*'}"
+org.onap.dmaap-bc-topic-mgr|client||"{'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|create', 'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|destroy'}"
+org.onap.dmaap-bc-topic-mgr|owner|AAF Namespace Owners|"{'org.onap.dmaap-bc-topic-mgr|access|*|read'}"
 org.onap.clampdemo|admin|Onap Clamp Test  Admins|"{'org.onap.clampdemo.access|*|*'}"
 org.onap.clampdemo|owner|onap clamp Test Owners|"{'org.onap.clampdemo.access|*|read'}"
 org.onap.policy|Account_Administrator|null|
@@ -146,15 +165,3 @@ org.onap.policy|seeCerts|seeCerts|"{'org.onap.policy|certman|local|request,ignor
 org.onap.aaf-sms|admin|AAF Namespace Administrators|"{'org.onap.aaf-sms|access|*|*'}"
 org.onap.aaf-sms|owner|AAF Namespace Owners|"{'org.onap.aaf-sms|access|*|read'}"
 org.onap.aaf-sms|service||"{'org.onap.aaf-sms|access|*|read'}"
-org.osaaf.people|admin|AAF Namespace Administrators|"{'org.osaaf.people|access|*|*'}"
-org.osaaf.people|owner|AAF Namespace Owners|"{'org.osaaf.people|access|*|read'}"
-org.onap.dcae|admin|AAF Namespace Administrators|"{'org.onap.dcae|access|*|*', 'org.onap.dmaap-bc|access|*|read'}"
-org.onap.dcae|owner|AAF Namespace Owners|"{'org.onap.dcae|access|*|read'}"
-org.onap.dcae|pnfPublisher||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|pub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|view'}"
-org.onap.dcae|pnfSubscriber||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|sub', 'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.aPnfTopic-1540492548|view'}"
-org.onap.dcae|seeCerts||"{'org.onap.dcae|certman|local|request,ignoreIPs,showpass'}"
-org.openecomp|admin|OpenEcomp Admins|"{'org.openecomp.access|*|*'}"
-org.openecomp|owner|OpenEcomp Owners|"{'org.openecomp.access|*|read'}"
-org.onap.dmaap.bc|admin|AAF Namespace Administrators|"{'org.onap.dmaap.bc|access|*|*'}"
-org.onap.dmaap.bc|owner|AAF Namespace Owners|"{'org.onap.dmaap.bc|access|*|read'}"
-org.onap.dmaap.bc|service||"{'org.onap.dmaap.bc|access|*|*'}"
diff --git a/auth/sample/cass_data/user_role.dat b/auth/sample/cass_data/user_role.dat
index 47bb967..5e81670 100644 (file)
--- a/auth/sample/cass_data/user_role.dat
+++ b/auth/sample/cass_data/user_role.dat
@@ -1,199 +1,195 @@
-mmanager@people.osaaf.org|org.onap.aaf-sms.admin|2019-05-13 09:56:44.000+0000|org.onap.aaf-sms|admin
-mmanager@people.osaaf.org|org.onap.aaf-sms.owner|2019-05-13 09:56:44.000+0000|org.onap.aaf-sms|owner
-mmanager@people.osaaf.org|org.onap.aai.admin|2019-05-13 09:56:44.000+0000|org.onap.aai|admin
-mmanager@people.osaaf.org|org.onap.aai.owner|2019-05-13 09:56:44.000+0000|org.onap.aai|owner
-mmanager@people.osaaf.org|org.onap.admin|2019-05-13 09:56:44.000+0000|org.onap|admin
-mmanager@people.osaaf.org|org.onap.appc.admin|2019-05-13 09:56:44.000+0000|org.onap.appc|admin
-mmanager@people.osaaf.org|org.onap.appc.owner|2019-05-13 09:56:44.000+0000|org.onap.appc|owner
-mmanager@people.osaaf.org|org.onap.clamp.admin|2019-05-13 09:56:44.000+0000|org.onap.clamp|admin
-mmanager@people.osaaf.org|org.onap.clamp.owner|2019-05-13 09:56:44.000+0000|org.onap.clamp|owner
-mmanager@people.osaaf.org|org.onap.dcae.admin|2019-05-13 09:56:44.000+0000|org.onap.dcae|admin
-mmanager@people.osaaf.org|org.onap.dcae.owner|2019-05-13 09:56:44.000+0000|org.onap.dcae|owner
-mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc-mm-prov|admin
-mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc-mm-prov|owner
-mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc-topic-mgr|admin
-mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc-topic-mgr|owner
-mmanager@people.osaaf.org|org.onap.dmaap-bc.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc|admin
-mmanager@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc.api|Controller
-mmanager@people.osaaf.org|org.onap.dmaap-bc.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc|owner
-mmanager@people.osaaf.org|org.onap.dmaap-dr.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap-dr|owner
-mmanager@people.osaaf.org|org.onap.dmaap-mr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr|admin
-mmanager@people.osaaf.org|org.onap.dmaap-mr.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr|owner
-mmanager@people.osaaf.org|org.onap.dmaap.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap|admin
-mmanager@people.osaaf.org|org.onap.dmaap.mr.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|owner
-mmanager@people.osaaf.org|org.onap.dmaap.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap|owner
-mmanager@people.osaaf.org|org.onap.oof.admin|2019-05-13 09:56:44.000+0000|org.onap.oof|admin
-mmanager@people.osaaf.org|org.onap.oof.owner|2019-05-13 09:56:44.000+0000|org.onap.oof|owner
-mmanager@people.osaaf.org|org.onap.owner|2019-05-13 09:56:44.000+0000|org.onap|owner
-mmanager@people.osaaf.org|org.onap.policy.owner|2019-05-13 09:56:44.000+0000|org.onap.policy|owner
-mmanager@people.osaaf.org|org.onap.pomba.admin|2019-05-13 09:56:44.000+0000|org.onap.pomba|admin
-mmanager@people.osaaf.org|org.onap.pomba.owner|2019-05-13 09:56:44.000+0000|org.onap.pomba|owner
-mmanager@people.osaaf.org|org.onap.portal.admin|2019-05-13 09:56:44.000+0000|org.onap.portal|admin
-mmanager@people.osaaf.org|org.onap.portal.owner|2019-05-13 09:56:44.000+0000|org.onap.portal|owner
-mmanager@people.osaaf.org|org.onap.sdc.admin|2019-05-13 09:56:44.000+0000|org.onap.sdc|admin
-mmanager@people.osaaf.org|org.onap.sdc.owner|2019-05-13 09:56:44.000+0000|org.onap.sdc|owner
-mmanager@people.osaaf.org|org.onap.sdnc.admin|2019-05-13 09:56:44.000+0000|org.onap.sdnc|admin
-mmanager@people.osaaf.org|org.onap.sdnc.owner|2019-05-13 09:56:44.000+0000|org.onap.sdnc|owner
-mmanager@people.osaaf.org|org.onap.so.admin|2019-05-13 09:56:44.000+0000|org.onap.so|admin
-mmanager@people.osaaf.org|org.onap.so.owner|2019-05-13 09:56:44.000+0000|org.onap.so|owner
-mmanager@people.osaaf.org|org.onap.vfc.admin|2019-05-13 09:56:44.000+0000|org.onap.vfc|admin
-mmanager@people.osaaf.org|org.onap.vfc.owner|2019-05-13 09:56:44.000+0000|org.onap.vfc|owner
-mmanager@people.osaaf.org|org.onap.vid.admin|2019-05-13 09:56:44.000+0000|org.onap.vid|admin
-mmanager@people.osaaf.org|org.onap.vid.owner|2019-05-13 09:56:44.000+0000|org.onap.vid|owner
-mmanager@people.osaaf.org|org.onap.vid1.admin|2019-05-13 09:56:44.000+0000|org.onap.vid1|admin
-mmanager@people.osaaf.org|org.onap.vid1.owner|2019-05-13 09:56:44.000+0000|org.onap.vid1|owner
-mmanager@people.osaaf.org|org.onap.vid2.admin|2019-05-13 09:56:44.000+0000|org.onap.vid2|admin
-mmanager@people.osaaf.org|org.onap.vid2.owner|2019-05-13 09:56:44.000+0000|org.onap.vid2|owner
-mmanager@people.osaaf.org|org.osaaf.people.owner|2019-05-13 09:56:44.000+0000|org.osaaf.people|owner
-shi@portal.onap.org|org.onap.portal.admin|2019-05-13 09:56:44.000+0000|org.onap.portal|admin
-demo@people.osaaf.org|org.onap.aai.Account_Administrator|2019-05-13 09:56:44.000+0000|org.onap.aai|Account_Administrator
-demo@people.osaaf.org|org.onap.aai.resources_readonly|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_readonly
-demo@people.osaaf.org|org.onap.aai.traversal_basic|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_basic
-demo@people.osaaf.org|org.onap.dcae.pnfPublisher|2019-05-13 09:56:44.000+0000|org.onap.dcae|pnfPublisher
-demo@people.osaaf.org|org.onap.dcae.pnfSubscriber|2019-05-13 09:56:44.000+0000|org.onap.dcae|pnfSubscriber
-demo@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc.api|Controller
-demo@people.osaaf.org|org.onap.dmaap.mr.create|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|create
-demo@people.osaaf.org|org.onap.dmaap.mr.destroy|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|destroy
-demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|mrtesttopic.pub
-demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
-demo@people.osaaf.org|org.onap.dmaap.mr.view|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|view
-demo@people.osaaf.org|org.onap.policy.Account_Administrator|2019-05-13 09:56:44.000+0000|org.onap.policy|Account_Administrator
-demo@people.osaaf.org|org.onap.policy.System_Administrator|2019-05-13 09:56:44.000+0000|org.onap.policy|System_Administrator
-demo@people.osaaf.org|org.onap.policy.pdpd.admin|2019-05-13 09:56:44.000+0000|org.onap.policy|pdpd.admin
-demo@people.osaaf.org|org.onap.policy.pdpx.admin|2019-05-13 09:56:44.000+0000|org.onap.policy|pdpx.admin
-demo@people.osaaf.org|org.onap.portal.Account_Administrator|2019-05-13 09:56:44.000+0000|org.onap.portal|Account_Administrator
-demo@people.osaaf.org|org.onap.portal.System_Administrator|2019-05-13 09:56:44.000+0000|org.onap.portal|System_Administrator
-demo@people.osaaf.org|org.onap.portal.admin|2019-05-13 09:56:44.000+0000|org.onap.portal|admin
-demo@people.osaaf.org|org.onap.portal.test.admin|2019-05-13 09:56:44.000+0000|org.onap.portal.test|admin
-demo@people.osaaf.org|org.onap.portal.test.owner|2019-05-13 09:56:44.000+0000|org.onap.portal.test|owner
-demo@people.osaaf.org|org.onap.portal.test.user1|2019-05-13 09:56:44.000+0000|org.onap.portal.test|user1
-demo@people.osaaf.org|org.onap.sdc.ADMIN|2019-05-13 09:56:44.000+0000|org.onap.sdc|ADMIN
-demo@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-05-13 09:56:44.000+0000|org.onap.sdc|Account_Administrator
-demo@people.osaaf.org|org.onap.vid.Account_Administrator|2019-05-13 09:56:44.000+0000|org.onap.vid|Account_Administrator
-demo@people.osaaf.org|org.onap.vid.Demonstration___gNB|2019-05-13 09:56:44.000+0000|org.onap.vid|Demonstration___gNB
-demo@people.osaaf.org|org.onap.vid.Demonstration___vCPE|2019-05-13 09:56:44.000+0000|org.onap.vid|Demonstration___vCPE
-demo@people.osaaf.org|org.onap.vid.Demonstration___vFW|2019-05-13 09:56:44.000+0000|org.onap.vid|Demonstration___vFW
-demo@people.osaaf.org|org.onap.vid.Demonstration___vFWCL|2019-05-13 09:56:44.000+0000|org.onap.vid|Demonstration___vFWCL
-demo@people.osaaf.org|org.onap.vid.Demonstration___vIMS|2019-05-13 09:56:44.000+0000|org.onap.vid|Demonstration___vIMS
-demo@people.osaaf.org|org.onap.vid.Demonstration___vLB|2019-05-13 09:56:44.000+0000|org.onap.vid|Demonstration___vLB
-demo@people.osaaf.org|org.onap.vid.System_Administrator|2019-05-13 09:56:44.000+0000|org.onap.vid|System_Administrator
-demo@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|view
-jh0003@people.osaaf.org|org.onap.portal.admin|2019-05-13 09:56:44.000+0000|org.onap.portal|admin
-jh0003@people.osaaf.org|org.onap.sdc.ADMIN|2019-05-13 09:56:44.000+0000|org.onap.sdc|ADMIN
-jh0003@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-05-13 09:56:44.000+0000|org.onap.sdc|Account_Administrator
-cs0008@people.osaaf.org|org.onap.sdc.TESTOR|2019-05-13 09:56:44.000+0000|org.onap.sdc|TESTOR
-jm0007@people.osaaf.org|org.onap.sdc.TESTOR|2019-05-13 09:56:44.000+0000|org.onap.sdc|TESTOR
-op0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-05-13 09:56:44.000+0000|org.onap.sdc|TESTOR
-gv0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-05-13 09:56:44.000+0000|org.onap.sdc|TESTOR
-pm0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-05-13 09:56:44.000+0000|org.onap.sdc|TESTOR
-ps0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-05-13 09:56:44.000+0000|org.onap.sdc|TESTOR
-aaf_admin@people.osaaf.org|org.onap.aai.admin|2019-05-13 09:56:44.000+0000|org.onap.aai|admin
-aaf_admin@people.osaaf.org|org.onap.appc.admin|2019-05-13 09:56:44.000+0000|org.onap.appc|admin
-aaf_admin@people.osaaf.org|org.onap.clamp.admin|2019-05-13 09:56:44.000+0000|org.onap.clamp|admin
-aaf_admin@people.osaaf.org|org.onap.dcae.admin|2019-05-13 09:56:44.000+0000|org.onap.dcae|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc-mm-prov|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc-topic-mgr|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc.api|Controller
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc.api|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-dr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-dr|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-mr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-mr.sunil.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr.sunil|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-mr.sunil.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr.sunil|owner
-aaf_admin@people.osaaf.org|org.onap.dmaap-mr.test.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr.test|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-mr.test.owner|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr.test|owner
-aaf_admin@people.osaaf.org|org.onap.dmaap.mr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
-aaf_admin@people.osaaf.org|org.onap.dmaap.mr.test1|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|test1
-aaf_admin@people.osaaf.org|org.onap.oof.admin|2019-05-13 09:56:44.000+0000|org.onap.oof|admin
-aaf_admin@people.osaaf.org|org.onap.policy.admin|2019-05-13 09:56:44.000+0000|org.onap.policy|admin
-aaf_admin@people.osaaf.org|org.onap.pomba.admin|2019-05-13 09:56:44.000+0000|org.onap.pomba|admin
-aaf_admin@people.osaaf.org|org.onap.portal.admin|2019-05-13 09:56:44.000+0000|org.onap.portal|admin
-aaf_admin@people.osaaf.org|org.onap.sdc.admin|2019-05-13 09:56:44.000+0000|org.onap.sdc|admin
-aaf_admin@people.osaaf.org|org.onap.sdnc.admin|2019-05-13 09:56:44.000+0000|org.onap.sdnc|admin
-aaf_admin@people.osaaf.org|org.onap.so.admin|2019-05-13 09:56:44.000+0000|org.onap.so|admin
-aaf_admin@people.osaaf.org|org.onap.vfc.admin|2019-05-13 09:56:44.000+0000|org.onap.vfc|admin
-aaf_admin@people.osaaf.org|org.onap.vid.admin|2019-05-13 09:56:44.000+0000|org.onap.vid|admin
-aaf_admin@people.osaaf.org|org.onap.vid1.admin|2019-05-13 09:56:44.000+0000|org.onap.vid1|admin
-aaf_admin@people.osaaf.org|org.onap.vid2.admin|2019-05-13 09:56:44.000+0000|org.onap.vid2|admin
-aaf_admin@people.osaaf.org|org.osaaf.aaf.admin|2019-05-13 09:56:44.000+0000|org.osaaf.aaf|admin
-aaf_admin@people.osaaf.org|org.osaaf.people.admin|2019-05-13 09:56:44.000+0000|org.osaaf.people|admin
-deployer@people.osaaf.org|org.osaaf.aaf.deploy|2019-05-13 09:56:44.000+0000|org.osaaf.aaf|deploy
-portal_admin@people.osaaf.org|org.onap.portal.admin|2019-05-13 09:56:44.000+0000|org.onap.portal|admin
-osaaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-05-13 09:56:44.000+0000|org.osaaf.aaf|admin
-aaf@aaf.osaaf.org|org.admin|2019-05-13 09:56:44.000+0000|org|admin
-aaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-05-13 09:56:44.000+0000|org.osaaf.aaf|admin
-aaf@aaf.osaaf.org|org.osaaf.aaf.service|2019-05-13 09:56:44.000+0000|org.osaaf.aaf|service
-aaf@aaf.osaaf.org|org.osaaf.people.admin|2019-05-13 09:56:44.000+0000|org.osaaf.people|admin
-aaf-sms@aaf-sms.onap.org|org.onap.aaf-sms.service|2019-05-13 09:56:44.000+0000|org.onap.aaf-sms|service
-clamp@clamptest.onap.org|org.onap.clamptest.owner|2019-05-13 09:56:44.000+0000|org.onap.clamptest|owner
-clamp@clamptest.onap.org|org.onap.clamptest.service|2019-05-13 09:56:44.000+0000|org.onap.clamptest|admin
-clamp@clamp.osaaf.org|org.onap.clamp.service|2019-05-13 09:56:44.000+0000|org.onap.clamp|service
-clamp@clampdemo.onap.org|org.onap.clampdemo.owner|2019-05-13 09:56:44.000+0000|org.onap.clampdemo|owner
-clamp@clampdemo.onap.org|org.onap.clampdemo.service|2019-05-13 09:56:44.000+0000|org.onap.clampdemo|admin
-clamp@clamp.onap.org|org.onap.clamp.clds.admin.dev|2019-05-13 09:56:44.000+0000|org.onap.clamp|clds.admin.dev
-clamp@clamp.onap.org|org.onap.clamp.clds.designer.dev|2019-05-13 09:56:44.000+0000|org.onap.clamp|clds.designer.dev
-clamp@clamp.onap.org|org.onap.clamp.clds.vf_filter_all.dev|2019-05-13 09:56:44.000+0000|org.onap.clamp|clds.vf_filter_all.dev
-clamp@clamp.onap.org|org.onap.clamp.service|2019-05-13 09:56:44.000+0000|org.onap.clamp|service
-clamp@clamp.onap.org|org.onap.clampdemo.owner|2019-05-13 09:56:44.000+0000|org.onap.clampdemo|owner
-clamp@clamp.onap.org|org.onap.clampdemo.service|2019-05-13 09:56:44.000+0000|org.onap.clampdemo|admin
-clamp@clamp.onap.org|org.onap.clamptest.owner|2019-05-13 09:56:44.000+0000|org.onap.clamptest|owner
-clamp@clamp.onap.org|org.onap.clamptest.service|2019-05-13 09:56:44.000+0000|org.onap.clamptest|admin
-aai@aai.onap.org|org.onap.aai.admin|2019-05-13 09:56:44.000+0000|org.onap.aai|admin
-aai@aai.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-aai@aai.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-appc@appc.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-appc@appc.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-appc@appc.onap.org|org.onap.appc.admin|2019-05-13 09:56:44.000+0000|org.onap.appc|admin
-appc@appc.onap.org|org.onap.appc.odl|2019-05-13 09:56:44.000+0000|org.onap.appc|odl
-appc@appc.onap.org|org.onap.appc.service|2019-05-13 09:56:44.000+0000|org.onap.appc|service
-dcae@dcae.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-dcae@dcae.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-dcae@dcae.onap.org|org.onap.dcae.pnfPublisher|2019-05-13 09:56:44.000+0000|org.onap.dcae|pnfPublisher
-dcae@dcae.onap.org|org.onap.dcae.pnfSubscriber|2019-05-13 09:56:44.000+0000|org.onap.dcae|pnfSubscriber
-dcae@dcae.onap.org|org.onap.dcae.seeCerts|2019-05-13 09:56:44.000+0000|org.onap.dcae|seeCerts
-dcae@dcae.onap.org|org.onap.dmaap.mr.PNF_READY.pub|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|PNF_READY.pub
-dcae@dcae.onap.org|org.onap.dmaap.mr.PNF_REGISTRATION.sub|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|PNF_REGISTRATION.sub
-oof@oof.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-oof@oof.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-oof@oof.onap.org|org.onap.oof.service|2019-05-13 09:56:44.000+0000|org.onap.oof|service
-so@so.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-so@so.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-so@so.onap.org|org.onap.so.app|2019-05-13 09:56:44.000+0000|org.onap.so|app
-sdc@sdc.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-sdc@sdc.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-sdnc@sdnc.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-sdnc@sdnc.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-sdnc@sdnc.onap.org|org.onap.sdnc.admin|2019-05-13 09:56:44.000+0000|org.onap.sdnc|admin
-sdnc@sdnc.onap.org|org.onap.sdnc.service|2019-05-13 09:56:44.000+0000|org.onap.sdnc|service
-vfc@vfc.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-vfc@vfc.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-vfc@vfc.onap.org|org.onap.dmaap-mr.Publisher|2019-05-13 09:56:44.000+0000|org.onap.dmaap-mr|Publisher
-vfc@vfc.onap.org|org.onap.vfc.service|2019-05-13 09:56:44.000+0000|org.onap.vfc|service
-policy@policy.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-policy@policy.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-policy@policy.onap.org|org.onap.policy.pdpd.admin|2019-05-13 09:56:44.000+0000|org.onap.policy|pdpd.admin
-policy@policy.onap.org|org.onap.policy.pdpx.admin|2019-05-13 09:56:44.000+0000|org.onap.policy|pdpx.admin
-policy@policy.onap.org|org.onap.policy.seeCerts|2019-05-13 09:56:44.000+0000|org.onap.policy|seeCerts
-pomba@pomba.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-pomba@pomba.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-vid@vid.onap.org|org.onap.aai.resources_all|2019-05-13 09:56:44.000+0000|org.onap.aai|resources_all
-vid@vid.onap.org|org.onap.aai.traversal_advanced|2019-05-13 09:56:44.000+0000|org.onap.aai|traversal_advanced
-vid@vid.onap.org|org.onap.vid.service|2019-05-13 09:56:44.000+0000|org.onap.vid|service
-vid1@people.osaaf.org|org.onap.vid.System_Administrator|2019-05-13 09:56:44.000+0000|org.onap.vid|System_Administrator
-vid2@people.osaaf.org|org.onap.vid.Standard_User|2019-05-13 09:56:44.000+0000|org.onap.vid|Standard_User
-vid2@people.osaaf.org|org.onap.vid.System_Administrator|2019-05-13 09:56:44.000+0000|org.onap.vid|System_Administrator
-dmaap-bc@bc.dmaap.onap.org|org.onap.dmaap.bc.service|2019-05-13 09:56:44.000+0000|org.onap.dmaap.bc|service
-dmaap-bc@dmaap-bc.onap.org|org.onap.dmaap-bc.seeCerts|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc|seeCerts
-dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|org.onap.dmaap-bc-topic-mgr.client|2019-05-13 09:56:44.000+0000|org.onap.dmaap-bc-topic-mgr|client
-dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|org.onap.dmaap.mr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|admin
-dmaap-dr@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-05-13 09:56:44.000+0000|org.onap.dmaap-dr|seeCerts
-dmaap-dr-prov@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-05-13 09:56:44.000+0000|org.onap.dmaap-dr|seeCerts
-dmaap-dr-node@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-05-13 09:56:44.000+0000|org.onap.dmaap-dr|seeCerts
-dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.admin|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|admin
-dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.create|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|create
-dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.destroy|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|destroy
-dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|mrtesttopic.pub
-dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
-dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.service|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|service
-dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-05-13 09:56:44.000+0000|org.onap.dmaap.mr|view
+mmanager@people.osaaf.org|org.onap.aaf-sms.admin|2019-07-04 09:57:55.000+0000|org.onap.aaf-sms|admin
+mmanager@people.osaaf.org|org.onap.aaf-sms.owner|2019-07-04 09:57:55.000+0000|org.onap.aaf-sms|owner
+mmanager@people.osaaf.org|org.onap.aai.admin|2019-07-04 09:57:55.000+0000|org.onap.aai|admin
+mmanager@people.osaaf.org|org.onap.aai.owner|2019-07-04 09:57:55.000+0000|org.onap.aai|owner
+mmanager@people.osaaf.org|org.onap.admin|2019-07-04 09:57:55.000+0000|org.onap|admin
+mmanager@people.osaaf.org|org.onap.appc.admin|2019-07-04 09:57:55.000+0000|org.onap.appc|admin
+mmanager@people.osaaf.org|org.onap.appc.owner|2019-07-04 09:57:55.000+0000|org.onap.appc|owner
+mmanager@people.osaaf.org|org.onap.clamp.admin|2019-07-04 09:57:55.000+0000|org.onap.clamp|admin
+mmanager@people.osaaf.org|org.onap.clamp.owner|2019-07-04 09:57:55.000+0000|org.onap.clamp|owner
+mmanager@people.osaaf.org|org.onap.dcae.admin|2019-07-04 09:57:55.000+0000|org.onap.dcae|admin
+mmanager@people.osaaf.org|org.onap.dcae.owner|2019-07-04 09:57:55.000+0000|org.onap.dcae|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc-mm-prov|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc-mm-prov|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc-topic-mgr|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc-topic-mgr|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc.api|Controller
+mmanager@people.osaaf.org|org.onap.dmaap-bc.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc|owner
+mmanager@people.osaaf.org|org.onap.dmaap-dr.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap-dr|owner
+mmanager@people.osaaf.org|org.onap.dmaap-mr.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr|admin
+mmanager@people.osaaf.org|org.onap.dmaap-mr.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr|owner
+mmanager@people.osaaf.org|org.onap.dmaap-mr.sunil.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr.sunil|owner
+mmanager@people.osaaf.org|org.onap.dmaap-mr.test.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr.test|owner
+mmanager@people.osaaf.org|org.onap.dmaap.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap|admin
+mmanager@people.osaaf.org|org.onap.dmaap.mr.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|owner
+mmanager@people.osaaf.org|org.onap.dmaap.owner|2019-07-04 09:57:55.000+0000|org.onap.dmaap|owner
+mmanager@people.osaaf.org|org.onap.holmes.owner|2019-07-04 09:57:55.000+0000|org.onap.holmes|owner
+mmanager@people.osaaf.org|org.onap.oof.admin|2019-07-04 09:57:55.000+0000|org.onap.oof|admin
+mmanager@people.osaaf.org|org.onap.oof.owner|2019-07-04 09:57:55.000+0000|org.onap.oof|owner
+mmanager@people.osaaf.org|org.onap.owner|2019-07-04 09:57:55.000+0000|org.onap|owner
+mmanager@people.osaaf.org|org.onap.policy.owner|2019-07-04 09:57:55.000+0000|org.onap.policy|owner
+mmanager@people.osaaf.org|org.onap.pomba.admin|2019-07-04 09:57:55.000+0000|org.onap.pomba|admin
+mmanager@people.osaaf.org|org.onap.pomba.owner|2019-07-04 09:57:55.000+0000|org.onap.pomba|owner
+mmanager@people.osaaf.org|org.onap.portal.admin|2019-07-04 09:57:55.000+0000|org.onap.portal|admin
+mmanager@people.osaaf.org|org.onap.portal.owner|2019-07-04 09:57:55.000+0000|org.onap.portal|owner
+mmanager@people.osaaf.org|org.onap.sdc.admin|2019-07-04 09:57:55.000+0000|org.onap.sdc|admin
+mmanager@people.osaaf.org|org.onap.sdc.owner|2019-07-04 09:57:55.000+0000|org.onap.sdc|owner
+mmanager@people.osaaf.org|org.onap.sdnc.admin|2019-07-04 09:57:55.000+0000|org.onap.sdnc|admin
+mmanager@people.osaaf.org|org.onap.sdnc.owner|2019-07-04 09:57:55.000+0000|org.onap.sdnc|owner
+mmanager@people.osaaf.org|org.onap.so.admin|2019-07-04 09:57:55.000+0000|org.onap.so|admin
+mmanager@people.osaaf.org|org.onap.so.owner|2019-07-04 09:57:55.000+0000|org.onap.so|owner
+mmanager@people.osaaf.org|org.onap.vfc.admin|2019-07-04 09:57:55.000+0000|org.onap.vfc|admin
+mmanager@people.osaaf.org|org.onap.vfc.owner|2019-07-04 09:57:55.000+0000|org.onap.vfc|owner
+mmanager@people.osaaf.org|org.onap.vid.admin|2019-07-04 09:57:55.000+0000|org.onap.vid|admin
+mmanager@people.osaaf.org|org.onap.vid.owner|2019-07-04 09:57:55.000+0000|org.onap.vid|owner
+mmanager@people.osaaf.org|org.onap.vid1.admin|2019-07-04 09:57:55.000+0000|org.onap.vid1|admin
+mmanager@people.osaaf.org|org.onap.vid1.owner|2019-07-04 09:57:55.000+0000|org.onap.vid1|owner
+mmanager@people.osaaf.org|org.onap.vid2.admin|2019-07-04 09:57:55.000+0000|org.onap.vid2|admin
+mmanager@people.osaaf.org|org.onap.vid2.owner|2019-07-04 09:57:55.000+0000|org.onap.vid2|owner
+mmanager@people.osaaf.org|org.osaaf.people.owner|2019-07-04 09:57:55.000+0000|org.osaaf.people|owner
+shi@portal.onap.org|org.onap.portal.admin|2019-07-04 09:57:55.000+0000|org.onap.portal|admin
+demo@people.osaaf.org|org.onap.aai.Account_Administrator|2019-07-04 09:57:55.000+0000|org.onap.aai|Account_Administrator
+demo@people.osaaf.org|org.onap.aai.resources_readonly|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_readonly
+demo@people.osaaf.org|org.onap.aai.traversal_basic|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_basic
+demo@people.osaaf.org|org.onap.dcae.pnfPublisher|2019-07-04 09:57:55.000+0000|org.onap.dcae|pnfPublisher
+demo@people.osaaf.org|org.onap.dcae.pnfSubscriber|2019-07-04 09:57:55.000+0000|org.onap.dcae|pnfSubscriber
+demo@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc.api|Controller
+demo@people.osaaf.org|org.onap.dmaap.mr.create|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|create
+demo@people.osaaf.org|org.onap.dmaap.mr.destroy|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|destroy
+demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|mrtesttopic.pub
+demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
+demo@people.osaaf.org|org.onap.dmaap.mr.view|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|view
+demo@people.osaaf.org|org.onap.policy.Account_Administrator|2019-07-04 09:57:55.000+0000|org.onap.policy|Account_Administrator
+demo@people.osaaf.org|org.onap.policy.System_Administrator|2019-07-04 09:57:55.000+0000|org.onap.policy|System_Administrator
+demo@people.osaaf.org|org.onap.policy.pdpd.admin|2019-07-04 09:57:55.000+0000|org.onap.policy|pdpd.admin
+demo@people.osaaf.org|org.onap.policy.pdpx.admin|2019-07-04 09:57:55.000+0000|org.onap.policy|pdpx.admin
+demo@people.osaaf.org|org.onap.portal.Account_Administrator|2019-07-04 09:57:55.000+0000|org.onap.portal|Account_Administrator
+demo@people.osaaf.org|org.onap.portal.System_Administrator|2019-07-04 09:57:55.000+0000|org.onap.portal|System_Administrator
+demo@people.osaaf.org|org.onap.portal.admin|2019-07-04 09:57:55.000+0000|org.onap.portal|admin
+demo@people.osaaf.org|org.onap.portal.test.admin|2019-07-04 09:57:55.000+0000|org.onap.portal.test|admin
+demo@people.osaaf.org|org.onap.portal.test.owner|2019-07-04 09:57:55.000+0000|org.onap.portal.test|owner
+demo@people.osaaf.org|org.onap.portal.test.user1|2019-07-04 09:57:55.000+0000|org.onap.portal.test|user1
+demo@people.osaaf.org|org.onap.sdc.ADMIN|2019-07-04 09:57:55.000+0000|org.onap.sdc|ADMIN
+demo@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-07-04 09:57:55.000+0000|org.onap.sdc|Account_Administrator
+demo@people.osaaf.org|org.onap.vid.Account_Administrator|2019-07-04 09:57:55.000+0000|org.onap.vid|Account_Administrator
+demo@people.osaaf.org|org.onap.vid.Demonstration___gNB|2019-07-04 09:57:55.000+0000|org.onap.vid|Demonstration___gNB
+demo@people.osaaf.org|org.onap.vid.Demonstration___vCPE|2019-07-04 09:57:55.000+0000|org.onap.vid|Demonstration___vCPE
+demo@people.osaaf.org|org.onap.vid.Demonstration___vFW|2019-07-04 09:57:55.000+0000|org.onap.vid|Demonstration___vFW
+demo@people.osaaf.org|org.onap.vid.Demonstration___vFWCL|2019-07-04 09:57:55.000+0000|org.onap.vid|Demonstration___vFWCL
+demo@people.osaaf.org|org.onap.vid.Demonstration___vIMS|2019-07-04 09:57:55.000+0000|org.onap.vid|Demonstration___vIMS
+demo@people.osaaf.org|org.onap.vid.Demonstration___vLB|2019-07-04 09:57:55.000+0000|org.onap.vid|Demonstration___vLB
+demo@people.osaaf.org|org.onap.vid.System_Administrator|2019-07-04 09:57:55.000+0000|org.onap.vid|System_Administrator
+demo@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|view
+jh0003@people.osaaf.org|org.onap.portal.admin|2019-07-04 09:57:55.000+0000|org.onap.portal|admin
+jh0003@people.osaaf.org|org.onap.sdc.ADMIN|2019-07-04 09:57:55.000+0000|org.onap.sdc|ADMIN
+jh0003@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-07-04 09:57:55.000+0000|org.onap.sdc|Account_Administrator
+cs0008@people.osaaf.org|org.onap.sdc.TESTOR|2019-07-04 09:57:55.000+0000|org.onap.sdc|TESTOR
+jm0007@people.osaaf.org|org.onap.sdc.TESTOR|2019-07-04 09:57:55.000+0000|org.onap.sdc|TESTOR
+op0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-07-04 09:57:55.000+0000|org.onap.sdc|TESTOR
+gv0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-07-04 09:57:55.000+0000|org.onap.sdc|TESTOR
+pm0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-07-04 09:57:55.000+0000|org.onap.sdc|TESTOR
+ps0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-07-04 09:57:55.000+0000|org.onap.sdc|TESTOR
+aaf_admin@people.osaaf.org|org.onap.aai.admin|2019-07-04 09:57:55.000+0000|org.onap.aai|admin
+aaf_admin@people.osaaf.org|org.onap.appc.admin|2019-07-04 09:57:55.000+0000|org.onap.appc|admin
+aaf_admin@people.osaaf.org|org.onap.clamp.admin|2019-07-04 09:57:55.000+0000|org.onap.clamp|admin
+aaf_admin@people.osaaf.org|org.onap.dcae.admin|2019-07-04 09:57:55.000+0000|org.onap.dcae|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc-mm-prov|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc-topic-mgr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc.api|Controller
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc.api|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-dr.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-dr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-mr.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-mr.sunil.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr.sunil|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-mr.test.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr.test|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap.mr.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
+aaf_admin@people.osaaf.org|org.onap.dmaap.mr.test1|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|test1
+aaf_admin@people.osaaf.org|org.onap.holmes.admin|2019-07-04 09:57:55.000+0000|org.onap.holmes|admin
+aaf_admin@people.osaaf.org|org.onap.oof.admin|2019-07-04 09:57:55.000+0000|org.onap.oof|admin
+aaf_admin@people.osaaf.org|org.onap.policy.admin|2019-07-04 09:57:55.000+0000|org.onap.policy|admin
+aaf_admin@people.osaaf.org|org.onap.pomba.admin|2019-07-04 09:57:55.000+0000|org.onap.pomba|admin
+aaf_admin@people.osaaf.org|org.onap.portal.admin|2019-07-04 09:57:55.000+0000|org.onap.portal|admin
+aaf_admin@people.osaaf.org|org.onap.sdc.admin|2019-07-04 09:57:55.000+0000|org.onap.sdc|admin
+aaf_admin@people.osaaf.org|org.onap.sdnc.admin|2019-07-04 09:57:55.000+0000|org.onap.sdnc|admin
+aaf_admin@people.osaaf.org|org.onap.so.admin|2019-07-04 09:57:55.000+0000|org.onap.so|admin
+aaf_admin@people.osaaf.org|org.onap.vfc.admin|2019-07-04 09:57:55.000+0000|org.onap.vfc|admin
+aaf_admin@people.osaaf.org|org.onap.vid.admin|2019-07-04 09:57:55.000+0000|org.onap.vid|admin
+aaf_admin@people.osaaf.org|org.onap.vid1.admin|2019-07-04 09:57:55.000+0000|org.onap.vid1|admin
+aaf_admin@people.osaaf.org|org.onap.vid2.admin|2019-07-04 09:57:55.000+0000|org.onap.vid2|admin
+aaf_admin@people.osaaf.org|org.osaaf.aaf.admin|2019-07-04 09:57:55.000+0000|org.osaaf.aaf|admin
+aaf_admin@people.osaaf.org|org.osaaf.people.admin|2019-07-04 09:57:55.000+0000|org.osaaf.people|admin
+deployer@people.osaaf.org|org.osaaf.aaf.deploy|2019-07-04 09:57:55.000+0000|org.osaaf.aaf|deploy
+portal_admin@people.osaaf.org|org.onap.portal.admin|2019-07-04 09:57:55.000+0000|org.onap.portal|admin
+osaaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-07-04 09:57:55.000+0000|org.osaaf.aaf|admin
+aaf@aaf.osaaf.org|org.admin|2019-07-04 09:57:55.000+0000|org|admin
+aaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-07-04 09:57:55.000+0000|org.osaaf.aaf|admin
+aaf@aaf.osaaf.org|org.osaaf.aaf.service|2019-07-04 09:57:55.000+0000|org.osaaf.aaf|service
+aaf@aaf.osaaf.org|org.osaaf.people.admin|2019-07-04 09:57:55.000+0000|org.osaaf.people|admin
+aaf-sms@aaf-sms.onap.org|org.onap.aaf-sms.service|2019-07-04 09:57:55.000+0000|org.onap.aaf-sms|service
+clamp@clamptest.onap.org|org.onap.clamptest.owner|2019-07-04 09:57:55.000+0000|org.onap.clamptest|owner
+clamp@clamptest.onap.org|org.onap.clamptest.service|2019-07-04 09:57:55.000+0000|org.onap.clamptest|admin
+clamp@clamp.osaaf.org|org.onap.clamp.service|2019-07-04 09:57:55.000+0000|org.onap.clamp|service
+clamp@clamp.onap.org|org.onap.clamp.clds.admin.dev|2019-07-04 09:57:55.000+0000|org.onap.clamp|clds.admin.dev
+clamp@clamp.onap.org|org.onap.clamp.clds.designer.dev|2019-07-04 09:57:55.000+0000|org.onap.clamp|clds.designer.dev
+clamp@clamp.onap.org|org.onap.clamp.clds.vf_filter_all.dev|2019-07-04 09:57:55.000+0000|org.onap.clamp|clds.vf_filter_all.dev
+clamp@clamp.onap.org|org.onap.clamp.service|2019-07-04 09:57:55.000+0000|org.onap.clamp|service
+clamp@clamp.onap.org|org.onap.clampdemo.owner|2019-07-04 09:57:55.000+0000|org.onap.clampdemo|owner
+clamp@clamp.onap.org|org.onap.clampdemo.service|2019-07-04 09:57:55.000+0000|org.onap.clampdemo|admin
+clamp@clamp.onap.org|org.onap.clamptest.owner|2019-07-04 09:57:55.000+0000|org.onap.clamptest|owner
+clamp@clamp.onap.org|org.onap.clamptest.service|2019-07-04 09:57:55.000+0000|org.onap.clamptest|admin
+clamp@clampdemo.onap.org|org.onap.clampdemo.owner|2019-07-04 09:57:55.000+0000|org.onap.clampdemo|owner
+clamp@clampdemo.onap.org|org.onap.clampdemo.service|2019-07-04 09:57:55.000+0000|org.onap.clampdemo|admin
+aai@aai.onap.org|org.onap.aai.admin|2019-07-04 09:57:55.000+0000|org.onap.aai|admin
+aai@aai.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+aai@aai.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+appc@appc.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+appc@appc.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+appc@appc.onap.org|org.onap.appc.admin|2019-07-04 09:57:55.000+0000|org.onap.appc|admin
+appc@appc.onap.org|org.onap.appc.odl|2019-07-04 09:57:55.000+0000|org.onap.appc|odl
+appc@appc.onap.org|org.onap.appc.service|2019-07-04 09:57:55.000+0000|org.onap.appc|service
+dcae@dcae.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+dcae@dcae.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+dcae@dcae.onap.org|org.onap.dcae.pnfPublisher|2019-07-04 09:57:55.000+0000|org.onap.dcae|pnfPublisher
+dcae@dcae.onap.org|org.onap.dcae.pnfSubscriber|2019-07-04 09:57:55.000+0000|org.onap.dcae|pnfSubscriber
+dcae@dcae.onap.org|org.onap.dcae.seeCerts|2019-07-04 09:57:55.000+0000|org.onap.dcae|seeCerts
+dcae@dcae.onap.org|org.onap.dmaap.mr.PNF_READY.pub|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|PNF_READY.pub
+dcae@dcae.onap.org|org.onap.dmaap.mr.PNF_REGISTRATION.sub|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|PNF_REGISTRATION.sub
+oof@oof.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+oof@oof.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+oof@oof.onap.org|org.onap.oof.service|2019-07-04 09:57:55.000+0000|org.onap.oof|service
+so@so.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+so@so.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+so@so.onap.org|org.onap.so.app|2019-07-04 09:57:55.000+0000|org.onap.so|app
+sdc@sdc.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+sdc@sdc.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+sdnc@sdnc.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+sdnc@sdnc.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+sdnc@sdnc.onap.org|org.onap.sdnc.admin|2019-07-04 09:57:55.000+0000|org.onap.sdnc|admin
+sdnc@sdnc.onap.org|org.onap.sdnc.service|2019-07-04 09:57:55.000+0000|org.onap.sdnc|service
+vfc@vfc.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+vfc@vfc.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+vfc@vfc.onap.org|org.onap.dmaap-mr.Publisher|2019-07-04 09:57:55.000+0000|org.onap.dmaap-mr|Publisher
+vfc@vfc.onap.org|org.onap.vfc.service|2019-07-04 09:57:55.000+0000|org.onap.vfc|service
+policy@policy.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+policy@policy.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+policy@policy.onap.org|org.onap.policy.pdpd.admin|2019-07-04 09:57:55.000+0000|org.onap.policy|pdpd.admin
+policy@policy.onap.org|org.onap.policy.pdpx.admin|2019-07-04 09:57:55.000+0000|org.onap.policy|pdpx.admin
+policy@policy.onap.org|org.onap.policy.seeCerts|2019-07-04 09:57:55.000+0000|org.onap.policy|seeCerts
+pomba@pomba.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+pomba@pomba.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+holmes@holmes.onap.org|org.onap.holmes.service|2019-07-04 09:57:55.000+0000|org.onap.holmes|service
+vid@vid.onap.org|org.onap.aai.resources_all|2019-07-04 09:57:55.000+0000|org.onap.aai|resources_all
+vid@vid.onap.org|org.onap.aai.traversal_advanced|2019-07-04 09:57:55.000+0000|org.onap.aai|traversal_advanced
+vid@vid.onap.org|org.onap.vid.service|2019-07-04 09:57:55.000+0000|org.onap.vid|service
+vid1@people.osaaf.org|org.onap.vid.System_Administrator|2019-07-04 09:57:55.000+0000|org.onap.vid|System_Administrator
+vid2@people.osaaf.org|org.onap.vid.Standard_User|2019-07-04 09:57:55.000+0000|org.onap.vid|Standard_User
+vid2@people.osaaf.org|org.onap.vid.System_Administrator|2019-07-04 09:57:55.000+0000|org.onap.vid|System_Administrator
+dmaap-bc@bc.dmaap.onap.org|org.onap.dmaap.bc.service|2019-07-04 09:57:55.000+0000|org.onap.dmaap.bc|service
+dmaap-bc@dmaap-bc.onap.org|org.onap.dmaap-bc.seeCerts|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc|seeCerts
+dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|org.onap.dmaap-bc-topic-mgr.client|2019-07-04 09:57:55.000+0000|org.onap.dmaap-bc-topic-mgr|client
+dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|org.onap.dmaap.mr.admin|2019-07-04 09:57:55.000+0000|org.onap.dmaap.mr|admin
+dmaap-dr@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-07-04 09:57:55.000+0000|org.onap.dmaap-dr|seeCerts
+dmaap-dr-prov@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-07-04 09:57:55.000+0000|org.onap.dmaap-dr|seeCerts
+dmaap-dr-node@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-07-04 09:57:55.000+0000|org.onap.dmaap-dr|seeCerts
diff --git a/auth/sample/data/sample.identities.dat b/auth/sample/data/sample.identities.dat
index 707b48d..ad941b5 100644 (file)
--- a/auth/sample/data/sample.identities.dat
+++ b/auth/sample/data/sample.identities.dat
@@ -59,6 +59,7 @@ sdnc|ONAP SDNC Application|SDNC|ONAP Application|||a|aaf_admin
 vfc|ONAP VFC Application|VNC|ONAP Application|||a|aaf_admin
 policy|ONAP Policy Application|POLICY|ONAP Application|||a|aaf_admin
 pomba|ONAP Pomba Application|POMBA|ONAP Application|||a|aaf_admin
+holmes|ONAP Holmes Application|HOLMES|ONAP Application|||a|aaf_admin
 
 # VID Identities
 vid|ONAP VID Application|VID|ONAP Application|||a|aaf_admin
@@ -75,6 +76,6 @@ dmaap-dr-node|ONAP DMaap DR Node|Node|DMaap MR|||a|aaf_admin
 dmaap-mr|ONAP DMaap MR Application|DMaap MR|ONAP Application|||a|aaf_admin
 
 #deprecate these in Dublin
-dmaapmr|ONAP DMaap MR Application|DMaap MR|ONAP Application|||a|aaf_admin
-dmaap.mr|ONAP DMaap MR Application|DMaap MR|ONAP Application|||a|aaf_admin
+#dmaapmr|ONAP DMaap MR Application|DMaap MR|ONAP Application|||a|aaf_admin
+#dmaap.mr|ONAP DMaap MR Application|DMaap MR|ONAP Application|||a|aaf_admin
 
diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java
index fa29dcd..bb590e1 100644 (file)
--- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java
+++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/env/RosettaData.java
@@ -57,6 +57,11 @@ public class RosettaData<T> implements Data<T>{
         inType = df.getInType();
         outType = df.getOutType(); // take defaults
     }
+    
+    //Added for junits
+    void setSaved(Saved saved) {
+       this.saved = saved;
+    }
 
 //    // @Override
     public RosettaData<T> in(TYPE rosettaType) {
diff --git a/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/Api.java b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/Api.java
new file mode 100644 (file)
index 0000000..2074435
--- /dev/null
+++ b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/Api.java
@@ -0,0 +1,373 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * ============LICENSE_END====================================================
+ *
+ */
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2018.12.09 at 10:14:23 PM IST 
+//
+
+
+package org.onap.aaf.misc.rosetta.env;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="route" maxOccurs="unbounded" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="meth" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="path" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="param" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element name="desc" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="comments" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element name="contentType" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element name="expected" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *                   &lt;element name="explicitErr" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "route"
+})
+@XmlRootElement(name = "api")
+public class Api {
+
+    protected List<Api.Route> route;
+
+    /**
+     * Gets the value of the route property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the route property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getRoute().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Api.Route }
+     * 
+     * 
+     */
+    public List<Api.Route> getRoute() {
+        if (route == null) {
+            route = new ArrayList<Api.Route>();
+        }
+        return this.route;
+    }
+
+
+    /**
+     * <p>Java class for anonymous complex type.
+     * 
+     * <p>The following schema fragment specifies the expected content contained within this class.
+     * 
+     * <pre>
+     * &lt;complexType>
+     *   &lt;complexContent>
+     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+     *       &lt;sequence>
+     *         &lt;element name="meth" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     *         &lt;element name="path" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     *         &lt;element name="param" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element name="desc" type="{http://www.w3.org/2001/XMLSchema}string"/>
+     *         &lt;element name="comments" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element name="contentType" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+     *         &lt;element name="expected" type="{http://www.w3.org/2001/XMLSchema}int"/>
+     *         &lt;element name="explicitErr" type="{http://www.w3.org/2001/XMLSchema}int" maxOccurs="unbounded" minOccurs="0"/>
+     *       &lt;/sequence>
+     *     &lt;/restriction>
+     *   &lt;/complexContent>
+     * &lt;/complexType>
+     * </pre>
+     * 
+     * 
+     */
+    @XmlAccessorType(XmlAccessType.FIELD)
+    @XmlType(name = "", propOrder = {
+        "meth",
+        "path",
+        "param",
+        "desc",
+        "comments",
+        "contentType",
+        "expected",
+        "explicitErr"
+    })
+    public static class Route {
+
+        @XmlElement(required = true)
+        protected String meth;
+        @XmlElement(required = true)
+        protected String path;
+        protected List<String> param;
+        @XmlElement(required = true)
+        protected String desc;
+        protected List<String> comments;
+        protected List<String> contentType;
+        protected int expected;
+        @XmlElement(type = Integer.class)
+        protected List<Integer> explicitErr;
+
+        /**
+         * Gets the value of the meth property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getMeth() {
+            return meth;
+        }
+
+        /**
+         * Sets the value of the meth property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setMeth(String value) {
+            this.meth = value;
+        }
+
+        /**
+         * Gets the value of the path property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getPath() {
+            return path;
+        }
+
+        /**
+         * Sets the value of the path property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setPath(String value) {
+            this.path = value;
+        }
+
+        /**
+         * Gets the value of the param property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the param property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getParam().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link String }
+         * 
+         * 
+         */
+        public List<String> getParam() {
+            if (param == null) {
+                param = new ArrayList<String>();
+            }
+            return this.param;
+        }
+
+        /**
+         * Gets the value of the desc property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link String }
+         *     
+         */
+        public String getDesc() {
+            return desc;
+        }
+
+        /**
+         * Sets the value of the desc property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link String }
+         *     
+         */
+        public void setDesc(String value) {
+            this.desc = value;
+        }
+
+        /**
+         * Gets the value of the comments property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the comments property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getComments().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link String }
+         * 
+         * 
+         */
+        public List<String> getComments() {
+            if (comments == null) {
+                comments = new ArrayList<String>();
+            }
+            return this.comments;
+        }
+
+        /**
+         * Gets the value of the contentType property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the contentType property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getContentType().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link String }
+         * 
+         * 
+         */
+        public List<String> getContentType() {
+            if (contentType == null) {
+                contentType = new ArrayList<String>();
+            }
+            return this.contentType;
+        }
+
+        /**
+         * Gets the value of the expected property.
+         * 
+         */
+        public int getExpected() {
+            return expected;
+        }
+
+        /**
+         * Sets the value of the expected property.
+         * 
+         */
+        public void setExpected(int value) {
+            this.expected = value;
+        }
+
+        /**
+         * Gets the value of the explicitErr property.
+         * 
+         * <p>
+         * This accessor method returns a reference to the live list,
+         * not a snapshot. Therefore any modification you make to the
+         * returned list will be present inside the JAXB object.
+         * This is why there is not a <CODE>set</CODE> method for the explicitErr property.
+         * 
+         * <p>
+         * For example, to add a new item, do as follows:
+         * <pre>
+         *    getExplicitErr().add(newItem);
+         * </pre>
+         * 
+         * 
+         * <p>
+         * Objects of the following type(s) are allowed in the list
+         * {@link Integer }
+         * 
+         * 
+         */
+        public List<Integer> getExplicitErr() {
+            if (explicitErr == null) {
+                explicitErr = new ArrayList<Integer>();
+            }
+            return this.explicitErr;
+        }
+
+    }
+
+}
diff --git a/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaData.java b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaData.java
new file mode 100644 (file)
index 0000000..cbf7e2d
--- /dev/null
+++ b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaData.java
@@ -0,0 +1,663 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * ============LICENSE_END====================================================
+ *
+ */
+
+package org.onap.aaf.misc.rosetta.env;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import javax.xml.bind.JAXBException;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.aaf.misc.env.APIException;
+import org.onap.aaf.misc.env.Data;
+import org.onap.aaf.misc.env.Data.TYPE;
+import org.onap.aaf.misc.env.Env;
+import org.onap.aaf.misc.env.LogTarget;
+import org.onap.aaf.misc.env.TimeTaken;
+import org.onap.aaf.misc.env.jaxb.JAXBmar;
+import org.onap.aaf.misc.env.jaxb.JAXBumar;
+import org.onap.aaf.misc.rosetta.InXML;
+import org.onap.aaf.misc.rosetta.Marshal;
+import org.onap.aaf.misc.rosetta.Out;
+import org.onap.aaf.misc.rosetta.OutXML;
+import org.onap.aaf.misc.rosetta.ParseException;
+import org.onap.aaf.misc.rosetta.Saved;
+
+public class JU_RosettaData {
+
+       @Mock
+       Env env;
+       
+       @Mock
+       RosettaDF df;
+       
+       @Mock
+       JAXBmar bmar;
+       
+       @Mock
+       Saved saved;
+       
+       @Before
+       public void setUp() {
+               initMocks(this);
+       }
+       
+       @Test
+       public void testLoad() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               StringReader sr= Mockito.mock(StringReader.class);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(sr,(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load(sr);
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testLoadException() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       rosettaObj = rosettaObj.load(Mockito.mock(StringReader.class));
+               } catch (APIException e) {
+                       assertTrue(e.getMessage().contains("NullPointerException"));
+               }
+       }
+       
+       @Test
+       public void testLoadIs() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               InputStream sr= Mockito.mock(InputStream.class);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new InputStreamReader(sr),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load(sr);
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testLoadIsException() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       rosettaObj = rosettaObj.load(Mockito.mock(InputStream.class));
+               } catch (APIException e) {
+                       assertTrue(e.getMessage().contains("NullPointerException"));
+               }
+       }
+       
+       @Test
+       public void testLoadStr() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load("test");
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       @Test
+       public void testLoadStrJson() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.JSON);
+               rosettaObj.setSaved(saved);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.JSON);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load("test");
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       @Test
+       public void testLoadStrException() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       rosettaObj = rosettaObj.load("test");
+               } catch (APIException e) {
+                       assertTrue(e.getMessage().contains("NullPointerException"));
+               }
+       }
+       
+       @Test
+       public void testLoadT() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       df.jaxMar = Mockito.mock(JAXBmar.class);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load(bmar);
+                       df.marshal = null;
+                       rosettaObj = rosettaObj.load(bmar);
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testLoadTMarshalNull() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       df.jaxMar = Mockito.mock(JAXBmar.class);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       df.marshal = Mockito.mock(Marshal.class);;
+                       rosettaObj = rosettaObj.load(bmar);
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testLoadTException() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       rosettaObj = rosettaObj.load(bmar);
+               } catch (APIException e) {
+                       assertTrue(e.getMessage().contains("NullPointerException"));
+               }
+       }
+       
+       @Test
+       public void testGetEvents() {
+               RosettaData rosettaObj = new RosettaData(env, df);
+               Saved saved = rosettaObj.getEvents();
+               assertEquals("Rosetta Saved", saved.logName());
+       }
+       
+       @Test
+       public void testAsObject() {
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       Mockito.doReturn(outxml).when(df).getOut(Data.TYPE.XML);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       df.jaxMar = Mockito.mock(JAXBmar.class);
+                       df.jaxUmar = Mockito.mock(JAXBumar.class);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",0);
+                       LogTarget lt = Mockito.mock(LogTarget.class);
+                       Mockito.doReturn( lt).when(env).debug();
+                       Mockito.doNothing().when(saved).extract(null,new StringWriter(),saved);
+                       Mockito.doReturn(bmar).when(df.jaxUmar).unmarshal(lt,"");
+                       
+                       bmar = rosettaObj.asObject();
+                       
+               } catch (APIException | IOException | ParseException | JAXBException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testAsObjectException() {
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       Mockito.doReturn(outxml).when(df).getOut(Data.TYPE.XML);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       df.jaxMar = Mockito.mock(JAXBmar.class);
+                       df.jaxUmar = Mockito.mock(JAXBumar.class);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",0);
+                       LogTarget lt = Mockito.mock(LogTarget.class);
+                       Mockito.doReturn( lt).when(env).debug();
+                       Mockito.doThrow(new IOException("test Exception")).when(saved).extract(null,new StringWriter(),saved);
+                       Mockito.doThrow(new JAXBException("test Exception")).when(df.jaxUmar).unmarshal(lt,"");
+                       
+                       bmar = rosettaObj.asObject();
+                       
+               } catch (APIException | IOException | ParseException | JAXBException e) {
+                       assertTrue(e.getMessage().contains("test Exception"));
+               }
+       }
+
+       @Test
+       public void testAsString() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+                       
+                       String retVal = rosettaObj.asString();
+                       assertTrue("".equals(retVal));
+               } catch (APIException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testAsStringJson() {
+               TYPE type = TYPE.JSON;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.JSON);
+               rosettaObj.setSaved(saved);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.JSON).when(df).logType(Data.TYPE.JSON);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",4);
+                       
+                       String retVal = rosettaObj.asString();
+                       assertTrue("".equals(retVal));
+               } catch (APIException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       @Test
+       public void testToXml() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load("test");
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+               
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+                       RosettaData<JAXBmar> retVal = rosettaObj.to(Mockito.mock(OutputStream.class));
+                       
+               } catch (APIException | IOException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testToJson() {
+               TYPE type = TYPE.JSON;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.JSON);
+               rosettaObj.setSaved(saved);
+               
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.JSON);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load("test");
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+               
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.JSON).when(df).logType(Data.TYPE.JSON);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",4);
+                       RosettaData<JAXBmar> retVal = rosettaObj.to(Mockito.mock(OutputStream.class));
+                       
+               } catch (APIException | IOException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testTo() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+                       RosettaData<JAXBmar> retVal = rosettaObj.to(Mockito.mock(OutputStream.class));
+                       
+               } catch (APIException | IOException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testToWriterXml() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.XML);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load("test");
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+               
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+                       RosettaData<JAXBmar> retVal = rosettaObj.to(Mockito.mock(StringWriter.class));
+                       
+               } catch (APIException | IOException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testToWriterJson() {
+               TYPE type = TYPE.JSON;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.JSON);
+               rosettaObj.setSaved(saved);
+               
+               try {
+                       InXML inxml = Mockito.mock(InXML.class);
+                       Mockito.doReturn(inxml).when(df).getIn(Data.TYPE.JSON);
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(inxml).start(env);
+                       Mockito.doNothing().when(saved).extract(new StringReader("test"),(Writer)null,inxml);
+                       
+                       rosettaObj = rosettaObj.load("test");
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+               
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.JSON).when(df).logType(Data.TYPE.JSON);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",4);
+                       RosettaData<JAXBmar> retVal = rosettaObj.to(Mockito.mock(StringWriter.class));
+                       
+               } catch (APIException | IOException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testToWriter() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj = rosettaObj.in(Data.TYPE.XML);
+               rosettaObj.setSaved(saved);
+               
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+                       RosettaData<JAXBmar> retVal = rosettaObj.to(Mockito.mock(StringWriter.class));
+                       
+               } catch (APIException | IOException  e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testGetTypeClass() {
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               rosettaObj.getTypeClass();
+       }
+       
+       @Test
+       public void testDirect() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+                       rosettaObj.direct(Mockito.mock(InputStream.class), Mockito.mock(OutputStream.class));
+               } catch (APIException | IOException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testDirectException() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               Mockito.doReturn(type).when(df).getInType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               InXML inxml = null;
+               
+               inxml = Mockito.mock(InXML.class);
+               Mockito.doReturn(inxml).when(df).getIn(type);
+                       
+               
+               StringReader is = Mockito.mock(StringReader.class);
+               StringWriter os= Mockito.mock(StringWriter.class);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+                       Mockito.doThrow( new IOException("testException")).when(outxml).extract(is, os, inxml, true);
+                       
+                       rosettaObj.direct(is,os, true);
+               } catch (APIException | IOException | ParseException e) {
+                       // TODO Auto-generated catch block
+                       assertTrue(e.getMessage().contains("testException"));
+               }
+       }
+       
+       @Test
+       public void testDirectT() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+
+                       df.jaxMar = Mockito.mock(JAXBmar.class);
+                       LogTarget lt = Mockito.mock(LogTarget.class);
+                       Mockito.doReturn( lt).when(env).debug();
+                       Mockito.doReturn(bmar).when(df.jaxMar).marshal(lt,bmar, new StringWriter(),true);
+                       
+                       rosettaObj.direct(bmar, Mockito.mock(StringWriter.class), true);
+                       df.marshal =Mockito.mock(Marshal.class);;
+                       rosettaObj.direct(bmar, Mockito.mock(StringWriter.class), true);
+               } catch (APIException | IOException | JAXBException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testDirectTOS() {
+               TYPE type = TYPE.XML;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.XML).when(df).logType(Data.TYPE.XML);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",2);
+
+                       df.jaxMar = Mockito.mock(JAXBmar.class);
+                       LogTarget lt = Mockito.mock(LogTarget.class);
+                       Mockito.doReturn( lt).when(env).debug();
+                       Mockito.doReturn(bmar).when(df.jaxMar).marshal(lt,bmar, new StringWriter(),true);
+                       
+                       rosettaObj.direct(bmar, Mockito.mock(OutputStream.class), true);
+                       df.marshal =Mockito.mock(Marshal.class);;
+                       rosettaObj.direct(bmar, Mockito.mock(OutputStream.class), true);
+               } catch (APIException | IOException | JAXBException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testDirectTOSJson() {
+               TYPE type = TYPE.JSON;
+               Mockito.doReturn(type).when(df).getOutType();
+               RosettaData<JAXBmar> rosettaObj = new RosettaData<JAXBmar>(env, df);
+               try {
+                       Out outxml = Mockito.mock(OutXML.class);
+                       Mockito.doReturn(outxml).when(df).getOut(type);
+                       Mockito.doReturn(Env.JSON).when(df).logType(Data.TYPE.JSON);
+                       Mockito.doReturn("test").when(outxml).logName();
+                       Mockito.doReturn( Mockito.mock(TimeTaken.class)).when(env).start("test",4);
+
+                       df.jaxMar = Mockito.mock(JAXBmar.class);
+                       LogTarget lt = Mockito.mock(LogTarget.class);
+                       Mockito.doReturn( lt).when(env).debug();
+                       Mockito.doReturn(bmar).when(df.jaxMar).marshal(lt,bmar, new StringWriter(),true);
+                       
+                       rosettaObj.direct(bmar, Mockito.mock(OutputStream.class), true);
+               } catch (APIException | IOException | JAXBException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+
+}
diff --git a/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaEnv.java b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaEnv.java
new file mode 100644 (file)
index 0000000..b5889b4
--- /dev/null
+++ b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/env/JU_RosettaEnv.java
@@ -0,0 +1,98 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * ============LICENSE_END====================================================
+ *
+ */
+
+package org.onap.aaf.misc.rosetta.env;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import java.applet.Applet;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+import javax.xml.validation.Schema;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.aaf.misc.env.APIException;
+import org.onap.aaf.misc.env.Env;
+import org.onap.aaf.misc.env.jaxb.JAXBmar;
+import org.onap.aaf.misc.rosetta.Saved;
+
+public class JU_RosettaEnv {
+
+       @Before
+       public void setUp() {
+               initMocks(this);
+       }
+       
+       @Test
+       public void testNewDataFactoryClass() {
+               RosettaEnv rosettaObj = new RosettaEnv();
+               try {
+                       Object retVal = rosettaObj.newDataFactory(Api.class);
+                       assertTrue(retVal instanceof RosettaDF);
+               } catch (APIException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testNewDataFactorySchema() {
+               RosettaEnv rosettaObj = new RosettaEnv(Mockito.mock(Applet.class),"test");
+               try {
+                       Object retVal = rosettaObj.newDataFactory(Mockito.mock(Schema.class),Api.class);
+                       assertTrue(retVal instanceof RosettaDF);
+               } catch (APIException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testNewDataFactoryQname() {
+               RosettaEnv rosettaObj = new RosettaEnv(new String[] {"test"});
+               rosettaObj = new RosettaEnv(Mockito.mock(Properties.class));
+               try {
+                       Object retVal = rosettaObj.newDataFactory(Mockito.mock(QName.class),Api.class);
+                       assertTrue(retVal instanceof RosettaDF);
+               } catch (APIException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+       
+       @Test
+       public void testNewDataFactoryQnameSchema() {
+               RosettaEnv rosettaObj = new RosettaEnv("test", new String[] {"test"});
+               rosettaObj = new RosettaEnv("test", Mockito.mock(Properties.class));
+               try {
+                       Object retVal = rosettaObj.newDataFactory(Mockito.mock(Schema.class),Mockito.mock(QName.class),Api.class);
+                       assertTrue(retVal instanceof RosettaDF);
+               } catch (APIException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+       }
+}
diff --git a/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/marshal/JU_FieldBlob.java b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/marshal/JU_FieldBlob.java
new file mode 100644 (file)
index 0000000..c28e83d
--- /dev/null
+++ b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/marshal/JU_FieldBlob.java
@@ -0,0 +1,49 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * ============LICENSE_END====================================================
+ *
+ */
+package org.onap.aaf.misc.rosetta.marshal;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.onap.aaf.misc.env.jaxb.JAXBumar;
+
+public class JU_FieldBlob {
+
+       class FieldBlobImpl extends FieldBlob{
+
+               public FieldBlobImpl(String name) {
+                       super(name);
+                       // TODO Auto-generated constructor stub
+               }
+
+               @Override
+               protected byte[] data(Object t) {
+                       // TODO Auto-generated method stub
+                       return null;
+               }
+               
+       }
+       @Test
+       public void testData() {
+               FieldBlob<JAXBumar> obj = new FieldBlobImpl("test");
+               obj.data(Mockito.mock(JAXBumar.class), new StringBuilder());
+       }
+
+}
ARCHIVED- 2022-02-15 at the request of the project