Bootstrap Data Mgmt

Issue-ID: AAF-543
Change-Id: Ied58bd432383e424f61017a49618fc1b412a92b4
Signed-off-by: Instrumental <jonathan.gathman@att.com>

7 files changed, 358 insertions, 317 deletions

diff --git a/auth/sample/cass_data/artifact.dat b/auth/sample/cass_data/artifact.dat
index bf2d6348..597c880d 100644
--- a/auth/sample/cass_data/artifact.dat
+++ b/auth/sample/cass_data/artifact.dat
@@ -1,28 +1,29 @@
-oof@oof.onap.org|oof|local|/opt/app/osaaf/local||mailto:|onap.oof|root|30|{'oof-onap', 'oof.api.simpledemo.onap.org', 'oof.onap'}|aaf_admin@osaaf.org|{'pkcs12'}
-dmaap-dr-node@dmaap-dr.onap.org|dmaap-dr-node|local|/opt/app/osaaf/local||mailto:|onap.dmaap-dr|root|30|{'dmaap-dr-node', 'dmaap-dr-node.api.simpledemo.onap.org', 'dmaap-dr-node.onap'}|aaf_admin@osaaf.org|{'jks', 'script'}
-dmaap-mr@dmaap-mr.onap.org|dmaap-mr|local|/opt/app/osaaf/local||mailto:|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'}
+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|{'pkcs12'}
+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'}
+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'}
 tester1@test.portal.onap.org|tester1|aaf|/||mailto:|org.onap.portal.test|root|30||@osaaf.org|{'file', 'jks', 'pkcs12', 'script'}
-vfc@vfc.onap.org|vfc|local|/opt/app/osaaf/local||mailto:|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:|onap.pomba|root|30|{'onap_pomba', 'pomba', 'pomba.api.simpledemo.onap.org', 'pomba_onap'}|aaf_admin@osaaf.org|{'jks', 'pkcs12', 'script'}
-so@so.onap.org|so|local|/opt/app/osaaf/local||mailto:|onap.so|root|30|{'so.api.simpledemo.onap.org', 'so.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-dmaap-dr-prov@dmaap-dr.onap.org|dmaap-dr-prov|local|/opt/app/osaaf/local||mailto:|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:|onap.vid|root|30|{'vid.api.simpledemo.onap.org', 'vid.onap'}|aaf_admin@osaaf.org|{'jks', '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'}
-appc@appc.onap.org|appc|local|/opt/app/osaaf/local||mailto:|onap.appc|root|30|{'appc.api.simpledemo.onap.org', 'appc.onap', 'appc.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'pkcs12'}
-sdc@sdc.onap.org|sdc|local|/opt/app/osaaf/local||mailto:|onap.sdc|root|30|{'sdc.api.simpledemo.onap.org', 'sdc.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-policy@policy.onap.org|policy|local|/opt/app/osaaf/local||mailto:|onap.policy|root|30|{'*.pdp', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'pdp.onap.svc.cluster.local', 'policy.api.simpledemo.onap.org', 'policy_onap'}|aaf_admin@osaaf.org|{'pkcs12'}
-policy@policy.onap.org|policy_onap|local|/opt/app/osaaf/local||mailto:|onap.policy|root|30|{'*.pdp', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'pdp.onap.svc.cluster.local', 'policy', 'policy.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'jks', 'script'}
-aai@aai.onap.org|aai|local|/opt/app/osaaf/local||mailto:|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'}
-dmaap-bc@dmaap-bc.onap.org|dmaap-bc|local|/opt/app/osaaf/local||mailto:|onap.dmaap-bc|root|30|{'dmaap-bc', 'dmaap-bc.api.simpledemo.onap.org', 'dmaap-bc.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-dmaap-dr@dmaap-dr.onap.org|dmaap-dr|local|/opt/app/osaaf/local||mailto:|onap.dmaap-dr|root|30|{'dmaap-dr', 'dmaap-dr.api.simpledemo.onap.org', 'dmaap-dr.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
-dcae@dcae.onap.org|dcae|local|/opt/app/osaaf/local||mailto:|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:|onap.portal|root|30|{'onap_portal', 'portal', 'portal.api.simpledemo.onap.org', 'portal_onap'}|aaf_admin@osaaf.org|{'jks', '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-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'}
+policy@policy.onap.org|policy|local|/opt/app/osaaf/local||mailto:|org.onap.policy|root|30|{'*.pdp', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'pdp.onap.svc.cluster.local', 'policy.api.simpledemo.onap.org', 'policy_onap'}|aaf_admin@osaaf.org|{'pkcs12'}
+policy@policy.onap.org|policy_onap|local|/opt/app/osaaf/local||mailto:|org.onap.policy|root|30|{'*.pdp', 'brmsgw', 'brmsgw.onap', 'drools', 'drools.onap', 'pap', 'pap.onap', 'pdp', 'pdp.onap', 'pdp.onap.svc.cluster.local', 'policy', 'policy.api.simpledemo.onap.org'}|aaf_admin@osaaf.org|{'jks', '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'}
+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'}
 sdnc@sdnc.onap.org|sdnc|local|/opt/app/osaaf/local||mailto:|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'}
-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'}
-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'}
-aaf-sms@aaf-sms.onap.org|aaf-sms|local|/opt/app/osaaf/local||mailto:|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'}
-clamp@clamp.onap.org|clamp|local|/opt/app/osaaf/local||mailto:|onap.clamp|root|30|{'clamp.api.simpledemo.onap.org', 'clamp.onap'}|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'}
+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'}
+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'}
+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'}
+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'}
+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'}
+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'}
+sdc@sdc.onap.org|sdc|local|/opt/app/osaaf/local||mailto:|org.onap.sdc|root|30|{'sdc.api.simpledemo.onap.org', 'sdc.onap'}|aaf_admin@osaaf.org|{'pkcs12', 'script'}
+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'}
+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'}
+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'}
+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 94a56b99..d6ecafff 100644
--- a/auth/sample/cass_data/cred.dat
+++ b/auth/sample/cass_data/cred.dat
@@ -616,3 +616,45 @@ ps0001@people.osaaf.org|2|2019-04-08 19:20:10.000+0000|0xd993c5617486296f1b99d04
 aaf_admin@people.osaaf.org|2|2019-04-08 19:20:10.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
 deployer@people.osaaf.org|2|2019-04-08 19:20:10.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
 portal_admin@people.osaaf.org|2|2019-04-08 19:20:10.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+portal@portal.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.portal|53344|
+shi@shi.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.shi|53344|
+aaf@aaf.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.aaf|53344|
+aaf-sms@aaf-sms.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.aaf-sms|53344|
+clamp@clamp.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.clamp|53344|
+aai@aai.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.aai|53344|
+appc@appc.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.appc|53344|
+dcae@dcae.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dcae|53344|
+oof@oof.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.oof|53344|
+so@so.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.so|53344|
+sdc@sdc.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.sdc|53344|
+sdnc@sdnc.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.sdnc|53344|
+vfc@vfc.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vfc|53344|
+policy@policy.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.policy|53344|
+pomba@pomba.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.pomba|53344|
+vid@vid.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid|53344|
+vid1@vid1.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid1|53344|
+vid2@vid2.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.vid2|53344|
+dmaap-bc@dmaap-bc.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc|53344|
+dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc-topic-mgr|53344|
+dmaap-bc-mm-prov@dmaap-bc-mm-prov.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-bc-mm-prov|53344|
+dmaap-mr@dmaap-mr.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-mr|53344|
+dmaap-dr@dmaap-dr.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr|53344|
+dmaap-dr-prov@dmaap-dr-prov.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr-prov|53344|
+dmaap-dr-node@dmaap-dr-node.onap.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.onap.dmaap-dr-node|53344|
+iowna@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+mmanager@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+bdevl@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+mmarket@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+demo@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+jh0003@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+cs0008@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+jm0007@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+op0001@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+gv0001@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+pm0001@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+gs0001@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+ps0001@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+aaf_admin@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+aaf-client@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+deployer@people.osaaf.org|2|2019-04-09 08:14:37.000+0000|0xd993c5617486296f1b99d04de31633332b8ba1a550038e23860f9dbf0b2fcf95|Initial ID|org.osaaf.people|53344|
+portal_admin@people.osaaf.org|2|2019-04-09 08:14:37.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 3ab3a415..d01cd089 100644
--- a/auth/sample/cass_data/ns.dat
+++ b/auth/sample/cass_data/ns.dat
@@ -1,36 +1,36 @@
-org.onap.dmaap-mr||org.onap||3
 org.onap.portal.test||org.onap.portal||3
+org.onap.dmaap-mr||org.onap||3
+org.onap.dmaap-dr||org.onap||3
 org.onap.dmaap-bc-mm-prov||org.onap||3
 org.onap.sdc||org.onap||3
-org.onap.dmaap-dr||org.onap||3
 org|Root Namespace|.|1|1
 org.onap.portal|ONAP Portal|org.onap.portal|3|3
 org.onap.vfc||org.onap||3
 org.onap.dmaap-bc||org.onap||3
 org.onap.sdnc||org.onap||3
 org.onap|ONAP|org|2|2
-org.onap.vid||org.onap||3
 org.onap.so||org.onap||3
+org.onap.dmaap.mr||org.onap||3
+org.onap.vid||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.oof||org.onap||3
 org.onap.dmaapbc||org.onap||3
-org.onap.vid1||org.onap||3
 org.openecomp.dcae|DCAE Namespace Org|org.openecomp|3|3
-org.onap.dmaap.mr||org.onap||3
-org.onap.clamptest|Onap clamp test NS|org.onap|2|2
 org.openecomp.dmaapBC|DMaap NS|org.openecomp|3|3
+org.osaaf.people||org.osaaf||3
+org.onap.dcae||org.onap||3
+org.onap.dmaap.bc||org.onap||3
+org.onap.vid1||org.onap||3
 org.onap.pomba||org.onap||3
 org.onap.vid2||org.onap||3
 org.onap.appc||org.onap||3
+org.onap.clampdemo|Onap clamp demo NS|org.onap|2|2
 org.osaaf|OSAAF Namespace|org|2|2
 org.onap.dmaap-bc-topic-mgr||org.onap||3
-org.onap.clampdemo|Onap clamp demo NS|org.onap|2|2
-org.osaaf.aaf|Application Authorization Framework|org.osaaf|3|3
 org.onap.policy||org.onap||3
+org.onap.clamptest|Onap clamp test NS|org.onap|2|2
 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.osaaf.aaf|Application Authorization Framework|org.osaaf|3|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 dbb006ac..3c65dca1 100644
--- a/auth/sample/cass_data/perm.dat
+++ b/auth/sample/cass_data/perm.dat
@@ -1,19 +1,12 @@
-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.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.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-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-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|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 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'}"
@@ -21,17 +14,16 @@ 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.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|certman|local|request,ignoreIPs,showpass||"{'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.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.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-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'}"
@@ -69,34 +61,14 @@ org.onap.portal|url|getAdminNotifications|*|Admin Notifications|
 org.onap.portal|url|login|*|Login|"{'org.onap.portal|Standard_User', 'org.onap.portal|System_Administrator'}"
 org.onap.portal|url|saveNotification|*|publish notifications|
 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.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.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'}"
-org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|pub||"{'org.onap.dmaap.mr|mrtesttopic.pub'}"
-org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|sub||"{'org.onap.dmaap.mr|mrtesttopic.sub'}"
-org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|create||"{'org.onap.dmaap.mr|create'}"
-org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|destroy||"{'org.onap.dmaap.mr|destroy'}"
-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|password|*|create,reset||"{'org.osaaf.aaf|admin'}"
-org.onap.aai|access|*|*|AAF Namespace Write Access|"{'org.onap.aai|admin'}"
-org.onap.aai|access|*|read|AAF Namespace Read Access|"{'org.onap.aai|member', '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|access|*|*|Onap Write Access|{'org.onap.admin'}
+org.onap|access|*|read|Onap Read Access|{'org.onap.owner'}
+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.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'}"
@@ -135,8 +107,22 @@ 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.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'}"
+org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|pub||"{'org.onap.dmaap.mr|mrtesttopic.pub'}"
+org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|sub||"{'org.onap.dmaap.mr|mrtesttopic.sub'}"
+org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|create||"{'org.onap.dmaap.mr|create'}"
+org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|destroy||"{'org.onap.dmaap.mr|destroy'}"
 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.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.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'}"
@@ -193,6 +179,9 @@ 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.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.openecomp.dmaapBC|access|*|*|DMaap Write Access|{'org.openecomp.dmaapBC.admin'}
 org.openecomp.dmaapBC|access|*|read|DMaap Read Access|{'org.openecomp.dmaapBC.owner'}
 org.onap.pomba|access|*|*|AAF Namespace Write Access|"{'org.onap.pomba|admin'}"
@@ -210,15 +199,10 @@ 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.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.clampdemo|access|*|*|ClampDemo Write Access|{'org.onap.clampdemo.admin'}
 org.onap.clampdemo|access|*|read|ClampDemo Read Access|{'org.onap.clampdemo.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.clamptest|access|*|*|Onap Write Access|{'org.onap.clamptest.admin'}
+org.onap.clamptest|access|*|read|Onap Read Access|{'org.onap.clamptest.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'}"
@@ -285,3 +269,19 @@ org.onap.policy|url|view_reports|*|View Raptor reports|
 org.onap.aaf-sms|access|*|*|AAF Namespace Write Access|"{'org.onap.aaf-sms|admin'}"
 org.onap.aaf-sms|access|*|read|AAF Namespace Read Access|"{'org.onap.aaf-sms|owner'}"
 org.onap.aaf-sms|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+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|password|*|create,reset||"{'org.osaaf.aaf|admin'}"
+org.onap.aai|access|*|*|AAF Namespace Write Access|"{'org.onap.aai|admin'}"
+org.onap.aai|access|*|read|AAF Namespace Read Access|"{'org.onap.aai|member', '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'}
diff --git a/auth/sample/cass_data/role.dat b/auth/sample/cass_data/role.dat
index a494a699..6242f158 100644
--- a/auth/sample/cass_data/role.dat
+++ b/auth/sample/cass_data/role.dat
@@ -1,18 +1,29 @@
-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.vfc|admin|AAF Namespace Administrators|"{'org.onap.vfc|access|*|*'}"
 org.onap.vfc|owner|AAF Namespace Owners|"{'org.onap.vfc|access|*|read'}"
 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|admin|AAF Namespace Administrators|"{'org.onap.dmaap-mr|access|*|*'}"
-org.onap.dmaap-mr|owner|AAF Namespace Owners|"{'org.onap.dmaap-mr|access|*|read'}"
 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.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.mr|admin|AAF Namespace Administrators|"{'org.onap.dmaap.mr|access|*|*'}"
+org.onap.dmaap.mr|create||"{'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|create'}"
+org.onap.dmaap.mr|destroy||"{'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|destroy'}"
+org.onap.dmaap.mr|mrtesttopic.pub||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|pub'}"
+org.onap.dmaap.mr|mrtesttopic.sub||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|sub'}"
+org.onap.dmaap.mr|owner|AAF Namespace Owners|"{'org.onap.dmaap.mr|access|*|read'}"
+org.onap.dmaap.mr|service||"{'org.onap.dmaap.mr|access|*|read'}"
+org.onap.dmaap.mr|view||"{'org.onap.dmaap.mr|topic|*|view'}"
+org.onap.dmaap-mr|admin|AAF Namespace Administrators|"{'org.onap.dmaap-mr|access|*|*'}"
+org.onap.dmaap-mr|owner|AAF Namespace Owners|"{'org.onap.dmaap-mr|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.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|
@@ -21,6 +32,12 @@ org.onap.sdc|TESTOR|TESTOR|
 org.onap.sdc|admin|AAF Namespace Administrators|"{'org.onap.sdc|access|*|*'}"
 org.onap.sdc|app|app|
 org.onap.sdc|owner|AAF Namespace Owners|"{'org.onap.sdc|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.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|admin|Org Admins|"{'org.access|*|*'}"
 org|owner|Org Owners|"{'org.access|*|read,approve'}"
 org.onap.portal|Account_Administrator|Account Administrator|
@@ -43,25 +60,20 @@ org.onap.portal|ops|Portal Operations|"{'org.onap.portal.access|*|read'}"
 org.onap.portal|owner|Portal Owner|"{'org.onap.portal.access|*|read'}"
 org.onap.portal|test1|abc|
 org.onap.portal|tester|Portal Tester|"{'org.onap.portal.access|*|read'}"
-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|admin|Onap Admins|"{'org.onap.access|*|*'}"
 org.onap|owner|onap Owners|"{'org.onap.access|*|read'}"
-org.onap.dmaap.mr|admin|AAF Namespace Administrators|"{'org.onap.dmaap.mr|access|*|*'}"
-org.onap.dmaap.mr|create||"{'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|create'}"
-org.onap.dmaap.mr|destroy||"{'org.onap.dmaap.mr|topicFactory|:org.onap.dmaap.mr.topic:org.onap.dmaap.mr|destroy'}"
-org.onap.dmaap.mr|mrtesttopic.pub||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|pub'}"
-org.onap.dmaap.mr|mrtesttopic.sub||"{'org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|sub'}"
-org.onap.dmaap.mr|owner|AAF Namespace Owners|"{'org.onap.dmaap.mr|access|*|read'}"
-org.onap.dmaap.mr|service||"{'org.onap.dmaap.mr|access|*|read'}"
-org.onap.dmaap.mr|view||"{'org.onap.dmaap.mr|topic|*|view'}"
-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.vid1|admin|AAF Namespace Administrators|"{'org.onap.vid1|access|*|*'}"
+org.onap.vid1|owner|AAF Namespace Owners|"{'org.onap.vid1|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.dcae|owner|AAF Namespace Owners|"{'org.onap.dcae|access|*|read'}"
+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.openecomp|admin|OpenEcomp Admins|"{'org.openecomp.access|*|*'}"
+org.openecomp|owner|OpenEcomp Owners|"{'org.openecomp.access|*|read'}"
 org.onap.vid|Account_Administrator||
 org.onap.vid|Standard_User|Standard User|"{'org.onap.vid|menu|menu_ajax|*', 'org.onap.vid|menu|menu_changemanagement|*', 'org.onap.vid|menu|menu_customer_create|*', 'org.onap.vid|menu|menu_customer|*', 'org.onap.vid|menu|menu_home|*', 'org.onap.vid|menu|menu_itracker|*', 'org.onap.vid|menu|menu_logout|*', 'org.onap.vid|menu|menu_map|*', 'org.onap.vid|menu|menu_newserinstance|*', 'org.onap.vid|menu|menu_profile|*', 'org.onap.vid|menu|menu_reports|*', 'org.onap.vid|menu|menu_searchexisting|*', 'org.onap.vid|menu|menu_servicemodels|*', 'org.onap.vid|menu|menu_tab|*', 'org.onap.vid|menu|menu_viewlog|*', 'org.onap.vid|url|login|*'}"
 org.onap.vid|System_Administrator|System Administrator|"{'org.onap.vid|menu|menu_admin|*', 'org.onap.vid|menu|menu_ajax|*', 'org.onap.vid|menu|menu_changemanagement|*', 'org.onap.vid|menu|menu_customer_create|*', 'org.onap.vid|menu|menu_customer|*', 'org.onap.vid|menu|menu_feedback|*', 'org.onap.vid|menu|menu_help|*', 'org.onap.vid|menu|menu_home|*', 'org.onap.vid|menu|menu_itracker|*', 'org.onap.vid|menu|menu_job_create|*', 'org.onap.vid|menu|menu_job|*', 'org.onap.vid|menu|menu_logout|*', 'org.onap.vid|menu|menu_newserinstance|*', 'org.onap.vid|menu|menu_notes|*', 'org.onap.vid|menu|menu_process|*', 'org.onap.vid|menu|menu_profile_create|*', 'org.onap.vid|menu|menu_profile_import|*', 'org.onap.vid|menu|menu_profile|*', 'org.onap.vid|menu|menu_reports|*', 'org.onap.vid|menu|menu_sample|*', 'org.onap.vid|menu|menu_searchexisting|*', 'org.onap.vid|menu|menu_servicemodels|*', 'org.onap.vid|menu|menu_tab|*', 'org.onap.vid|menu|menu_test|*', 'org.onap.vid|menu|menu_viewlog|*', 'org.onap.vid|url|doclib_admin|*', 'org.onap.vid|url|doclib|*', 'org.onap.vid|url|login|*'}"
@@ -70,8 +82,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.dmaapbc|admin|AAF Namespace Administrators|"{'org.onap.dmaapbc|access|*|*'}"
-org.onap.dmaapbc|owner|AAF Namespace Owners|"{'org.onap.dmaapbc|access|*|read'}"
+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.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'}"
@@ -85,35 +97,35 @@ 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.vid1|admin|AAF Namespace Administrators|"{'org.onap.vid1|access|*|*'}"
-org.onap.vid1|owner|AAF Namespace Owners|"{'org.onap.vid1|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.osaaf.aaf|admin|AAF Admins|"{'org.osaaf.aaf.access|*|*', 'org.osaaf.aaf|cache|all|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.aai|Account_Administrator||
+org.onap.aai|admin|AAF Namespace Administrators|"{'org.onap.aai|access|*|*'}"
+org.onap.aai|member||"{'org.onap.aai|access|*|read'}"
+org.onap.aai|owner|AAF Namespace Owners|"{'org.onap.aai|access|*|read'}"
+org.onap.aai|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||"{'org.onap.aai|resources|*|get'}"
+org.onap.aai|traversal_advanced||"{'org.onap.aai|traversal|*|advanced'}"
+org.onap.aai|traversal_basic||"{'org.onap.aai|traversal|*|basic'}"
 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.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.dcae|owner|AAF Namespace Owners|"{'org.onap.dcae|access|*|read'}"
-org.onap.dcae|seeCerts||"{'org.onap.dcae|certman|local|request,ignoreIPs,showpass'}"
 org.onap.pomba|admin|AAF Namespace Administrators|"{'org.onap.pomba|access|*|*'}"
 org.onap.pomba|owner|AAF Namespace Owners|"{'org.onap.pomba|access|*|read'}"
-org.openecomp|admin|OpenEcomp Admins|"{'org.openecomp.access|*|*'}"
-org.openecomp|owner|OpenEcomp Owners|"{'org.openecomp.access|*|read'}"
 org.onap.vid2|admin|AAF Namespace Administrators|"{'org.onap.vid2|access|*|*'}"
 org.onap.vid2|owner|AAF Namespace Owners|"{'org.onap.vid2|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|*|*'}"
-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'}"
 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|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'}"
 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.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.policy|Account_Administrator|null|
 org.onap.policy|Policy_Admin|Policy Admin|"{'org.onap.policy|menu|menu_policy|*', 'org.onap.policy|url|policy_dashboard|*', 'org.onap.policy|url|policy_dictionary|*', 'org.onap.policy|url|policy_editor|*', 'org.onap.policy|url|policy_pdp|*', 'org.onap.policy|url|policy_push|*'}"
 org.onap.policy|Policy_Editor|Policy Editor|"{'org.onap.policy|menu|menu_policy|*', 'org.onap.policy|url|policy_dashboard|*', 'org.onap.policy|url|policy_editor|*', 'org.onap.policy|url|policy_pdp|*', 'org.onap.policy|url|policy_push|*'}"
@@ -133,15 +145,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.aaf|admin|AAF Admins|"{'org.osaaf.aaf.access|*|*', 'org.osaaf.aaf|cache|all|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.aai|Account_Administrator||
-org.onap.aai|admin|AAF Namespace Administrators|"{'org.onap.aai|access|*|*'}"
-org.onap.aai|member||"{'org.onap.aai|access|*|read'}"
-org.onap.aai|owner|AAF Namespace Owners|"{'org.onap.aai|access|*|read'}"
-org.onap.aai|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||"{'org.onap.aai|resources|*|get'}"
-org.onap.aai|traversal_advanced||"{'org.onap.aai|traversal|*|advanced'}"
-org.onap.aai|traversal_basic||"{'org.onap.aai|traversal|*|basic'}"
diff --git a/auth/sample/cass_data/user_role.dat b/auth/sample/cass_data/user_role.dat
index 7001679c..acf6ae4a 100644
--- a/auth/sample/cass_data/user_role.dat
+++ b/auth/sample/cass_data/user_role.dat
@@ -1,170 +1,167 @@
-mmanager@people.osaaf.org|org.onap.aaf-sms.admin|2019-04-08 19:20:10.000+0000|org.onap.aaf-sms|admin
-mmanager@people.osaaf.org|org.onap.aaf-sms.owner|2019-04-08 19:20:10.000+0000|org.onap.aaf-sms|owner
-mmanager@people.osaaf.org|org.onap.aai.admin|2019-04-08 19:20:10.000+0000|org.onap.aai|admin
-mmanager@people.osaaf.org|org.onap.aai.owner|2019-04-08 19:20:10.000+0000|org.onap.aai|owner
-mmanager@people.osaaf.org|org.onap.appc.admin|2019-04-08 19:20:10.000+0000|org.onap.appc|admin
-mmanager@people.osaaf.org|org.onap.appc.owner|2019-04-08 19:20:10.000+0000|org.onap.appc|owner
-mmanager@people.osaaf.org|org.onap.clamp.admin|2019-04-08 19:20:10.000+0000|org.onap.clamp|admin
-mmanager@people.osaaf.org|org.onap.clamp.owner|2019-04-08 19:20:10.000+0000|org.onap.clamp|owner
-mmanager@people.osaaf.org|org.onap.dcae.admin|2019-04-08 19:20:10.000+0000|org.onap.dcae|admin
-mmanager@people.osaaf.org|org.onap.dcae.owner|2019-04-08 19:20:10.000+0000|org.onap.dcae|owner
-mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc-mm-prov|admin
-mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.owner|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc-mm-prov|owner
-mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc-topic-mgr|admin
-mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.owner|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc-topic-mgr|owner
-mmanager@people.osaaf.org|org.onap.dmaap-bc.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc|admin
-mmanager@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc.api|Controller
-mmanager@people.osaaf.org|org.onap.dmaap-bc.owner|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc|owner
-mmanager@people.osaaf.org|org.onap.dmaap-dr.owner|2019-04-08 19:20:10.000+0000|org.onap.dmaap-dr|owner
-mmanager@people.osaaf.org|org.onap.dmaap-mr.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-mr|admin
-mmanager@people.osaaf.org|org.onap.dmaap-mr.owner|2019-04-08 19:20:10.000+0000|org.onap.dmaap-mr|owner
-mmanager@people.osaaf.org|org.onap.oof.admin|2019-04-08 19:20:10.000+0000|org.onap.oof|admin
-mmanager@people.osaaf.org|org.onap.oof.owner|2019-04-08 19:20:10.000+0000|org.onap.oof|owner
-mmanager@people.osaaf.org|org.onap.policy.admin|2019-04-08 19:20:10.000+0000|org.onap.policy|admin
-mmanager@people.osaaf.org|org.onap.policy.owner|2019-04-08 19:20:10.000+0000|org.onap.policy|owner
-mmanager@people.osaaf.org|org.onap.pomba.admin|2019-04-08 19:20:10.000+0000|org.onap.pomba|admin
-mmanager@people.osaaf.org|org.onap.pomba.owner|2019-04-08 19:20:10.000+0000|org.onap.pomba|owner
-mmanager@people.osaaf.org|org.onap.portal.admin|2019-04-08 19:20:10.000+0000|org.onap.portal|admin
-mmanager@people.osaaf.org|org.onap.portal.owner|2019-04-08 19:20:10.000+0000|org.onap.portal|owner
-mmanager@people.osaaf.org|org.onap.sdc.admin|2019-04-08 19:20:10.000+0000|org.onap.sdc|admin
-mmanager@people.osaaf.org|org.onap.sdc.owner|2019-04-08 19:20:10.000+0000|org.onap.sdc|owner
-mmanager@people.osaaf.org|org.onap.sdnc.admin|2019-04-08 19:20:10.000+0000|org.onap.sdnc|admin
-mmanager@people.osaaf.org|org.onap.sdnc.owner|2019-04-08 19:20:10.000+0000|org.onap.sdnc|owner
-mmanager@people.osaaf.org|org.onap.so.admin|2019-04-08 19:20:10.000+0000|org.onap.so|admin
-mmanager@people.osaaf.org|org.onap.so.owner|2019-04-08 19:20:10.000+0000|org.onap.so|owner
-mmanager@people.osaaf.org|org.onap.vfc.admin|2019-04-08 19:20:10.000+0000|org.onap.vfc|admin
-mmanager@people.osaaf.org|org.onap.vfc.owner|2019-04-08 19:20:10.000+0000|org.onap.vfc|owner
-mmanager@people.osaaf.org|org.onap.vid.admin|2019-04-08 19:20:10.000+0000|org.onap.vid|admin
-mmanager@people.osaaf.org|org.onap.vid.owner|2019-04-08 19:20:10.000+0000|org.onap.vid|owner
-mmanager@people.osaaf.org|org.onap.vid1.admin|2019-04-08 19:20:10.000+0000|org.onap.vid1|admin
-mmanager@people.osaaf.org|org.onap.vid1.owner|2019-04-08 19:20:10.000+0000|org.onap.vid1|owner
-mmanager@people.osaaf.org|org.onap.vid2.admin|2019-04-08 19:20:10.000+0000|org.onap.vid2|admin
-mmanager@people.osaaf.org|org.onap.vid2.owner|2019-04-08 19:20:10.000+0000|org.onap.vid2|owner
-shi@portal.onap.org|org.onap.portal.admin|2019-04-08 19:20:10.000+0000|org.onap.portal|admin
-demo@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-04-08 19:20:10.000+0000|org.onap.dmaap.mr|view
-demo@people.osaaf.org|org.onap.aai.Account_Administrator|2019-04-08 19:20:10.000+0000|org.onap.aai|Account_Administrator
-demo@people.osaaf.org|org.onap.aai.member|2019-04-08 19:20:10.000+0000|org.onap.aai|member
-demo@people.osaaf.org|org.onap.aai.resources_readonly|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_readonly
-demo@people.osaaf.org|org.onap.aai.traversal_basic|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_basic
-demo@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc.api|Controller
-demo@people.osaaf.org|org.onap.dmaap.mr.create|2019-04-08 19:20:10.000+0000|org.onap.dmaap.mr|create
-demo@people.osaaf.org|org.onap.dmaap.mr.destroy|2019-04-08 19:20:10.000+0000|org.onap.dmaap.mr|destroy
-demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-04-08 19:20:10.000+0000|org.onap.dmaap.mr|mrtesttopic.pub
-demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-04-08 19:20:10.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
-demo@people.osaaf.org|org.onap.dmaap.mr.view|2019-04-08 19:20:10.000+0000|org.onap.dmaap.mr|view
-demo@people.osaaf.org|org.onap.policy.Account_Administrator|2019-04-08 19:20:10.000+0000|org.onap.policy|Account_Administrator
-demo@people.osaaf.org|org.onap.policy.System_Administrator|2019-04-08 19:20:10.000+0000|org.onap.policy|System_Administrator
-demo@people.osaaf.org|org.onap.policy.pdpd.admin|2019-04-08 19:20:10.000+0000|org.onap.policy|pdpd.admin
-demo@people.osaaf.org|org.onap.portal.Account_Administrator|2019-04-08 19:20:10.000+0000|org.onap.portal|Account_Administrator
-demo@people.osaaf.org|org.onap.portal.System_Administrator|2019-04-08 19:20:10.000+0000|org.onap.portal|System_Administrator
-demo@people.osaaf.org|org.onap.portal.admin|2019-04-08 19:20:10.000+0000|org.onap.portal|admin
-demo@people.osaaf.org|org.onap.portal.test.admin|2019-04-08 19:20:10.000+0000|org.onap.portal.test|admin
-demo@people.osaaf.org|org.onap.portal.test.owner|2019-04-08 19:20:10.000+0000|org.onap.portal.test|owner
-demo@people.osaaf.org|org.onap.portal.test.user1|2019-04-08 19:20:10.000+0000|org.onap.portal.test|user1
-demo@people.osaaf.org|org.onap.sdc.ADMIN|2019-04-08 19:20:10.000+0000|org.onap.sdc|ADMIN
-demo@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-04-08 19:20:10.000+0000|org.onap.sdc|Account_Administrator
-demo@people.osaaf.org|org.onap.vid.Account_Administrator|2019-04-08 19:20:10.000+0000|org.onap.vid|Account_Administrator
-demo@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-08 19:20:10.000+0000|org.onap.vid|System_Administrator
-jh0003@people.osaaf.org|org.onap.portal.admin|2019-04-08 19:20:10.000+0000|org.onap.portal|admin
-jh0003@people.osaaf.org|org.onap.sdc.ADMIN|2019-04-08 19:20:10.000+0000|org.onap.sdc|ADMIN
-jh0003@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-04-08 19:20:10.000+0000|org.onap.sdc|Account_Administrator
-cs0008@people.osaaf.org|org.onap.portal.designer|2019-04-08 19:20:10.000+0000|org.onap.portal|designer
-cs0008@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-08 19:20:10.000+0000|org.onap.sdc|TESTOR
-jm0007@people.osaaf.org|org.onap.portal.tester|2019-04-08 19:20:10.000+0000|org.onap.portal|tester
-jm0007@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-08 19:20:10.000+0000|org.onap.sdc|TESTOR
-op0001@people.osaaf.org|org.onap.portal.ops|2019-04-08 19:20:10.000+0000|org.onap.portal|ops
-op0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-08 19:20:10.000+0000|org.onap.sdc|TESTOR
-gv0001@people.osaaf.org|org.onap.portal.governor|2019-04-08 19:20:10.000+0000|org.onap.portal|governor
-gv0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-08 19:20:10.000+0000|org.onap.sdc|TESTOR
-pm0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-08 19:20:10.000+0000|org.onap.sdc|TESTOR
-ps0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-08 19:20:10.000+0000|org.onap.sdc|TESTOR
-aaf_admin@people.osaaf.org|org.onap.aaf-sms.admin|2019-04-08 19:20:10.000+0000|org.onap.aaf-sms|admin
-aaf_admin@people.osaaf.org|org.onap.aai.admin|2019-04-08 19:20:10.000+0000|org.onap.aai|admin
-aaf_admin@people.osaaf.org|org.onap.appc.admin|2019-04-08 19:20:10.000+0000|org.onap.appc|admin
-aaf_admin@people.osaaf.org|org.onap.clamp.admin|2019-04-08 19:20:10.000+0000|org.onap.clamp|admin
-aaf_admin@people.osaaf.org|org.onap.dcae.admin|2019-04-08 19:20:10.000+0000|org.onap.dcae|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc-mm-prov|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc-topic-mgr|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc.api|Controller
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc.api|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.owner|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc.api|owner
-aaf_admin@people.osaaf.org|org.onap.dmaap-dr.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-dr|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-mr.admin|2019-04-08 19:20:10.000+0000|org.onap.dmaap-mr|admin
-aaf_admin@people.osaaf.org|org.onap.oof.admin|2019-04-08 19:20:10.000+0000|org.onap.oof|admin
-aaf_admin@people.osaaf.org|org.onap.policy.admin|2019-04-08 19:20:10.000+0000|org.onap.policy|admin
-aaf_admin@people.osaaf.org|org.onap.pomba.admin|2019-04-08 19:20:10.000+0000|org.onap.pomba|admin
-aaf_admin@people.osaaf.org|org.onap.portal.admin|2019-04-08 19:20:10.000+0000|org.onap.portal|admin
-aaf_admin@people.osaaf.org|org.onap.sdc.admin|2019-04-08 19:20:10.000+0000|org.onap.sdc|admin
-aaf_admin@people.osaaf.org|org.onap.sdc.owner|2019-04-08 19:20:10.000+0000|org.onap.sdc|owner
-aaf_admin@people.osaaf.org|org.onap.sdnc.admin|2019-04-08 19:20:10.000+0000|org.onap.sdnc|admin
-aaf_admin@people.osaaf.org|org.onap.so.admin|2019-04-08 19:20:10.000+0000|org.onap.so|admin
-aaf_admin@people.osaaf.org|org.onap.so.owner|2019-04-08 19:20:10.000+0000|org.onap.so|owner
-aaf_admin@people.osaaf.org|org.onap.vfc.admin|2019-04-08 19:20:10.000+0000|org.onap.vfc|admin
-aaf_admin@people.osaaf.org|org.onap.vid.admin|2019-04-08 19:20:10.000+0000|org.onap.vid|admin
-aaf_admin@people.osaaf.org|org.onap.vid1.admin|2019-04-08 19:20:10.000+0000|org.onap.vid1|admin
-aaf_admin@people.osaaf.org|org.onap.vid2.admin|2019-04-08 19:20:10.000+0000|org.onap.vid2|admin
-aaf_admin@people.osaaf.org|org.osaaf.aaf.admin|2019-04-08 19:20:10.000+0000|org.osaaf.aaf|admin
-aaf_admin@people.osaaf.org|org.osaaf.people.admin|2019-04-08 19:20:10.000+0000|org.osaaf.people|admin
-aaf_admin@people.osaaf.org|org.osaaf.people.owner|2019-04-08 19:20:10.000+0000|org.osaaf.people|owner
-deployer@people.osaaf.org|org.osaaf.aaf.deploy|2019-04-08 19:20:10.000+0000|org.osaaf.aaf|deploy
-portal_admin@people.osaaf.org|org.onap.portal.admin|2019-04-08 19:20:10.000+0000|org.onap.portal|admin
-osaaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-04-08 19:20:10.000+0000|org.osaaf.aaf|admin
-aaf@aaf.osaaf.org|org.admin|2019-04-08 19:20:10.000+0000|org|admin
-aaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-04-08 19:20:10.000+0000|org.osaaf.aaf|admin
-aaf@aaf.osaaf.org|org.osaaf.aaf.service|2019-04-08 19:20:10.000+0000|org.osaaf.aaf|service
-aaf@aaf.osaaf.org|org.osaaf.people.admin|2019-04-08 19:20:10.000+0000|org.osaaf.people|admin
-aaf-sms@aaf-sms.onap.org|org.onap.aaf-sms.service|2019-04-08 19:20:10.000+0000|org.onap.aaf-sms|service
-clamp@clamptest.onap.org|org.onap.clamptest.owner|2019-04-08 19:20:10.000+0000|org.onap.clamptest|owner
-clamp@clamptest.onap.org|org.onap.clamptest.service|2019-04-08 19:20:10.000+0000|org.onap.clamptest|admin
-clamp@clamp.osaaf.org|org.onap.clamp.service|2019-04-08 19:20:10.000+0000|org.onap.clamp|service
-clamp@clampdemo.onap.org|org.onap.clampdemo.owner|2019-04-08 19:20:10.000+0000|org.onap.clampdemo|owner
-clamp@clampdemo.onap.org|org.onap.clampdemo.service|2019-04-08 19:20:10.000+0000|org.onap.clampdemo|admin
-clamp@clamp.onap.org|org.onap.clamp.clds.admin.dev|2019-04-08 19:20:10.000+0000|org.onap.clamp|clds.admin.dev
-clamp@clamp.onap.org|org.onap.clamp.clds.designer.dev|2019-04-08 19:20:10.000+0000|org.onap.clamp|clds.designer.dev
-clamp@clamp.onap.org|org.onap.clamp.clds.vf_filter_all.dev|2019-04-08 19:20:10.000+0000|org.onap.clamp|clds.vf_filter_all.dev
-clamp@clamp.onap.org|org.onap.clamp.service|2019-04-08 19:20:10.000+0000|org.onap.clamp|service
-clamp@clamp.onap.org|org.onap.clampdemo.owner|2019-04-08 19:20:10.000+0000|org.onap.clampdemo|owner
-clamp@clamp.onap.org|org.onap.clampdemo.service|2019-04-08 19:20:10.000+0000|org.onap.clampdemo|admin
-clamp@clamp.onap.org|org.onap.clamptest.owner|2019-04-08 19:20:10.000+0000|org.onap.clamptest|owner
-clamp@clamp.onap.org|org.onap.clamptest.service|2019-04-08 19:20:10.000+0000|org.onap.clamptest|admin
-aai@aai.onap.org|org.onap.aai.admin|2019-04-08 19:20:10.000+0000|org.onap.aai|admin
-aai@aai.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-aai@aai.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-appc@appc.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-appc@appc.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-appc@appc.onap.org|org.onap.appc.admin|2019-04-08 19:20:10.000+0000|org.onap.appc|admin
-dcae@dcae.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-dcae@dcae.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-dcae@dcae.onap.org|org.onap.dcae.seeCerts|2019-04-08 19:20:10.000+0000|org.onap.dcae|seeCerts
-oof@oof.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-oof@oof.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-oof@oof.onap.org|org.onap.oof.service|2019-04-08 19:20:10.000+0000|org.onap.oof|service
-so@so.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-so@so.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-so@so.onap.org|org.onap.so.app|2019-04-08 19:20:10.000+0000|org.onap.so|app
-sdc@sdc.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-sdc@sdc.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-sdnc@sdnc.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-sdnc@sdnc.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-onap-sdnc@sdnc.onap.org|org.onap.sdnc.service|2019-04-08 19:20:10.000+0000|org.onap.sdnc|service
-vfc@vfc.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-vfc@vfc.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-vfc@vfc.onap.org|org.onap.vfc.service|2019-04-08 19:20:10.000+0000|org.onap.vfc|service
-policy@policy.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-policy@policy.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-policy@policy.onap.org|org.onap.policy.admin|2019-04-08 19:20:10.000+0000|org.onap.policy|admin
-policy@policy.onap.org|org.onap.policy.pdpd.admin|2019-04-08 19:20:10.000+0000|org.onap.policy|pdpd.admin
-policy@policy.onap.org|org.onap.policy.seeCerts|2019-04-08 19:20:10.000+0000|org.onap.policy|seeCerts
-pomba@pomba.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-pomba@pomba.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-vid@vid.onap.org|org.onap.aai.resources_all|2019-04-08 19:20:10.000+0000|org.onap.aai|resources_all
-vid@vid.onap.org|org.onap.aai.traversal_advanced|2019-04-08 19:20:10.000+0000|org.onap.aai|traversal_advanced
-vid1@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-08 19:20:10.000+0000|org.onap.vid|System_Administrator
-vid2@people.osaaf.org|org.onap.vid.Standard_User|2019-04-08 19:20:10.000+0000|org.onap.vid|Standard_User
-vid2@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-08 19:20:10.000+0000|org.onap.vid|System_Administrator
-dmaap-bc@bc.dmaap.onap.org|org.onap.dmaap.bc.service|2019-04-08 19:20:10.000+0000|org.onap.dmaap.bc|service
-dmaap-bc@dmaap-bc.onap.org|org.onap.dmaap-bc.seeCerts|2019-04-08 19:20:10.000+0000|org.onap.dmaap-bc|seeCerts
-dmaap-dr@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-08 19:20:10.000+0000|org.onap.dmaap-dr|seeCerts
-dmaap-dr-prov@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-08 19:20:10.000+0000|org.onap.dmaap-dr|seeCerts
-dmaap-dr-node@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-08 19:20:10.000+0000|org.onap.dmaap-dr|seeCerts
+mmanager@people.osaaf.org|org.onap.aaf-sms.admin|2019-04-09 08:14:37.000+0000|org.onap.aaf-sms|admin
+mmanager@people.osaaf.org|org.onap.aaf-sms.owner|2019-04-09 08:14:37.000+0000|org.onap.aaf-sms|owner
+mmanager@people.osaaf.org|org.onap.aai.admin|2019-04-09 08:14:37.000+0000|org.onap.aai|admin
+mmanager@people.osaaf.org|org.onap.aai.owner|2019-04-09 08:14:37.000+0000|org.onap.aai|owner
+mmanager@people.osaaf.org|org.onap.appc.admin|2019-04-09 08:14:37.000+0000|org.onap.appc|admin
+mmanager@people.osaaf.org|org.onap.appc.owner|2019-04-09 08:14:37.000+0000|org.onap.appc|owner
+mmanager@people.osaaf.org|org.onap.clamp.admin|2019-04-09 08:14:37.000+0000|org.onap.clamp|admin
+mmanager@people.osaaf.org|org.onap.clamp.owner|2019-04-09 08:14:37.000+0000|org.onap.clamp|owner
+mmanager@people.osaaf.org|org.onap.dcae.admin|2019-04-09 08:14:37.000+0000|org.onap.dcae|admin
+mmanager@people.osaaf.org|org.onap.dcae.owner|2019-04-09 08:14:37.000+0000|org.onap.dcae|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc-mm-prov|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.owner|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc-mm-prov|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc-topic-mgr|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.owner|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc-topic-mgr|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc.api|Controller
+mmanager@people.osaaf.org|org.onap.dmaap-bc.owner|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc|owner
+mmanager@people.osaaf.org|org.onap.dmaap-dr.owner|2019-04-09 08:14:37.000+0000|org.onap.dmaap-dr|owner
+mmanager@people.osaaf.org|org.onap.dmaap-mr.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-mr|admin
+mmanager@people.osaaf.org|org.onap.dmaap-mr.owner|2019-04-09 08:14:37.000+0000|org.onap.dmaap-mr|owner
+mmanager@people.osaaf.org|org.onap.oof.admin|2019-04-09 08:14:37.000+0000|org.onap.oof|admin
+mmanager@people.osaaf.org|org.onap.oof.owner|2019-04-09 08:14:37.000+0000|org.onap.oof|owner
+mmanager@people.osaaf.org|org.onap.owner|2019-04-09 08:14:37.000+0000|org.onap|owner
+mmanager@people.osaaf.org|org.onap.policy.admin|2019-04-09 08:14:37.000+0000|org.onap.policy|admin
+mmanager@people.osaaf.org|org.onap.policy.owner|2019-04-09 08:14:37.000+0000|org.onap.policy|owner
+mmanager@people.osaaf.org|org.onap.pomba.admin|2019-04-09 08:14:37.000+0000|org.onap.pomba|admin
+mmanager@people.osaaf.org|org.onap.pomba.owner|2019-04-09 08:14:37.000+0000|org.onap.pomba|owner
+mmanager@people.osaaf.org|org.onap.portal.admin|2019-04-09 08:14:37.000+0000|org.onap.portal|admin
+mmanager@people.osaaf.org|org.onap.portal.owner|2019-04-09 08:14:37.000+0000|org.onap.portal|owner
+mmanager@people.osaaf.org|org.onap.sdc.admin|2019-04-09 08:14:37.000+0000|org.onap.sdc|admin
+mmanager@people.osaaf.org|org.onap.sdc.owner|2019-04-09 08:14:37.000+0000|org.onap.sdc|owner
+mmanager@people.osaaf.org|org.onap.sdnc.admin|2019-04-09 08:14:37.000+0000|org.onap.sdnc|admin
+mmanager@people.osaaf.org|org.onap.sdnc.owner|2019-04-09 08:14:37.000+0000|org.onap.sdnc|owner
+mmanager@people.osaaf.org|org.onap.so.admin|2019-04-09 08:14:37.000+0000|org.onap.so|admin
+mmanager@people.osaaf.org|org.onap.so.owner|2019-04-09 08:14:37.000+0000|org.onap.so|owner
+mmanager@people.osaaf.org|org.onap.vfc.admin|2019-04-09 08:14:37.000+0000|org.onap.vfc|admin
+mmanager@people.osaaf.org|org.onap.vfc.owner|2019-04-09 08:14:37.000+0000|org.onap.vfc|owner
+mmanager@people.osaaf.org|org.onap.vid.admin|2019-04-09 08:14:37.000+0000|org.onap.vid|admin
+mmanager@people.osaaf.org|org.onap.vid.owner|2019-04-09 08:14:37.000+0000|org.onap.vid|owner
+mmanager@people.osaaf.org|org.onap.vid1.admin|2019-04-09 08:14:37.000+0000|org.onap.vid1|admin
+mmanager@people.osaaf.org|org.onap.vid1.owner|2019-04-09 08:14:37.000+0000|org.onap.vid1|owner
+mmanager@people.osaaf.org|org.onap.vid2.admin|2019-04-09 08:14:37.000+0000|org.onap.vid2|admin
+mmanager@people.osaaf.org|org.onap.vid2.owner|2019-04-09 08:14:37.000+0000|org.onap.vid2|owner
+mmanager@people.osaaf.org|org.osaaf.people.owner|2019-04-09 08:14:37.000+0000|org.osaaf.people|owner
+shi@portal.onap.org|org.onap.portal.admin|2019-04-09 08:14:37.000+0000|org.onap.portal|admin
+demo@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-04-09 08:14:37.000+0000|org.onap.dmaap.mr|view
+demo@people.osaaf.org|org.onap.aai.Account_Administrator|2019-04-09 08:14:37.000+0000|org.onap.aai|Account_Administrator
+demo@people.osaaf.org|org.onap.aai.member|2019-04-09 08:14:37.000+0000|org.onap.aai|member
+demo@people.osaaf.org|org.onap.aai.resources_readonly|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_readonly
+demo@people.osaaf.org|org.onap.aai.traversal_basic|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_basic
+demo@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc.api|Controller
+demo@people.osaaf.org|org.onap.dmaap.mr.create|2019-04-09 08:14:37.000+0000|org.onap.dmaap.mr|create
+demo@people.osaaf.org|org.onap.dmaap.mr.destroy|2019-04-09 08:14:37.000+0000|org.onap.dmaap.mr|destroy
+demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-04-09 08:14:37.000+0000|org.onap.dmaap.mr|mrtesttopic.pub
+demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-04-09 08:14:37.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
+demo@people.osaaf.org|org.onap.dmaap.mr.view|2019-04-09 08:14:37.000+0000|org.onap.dmaap.mr|view
+demo@people.osaaf.org|org.onap.policy.Account_Administrator|2019-04-09 08:14:37.000+0000|org.onap.policy|Account_Administrator
+demo@people.osaaf.org|org.onap.policy.System_Administrator|2019-04-09 08:14:37.000+0000|org.onap.policy|System_Administrator
+demo@people.osaaf.org|org.onap.policy.pdpd.admin|2019-04-09 08:14:37.000+0000|org.onap.policy|pdpd.admin
+demo@people.osaaf.org|org.onap.portal.Account_Administrator|2019-04-09 08:14:37.000+0000|org.onap.portal|Account_Administrator
+demo@people.osaaf.org|org.onap.portal.System_Administrator|2019-04-09 08:14:37.000+0000|org.onap.portal|System_Administrator
+demo@people.osaaf.org|org.onap.portal.admin|2019-04-09 08:14:37.000+0000|org.onap.portal|admin
+demo@people.osaaf.org|org.onap.portal.test.admin|2019-04-09 08:14:37.000+0000|org.onap.portal.test|admin
+demo@people.osaaf.org|org.onap.portal.test.owner|2019-04-09 08:14:37.000+0000|org.onap.portal.test|owner
+demo@people.osaaf.org|org.onap.portal.test.user1|2019-04-09 08:14:37.000+0000|org.onap.portal.test|user1
+demo@people.osaaf.org|org.onap.sdc.ADMIN|2019-04-09 08:14:37.000+0000|org.onap.sdc|ADMIN
+demo@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-04-09 08:14:37.000+0000|org.onap.sdc|Account_Administrator
+demo@people.osaaf.org|org.onap.vid.Account_Administrator|2019-04-09 08:14:37.000+0000|org.onap.vid|Account_Administrator
+demo@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-09 08:14:37.000+0000|org.onap.vid|System_Administrator
+jh0003@people.osaaf.org|org.onap.portal.admin|2019-04-09 08:14:37.000+0000|org.onap.portal|admin
+jh0003@people.osaaf.org|org.onap.sdc.ADMIN|2019-04-09 08:14:37.000+0000|org.onap.sdc|ADMIN
+jh0003@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-04-09 08:14:37.000+0000|org.onap.sdc|Account_Administrator
+cs0008@people.osaaf.org|org.onap.portal.designer|2019-04-09 08:14:37.000+0000|org.onap.portal|designer
+cs0008@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-09 08:14:37.000+0000|org.onap.sdc|TESTOR
+jm0007@people.osaaf.org|org.onap.portal.tester|2019-04-09 08:14:37.000+0000|org.onap.portal|tester
+jm0007@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-09 08:14:37.000+0000|org.onap.sdc|TESTOR
+op0001@people.osaaf.org|org.onap.portal.ops|2019-04-09 08:14:37.000+0000|org.onap.portal|ops
+op0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-09 08:14:37.000+0000|org.onap.sdc|TESTOR
+gv0001@people.osaaf.org|org.onap.portal.governor|2019-04-09 08:14:37.000+0000|org.onap.portal|governor
+gv0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-09 08:14:37.000+0000|org.onap.sdc|TESTOR
+pm0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-09 08:14:37.000+0000|org.onap.sdc|TESTOR
+ps0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-09 08:14:37.000+0000|org.onap.sdc|TESTOR
+aaf_admin@people.osaaf.org|org.onap.aai.admin|2019-04-09 08:14:37.000+0000|org.onap.aai|admin
+aaf_admin@people.osaaf.org|org.onap.appc.admin|2019-04-09 08:14:37.000+0000|org.onap.appc|admin
+aaf_admin@people.osaaf.org|org.onap.clamp.admin|2019-04-09 08:14:37.000+0000|org.onap.clamp|admin
+aaf_admin@people.osaaf.org|org.onap.dcae.admin|2019-04-09 08:14:37.000+0000|org.onap.dcae|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc-mm-prov|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc-topic-mgr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc.api|Controller
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc.api|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-dr.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-dr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-mr.admin|2019-04-09 08:14:37.000+0000|org.onap.dmaap-mr|admin
+aaf_admin@people.osaaf.org|org.onap.oof.admin|2019-04-09 08:14:37.000+0000|org.onap.oof|admin
+aaf_admin@people.osaaf.org|org.onap.policy.admin|2019-04-09 08:14:37.000+0000|org.onap.policy|admin
+aaf_admin@people.osaaf.org|org.onap.pomba.admin|2019-04-09 08:14:37.000+0000|org.onap.pomba|admin
+aaf_admin@people.osaaf.org|org.onap.portal.admin|2019-04-09 08:14:37.000+0000|org.onap.portal|admin
+aaf_admin@people.osaaf.org|org.onap.sdc.admin|2019-04-09 08:14:37.000+0000|org.onap.sdc|admin
+aaf_admin@people.osaaf.org|org.onap.sdnc.admin|2019-04-09 08:14:37.000+0000|org.onap.sdnc|admin
+aaf_admin@people.osaaf.org|org.onap.so.admin|2019-04-09 08:14:37.000+0000|org.onap.so|admin
+aaf_admin@people.osaaf.org|org.onap.vfc.admin|2019-04-09 08:14:37.000+0000|org.onap.vfc|admin
+aaf_admin@people.osaaf.org|org.onap.vid.admin|2019-04-09 08:14:37.000+0000|org.onap.vid|admin
+aaf_admin@people.osaaf.org|org.onap.vid1.admin|2019-04-09 08:14:37.000+0000|org.onap.vid1|admin
+aaf_admin@people.osaaf.org|org.onap.vid2.admin|2019-04-09 08:14:37.000+0000|org.onap.vid2|admin
+aaf_admin@people.osaaf.org|org.osaaf.aaf.admin|2019-04-09 08:14:37.000+0000|org.osaaf.aaf|admin
+aaf_admin@people.osaaf.org|org.osaaf.people.admin|2019-04-09 08:14:37.000+0000|org.osaaf.people|admin
+deployer@people.osaaf.org|org.osaaf.aaf.deploy|2019-04-09 08:14:37.000+0000|org.osaaf.aaf|deploy
+portal_admin@people.osaaf.org|org.onap.portal.admin|2019-04-09 08:14:37.000+0000|org.onap.portal|admin
+osaaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-04-09 08:14:37.000+0000|org.osaaf.aaf|admin
+aaf@aaf.osaaf.org|org.admin|2019-04-09 08:14:37.000+0000|org|admin
+aaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-04-09 08:14:37.000+0000|org.osaaf.aaf|admin
+aaf@aaf.osaaf.org|org.osaaf.aaf.service|2019-04-09 08:14:37.000+0000|org.osaaf.aaf|service
+aaf@aaf.osaaf.org|org.osaaf.people.admin|2019-04-09 08:14:37.000+0000|org.osaaf.people|admin
+aaf-sms@aaf-sms.onap.org|org.onap.aaf-sms.service|2019-04-09 08:14:37.000+0000|org.onap.aaf-sms|service
+clamp@clamptest.onap.org|org.onap.clamptest.owner|2019-04-09 08:14:37.000+0000|org.onap.clamptest|owner
+clamp@clamptest.onap.org|org.onap.clamptest.service|2019-04-09 08:14:37.000+0000|org.onap.clamptest|admin
+clamp@clamp.osaaf.org|org.onap.clamp.service|2019-04-09 08:14:37.000+0000|org.onap.clamp|service
+clamp@clampdemo.onap.org|org.onap.clampdemo.owner|2019-04-09 08:14:37.000+0000|org.onap.clampdemo|owner
+clamp@clampdemo.onap.org|org.onap.clampdemo.service|2019-04-09 08:14:37.000+0000|org.onap.clampdemo|admin
+clamp@clamp.onap.org|org.onap.clamp.clds.admin.dev|2019-04-09 08:14:37.000+0000|org.onap.clamp|clds.admin.dev
+clamp@clamp.onap.org|org.onap.clamp.clds.designer.dev|2019-04-09 08:14:37.000+0000|org.onap.clamp|clds.designer.dev
+clamp@clamp.onap.org|org.onap.clamp.clds.vf_filter_all.dev|2019-04-09 08:14:37.000+0000|org.onap.clamp|clds.vf_filter_all.dev
+clamp@clamp.onap.org|org.onap.clamp.service|2019-04-09 08:14:37.000+0000|org.onap.clamp|service
+clamp@clamp.onap.org|org.onap.clampdemo.owner|2019-04-09 08:14:37.000+0000|org.onap.clampdemo|owner
+clamp@clamp.onap.org|org.onap.clampdemo.service|2019-04-09 08:14:37.000+0000|org.onap.clampdemo|admin
+clamp@clamp.onap.org|org.onap.clamptest.owner|2019-04-09 08:14:37.000+0000|org.onap.clamptest|owner
+clamp@clamp.onap.org|org.onap.clamptest.service|2019-04-09 08:14:37.000+0000|org.onap.clamptest|admin
+aai@aai.onap.org|org.onap.aai.admin|2019-04-09 08:14:37.000+0000|org.onap.aai|admin
+aai@aai.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+aai@aai.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+appc@appc.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+appc@appc.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+appc@appc.onap.org|org.onap.appc.admin|2019-04-09 08:14:37.000+0000|org.onap.appc|admin
+dcae@dcae.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+dcae@dcae.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+dcae@dcae.onap.org|org.onap.dcae.seeCerts|2019-04-09 08:14:37.000+0000|org.onap.dcae|seeCerts
+oof@oof.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+oof@oof.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+oof@oof.onap.org|org.onap.oof.service|2019-04-09 08:14:37.000+0000|org.onap.oof|service
+so@so.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+so@so.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+so@so.onap.org|org.onap.so.app|2019-04-09 08:14:37.000+0000|org.onap.so|app
+sdc@sdc.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+sdc@sdc.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+sdnc@sdnc.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+sdnc@sdnc.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+onap-sdnc@sdnc.onap.org|org.onap.sdnc.service|2019-04-09 08:14:37.000+0000|org.onap.sdnc|service
+vfc@vfc.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+vfc@vfc.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+vfc@vfc.onap.org|org.onap.vfc.service|2019-04-09 08:14:37.000+0000|org.onap.vfc|service
+policy@policy.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+policy@policy.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+policy@policy.onap.org|org.onap.policy.admin|2019-04-09 08:14:37.000+0000|org.onap.policy|admin
+policy@policy.onap.org|org.onap.policy.pdpd.admin|2019-04-09 08:14:37.000+0000|org.onap.policy|pdpd.admin
+policy@policy.onap.org|org.onap.policy.seeCerts|2019-04-09 08:14:37.000+0000|org.onap.policy|seeCerts
+pomba@pomba.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+pomba@pomba.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+vid@vid.onap.org|org.onap.aai.resources_all|2019-04-09 08:14:37.000+0000|org.onap.aai|resources_all
+vid@vid.onap.org|org.onap.aai.traversal_advanced|2019-04-09 08:14:37.000+0000|org.onap.aai|traversal_advanced
+vid1@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-09 08:14:37.000+0000|org.onap.vid|System_Administrator
+vid2@people.osaaf.org|org.onap.vid.Standard_User|2019-04-09 08:14:37.000+0000|org.onap.vid|Standard_User
+vid2@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-09 08:14:37.000+0000|org.onap.vid|System_Administrator
+dmaap-bc@bc.dmaap.onap.org|org.onap.dmaap.bc.service|2019-04-09 08:14:37.000+0000|org.onap.dmaap.bc|service
+dmaap-bc@dmaap-bc.onap.org|org.onap.dmaap-bc.seeCerts|2019-04-09 08:14:37.000+0000|org.onap.dmaap-bc|seeCerts
+dmaap-dr@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-09 08:14:37.000+0000|org.onap.dmaap-dr|seeCerts
+dmaap-dr-prov@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-09 08:14:37.000+0000|org.onap.dmaap-dr|seeCerts
+dmaap-dr-node@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-09 08:14:37.000+0000|org.onap.dmaap-dr|seeCerts
diff --git a/auth/sample/data/sample.identities.dat b/auth/sample/data/sample.identities.dat
index fe1d9479..d0504d96 100644
--- a/auth/sample/data/sample.identities.dat
+++ b/auth/sample/data/sample.identities.dat
@@ -40,6 +40,7 @@ ps0001|PS PORTAL|ps|PORTAL|||e|aaf_admin
 
 # AAF Defined Users
 aaf_admin|AAF Administrator|Mr AAF|AAF Admin|||e|mmanager
+aaf-client|AAF Client Sample|Mr AAF Client|AAF Sample|||e|mmanager
 deployer|Deployer|Deployer|Depoyer|||e|aaf_admin
 
 # Requested Users