diff --git a/auth/sample/cass_data/ns.dat b/auth/sample/cass_data/ns.dat
index 89f9b5f..8943c99 100644
--- a/auth/sample/cass_data/ns.dat
+++ b/auth/sample/cass_data/ns.dat
@@ -1,31 +1,34 @@
 org.onap.dmaap.mr||org.onap||3
+org.onap.appc||org.onap||3
 org.onap.dmaap-mr||org.onap||3
 org.openecomp.dmaapBC|DMaap NS|org.openecomp|3|3
-org.onap.appc||org.onap||3
-org.onap.portal.test||org.onap.portal||3
-org.osaaf.people||org.osaaf||3
-org.onap.dcae||org.onap||3
-org.onap.dmaap-bc||org.onap||3
-org.onap.so||org.onap||3
-org.onap.dmaap.bc||org.onap||3
+org.onap.dmaap-bc-mm-prov||org.onap||3
 org.onap.dmaapbc||org.onap||3
-org.onap.policy||org.onap||3
 org.onap.oof||org.onap||3
 org.openecomp|Open EComp NS|org|2|2
-org.osaaf|OSAAF Namespace|org|2|2
-org.onap.sdc||org.onap||3
-org.onap.dmaap-bc.api||org.onap.dmaap-bc||3
+org.onap.portal.test||org.onap.portal||3
+org.onap.pomba||org.onap||3
+org.osaaf.people||org.osaaf||3
+org.onap.dcae||org.onap||3
+org.onap.so||org.onap||3
 org.onap.aai||org.onap||3
-org.onap.sdnc||org.onap||3
-org.onap.clamptest|Onap clamp test NS|org.onap|2|2
-org|Root Namespace|.|1|1
-org.onap.portal|ONAP Portal|org.onap.portal|3|3
-org.onap.dmaap-dr||org.onap||3
-org.onap.clampdemo|Onap clamp demo NS|org.onap|2|2
+org.onap.dmaap-bc||org.onap||3
+org.onap.policy||org.onap||3
 org.onap.clamp||org.onap||3
+org.onap.dmaap-dr||org.onap||3
 org.onap.vfc||org.onap||3
 org.onap.vid||org.onap||3
 org.onap|ONAP|org|2|2
+org.osaaf|OSAAF Namespace|org|2|2
+org.onap.dmaap-bc-topic-mgr||org.onap||3
+org.onap.sdc||org.onap||3
+org.onap.dmaap-bc.api||org.onap.dmaap-bc||3
+org.onap.dmaap.bc||org.onap||3
+org.onap.clamptest|Onap clamp test NS|org.onap|2|2
+org.onap.sdnc||org.onap||3
+org|Root Namespace|.|1|1
+org.onap.portal|ONAP Portal|org.onap.portal|3|3
 org.openecomp.dcae|DCAE Namespace Org|org.openecomp|3|3
+org.onap.clampdemo|Onap clamp demo NS|org.onap|2|2
 org.onap.aaf-sms||org.onap||3
 org.osaaf.aaf|Application Authorization Framework|org.osaaf|3|3
diff --git a/auth/sample/cass_data/perm.dat b/auth/sample/cass_data/perm.dat
index 71cfa5a..90df517 100644
--- a/auth/sample/cass_data/perm.dat
+++ b/auth/sample/cass_data/perm.dat
@@ -5,50 +5,31 @@
 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.appc|access|*|*|AAF Namespace Write Access|"{'org.onap.appc|admin'}"
+org.onap.appc|access|*|read|AAF Namespace Read Access|"{'org.onap.appc|owner'}"
+org.onap.appc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.appc|odl|odl-api|*|Appc ODL API Access|"{'org.onap.appc.odl', 'org.onap.appc|admin'}"
 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.openecomp.dmaapBC|access|*|*|DMaap Write Access|{'org.openecomp.dmaapBC.admin'}
-org.openecomp.dmaapBC|access|*|read|DMaap Read Access|{'org.openecomp.dmaapBC.owner'}
-org.onap.appc|access|*|*|AAF Namespace Write Access|"{'org.onap.appc|admin'}"
-org.onap.appc|access|*|read|AAF Namespace Read Access|"{'org.onap.appc|owner'}"
-org.onap.appc|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
-org.onap.appc|odl|odl-api|*|Appc ODL API Access|"{'org.onap.appc.odl', 'org.onap.appc|admin'}"
 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.openecomp.dmaapBC|access|*|*|DMaap Write Access|{'org.openecomp.dmaapBC.admin'}
+org.openecomp.dmaapBC|access|*|read|DMaap Read Access|{'org.openecomp.dmaapBC.owner'}
 org.onap.dmaap-mr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-mr|admin'}"
 org.onap.dmaap-mr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-mr|owner'}"
 org.onap.dmaap-mr|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.onap.dmaap-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.dmaapbc|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaapbc|admin'}"
 org.onap.dmaapbc|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaapbc|owner'}"
 org.onap.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.openecomp|access|*|*|OpenEcomp Write Access|{'org.openecomp.admin'}
-org.openecomp|access|*|read|OpenEcomp Read Access|{'org.openecomp.owner'}
-org.onap.portal.test|aaaa|*|write||
-org.onap.portal.test|access|*|*|AAF Namespace Write Access|"{'org.onap.portal.test|admin'}"
-org.onap.portal.test|access|*|read|AAF Namespace Read Access|"{'org.onap.portal.test|owner'}"
-org.onap.portal.test|access1|*|read||
-org.onap.portal.test|myaccess|*|read||
-org.onap.portal.test|user1.access|*|read||
-org.onap.portal.test|user1.myaccess|*|read||
-org.onap.dmaap-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.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.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'}"
@@ -112,9 +93,21 @@
 org.onap.policy|url|policy_push|*|Policy Push|"{'org.onap.policy|Policy_Admin', 'org.onap.policy|Policy_Editor', 'org.onap.policy|Policy_Super_Admin', 'org.onap.policy|Standard_User'}"
 org.onap.policy|url|policy_roles|*|Policy Roles|"{'org.onap.policy|Policy_Super_Admin', 'org.onap.policy|Standard_User'}"
 org.onap.policy|url|view_reports|*|View Raptor reports|
-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.openecomp|access|*|*|OpenEcomp Write Access|{'org.openecomp.admin'}
+org.openecomp|access|*|read|OpenEcomp Read Access|{'org.openecomp.owner'}
+org.onap.aai|access|*|*|AAF Namespace Write Access|"{'org.onap.aai|admin'}"
+org.onap.aai|access|*|read|AAF Namespace Read Access|"{'org.onap.aai|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.onap.dmaap-dr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-dr|admin'}"
+org.onap.dmaap-dr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-dr|owner'}"
+org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass||"{'org.onap.dmaap-dr|seeCerts', 'org.osaaf.aaf|deploy'}"
 org.onap.clamp|access|*|*|AAF Namespace Write Access|"{'org.onap.clamp|admin', 'org.onap.clamp|service'}"
 org.onap.clamp|access|*|read|Onap Clamp Read Access|{'org.onap.clamp.owner'}
 org.onap.clamp|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
@@ -128,14 +121,30 @@
 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.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.portal.test|aaaa|*|write||
+org.onap.portal.test|access|*|*|AAF Namespace Write Access|"{'org.onap.portal.test|admin'}"
+org.onap.portal.test|access|*|read|AAF Namespace Read Access|"{'org.onap.portal.test|owner'}"
+org.onap.portal.test|access1|*|read||
+org.onap.portal.test|myaccess|*|read||
+org.onap.portal.test|user1.access|*|read||
+org.onap.portal.test|user1.myaccess|*|read||
+org.onap.pomba|access|*|*|AAF Namespace Write Access|"{'org.onap.pomba|admin'}"
+org.onap.pomba|access|*|read|AAF Namespace Read Access|"{'org.onap.pomba|owner'}"
+org.onap.pomba|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
+org.osaaf|access|*|*|OSAAF Write Access|{'org.osaaf.admin'}
+org.osaaf|access|*|read,appove|OSAAF Read Access|{'org.osaaf.owner'}
+org.onap.dmaap-bc-topic-mgr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-bc-topic-mgr|admin'}"
+org.onap.dmaap-bc-topic-mgr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-bc-topic-mgr|owner'}"
+org.onap.dmaap-bc-topic-mgr|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 org.onap.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.osaaf|access|*|*|OSAAF Write Access|{'org.osaaf.admin'}
-org.osaaf|access|*|read,appove|OSAAF Read Access|{'org.osaaf.owner'}
-org.onap.dmaap-dr|access|*|*|AAF Namespace Write Access|"{'org.onap.dmaap-dr|admin'}"
-org.onap.dmaap-dr|access|*|read|AAF Namespace Read Access|"{'org.onap.dmaap-dr|owner'}"
-org.onap.dmaap-dr|certman|local|request,ignoreIPs,showpass||"{'org.onap.dmaap-dr|seeCerts', 'org.osaaf.aaf|deploy'}"
+org.onap.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.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'}"
@@ -227,17 +236,17 @@
 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.clampdemo|access|*|*|ClampDemo Write Access|{'org.onap.clampdemo.admin'}
-org.onap.clampdemo|access|*|read|ClampDemo Read Access|{'org.onap.clampdemo.owner'}
 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|access|*|*|Org Write Access|{'org.admin'}
 org|access|*|read|Org Read Access|{'org.owner'}
 org|access|*|read,approve|Org Read Access|{'org.owner'}
-org.onap.portal|access|*|*|Portal Write Access|"{'org.onap.portal.admin', 'org.onap.portal|app'}"
+org.onap.portal|access|*|*|Portal Write Access|{'org.onap.portal.admin'}
 org.onap.portal|access|*|read|Portal Read Access|{'org.onap.portal.designer', 'org.onap.portal.governor', 'org.onap.portal.ops', 'org.onap.portal.owner', 'org.onap.portal.tester'}
 org.onap.portal|certman|local|request,ignoreIPs,showpass||"{'org.osaaf.aaf|deploy'}"
 org.onap.portal|menu|menu_admin|*|Admin Menu|"{'org.onap.portal|System_Administrator'}"
@@ -263,8 +272,10 @@
 org.onap.portal|menu|menu_task|*|Task Menu|
 org.onap.portal|menu|menu_task_search|*|Task Search|
 org.onap.portal|menu|menu_web_analytics|*|Web Analytics|"{'org.onap.portal|Portal_Usage_Analyst', 'org.onap.portal|Usage_Analyst'}"
-org.onap.portal|url|edit_notification|*|User Notification|"{'org.onap.portal|Portal_Notification_Admin'}"
-org.onap.portal|url|getAdminNotifications|*|Admin Notifications|"{'org.onap.portal|Portal_Notification_Admin'}"
+org.onap.portal|url|edit_notification|*|User Notification|
+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|Portal_Notification_Admin'}"
+org.onap.portal|url|saveNotification|*|publish notifications|
 org.onap.portal|url|view_reports|*|View Raptor reports|
+org.onap.clampdemo|access|*|*|ClampDemo Write Access|{'org.onap.clampdemo.admin'}
+org.onap.clampdemo|access|*|read|ClampDemo Read Access|{'org.onap.clampdemo.owner'}
diff --git a/auth/sample/cass_data/role.dat b/auth/sample/cass_data/role.dat
index 895db09..96d59ee 100644
--- a/auth/sample/cass_data/role.dat
+++ b/auth/sample/cass_data/role.dat
@@ -1,14 +1,3 @@
-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.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.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.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'}"
@@ -19,8 +8,19 @@
 org.onap.dmaap.mr|view||"{'org.onap.dmaap.mr|topic|*|view'}"
 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.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.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.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.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.dmaapbc|admin|AAF Namespace Administrators|"{'org.onap.dmaapbc|access|*|*'}"
 org.onap.dmaapbc|owner|AAF Namespace Owners|"{'org.onap.dmaapbc|access|*|read'}"
 org.onap.oof|admin|AAF Namespace Administrators|"{'org.onap.oof|access|*|*'}"
@@ -28,6 +28,8 @@
 org.onap.oof|service||"{'org.onap.oof|access|*|*'}"
 org.openecomp|admin|OpenEcomp Admins|"{'org.openecomp.access|*|*'}"
 org.openecomp|owner|OpenEcomp Owners|"{'org.openecomp.access|*|read'}"
+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.aai|Account_Administrator||
 org.onap.aai|admin|AAF Namespace Administrators|"{'org.onap.aai|access|*|*'}"
 org.onap.aai|member||"{'org.onap.aai|access|*|read'}"
@@ -36,6 +38,9 @@
 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.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.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|*'}"
@@ -52,15 +57,35 @@
 org.onap.policy|pdpx.admin|pdpx.admin|"{'org.onap.policy|pdpx.config|*|*', 'org.onap.policy|pdpx.createDictionary|*|*', 'org.onap.policy|pdpx.createPolicy|*|*', 'org.onap.policy|pdpx.decision|*|*', 'org.onap.policy|pdpx.getConfigByPolicyName|*|*', 'org.onap.policy|pdpx.getConfig|*|*', 'org.onap.policy|pdpx.getDecision|*|*', 'org.onap.policy|pdpx.getDictionary|*|*', 'org.onap.policy|pdpx.getMetrics|*|*', 'org.onap.policy|pdpx.listConfig|*|*', 'org.onap.policy|pdpx.listPolicy|*|*', 'org.onap.policy|pdpx.list|*|*', 'org.onap.policy|pdpx.policyEngineImport|*|*', 'org.onap.policy|pdpx.pushPolicy|*|*', 'org.onap.policy|pdpx.sendEvent|*|*', 'org.onap.policy|pdpx.updateDictionary|*|*', 'org.onap.policy|pdpx.updatePolicy|*|*'}"
 org.onap.policy|pdpx.monitor|pdpx.monitor|
 org.onap.policy|seeCerts|seeCerts|"{'org.onap.policy|certman|local|request,ignoreIPs,showpass'}"
+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.pomba|admin|AAF Namespace Administrators|"{'org.onap.pomba|access|*|*'}"
+org.onap.pomba|owner|AAF Namespace Owners|"{'org.onap.pomba|access|*|read'}"
 org.onap.clamp|admin|AAF Namespace Administrators|"{'org.onap.clamp|access|*|*'}"
 org.onap.clamp|clds.admin.dev|Onap clamp  Admin Dev|"{'org.onap.clamp.clds.template|dev|update', 'org.onap.clamp|clds.cl|dev|read', 'org.onap.clamp|clds.cl|dev|update', 'org.onap.clamp|clds.template|dev|read', 'org.onap.clamp|clds.template|dev|update'}"
 org.onap.clamp|clds.designer.dev|Onap clamp  Designer Dev|"{'org.onap.clamp.clds.template|dev|update'}"
 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.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.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.sdc|ADMIN|ADMIN|
+org.onap.sdc|Account_Administrator||
+org.onap.sdc|TESTOR|TESTOR|
+org.onap.sdc|admin|AAF Namespace Administrators|"{'org.onap.sdc|access|*|*'}"
+org.onap.sdc|app|app|
+org.onap.sdc|owner|AAF Namespace Owners|"{'org.onap.sdc|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'}"
+org.onap.dmaap-bc.api|Orchestrator||"{'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|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|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|GET', '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|PortalUser||"{'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|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|GET', 'org.onap.dmaap-bc.api|topics|onapdemo|GET'}"
+org.onap.dmaap-bc.api|admin|AAF Namespace Administrators|"{'org.onap.dmaap-bc.api|access|*|*'}"
+org.onap.dmaap-bc.api|owner|AAF Namespace Owners|"{'org.onap.dmaap-bc.api|access|*|read'}"
 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|*|*'}"
@@ -72,61 +97,47 @@
 org.onap.vid|owner|AAF Namespace Owners|"{'org.onap.vid|access|*|read'}"
 org.onap.vid|seeCerts|seeCerts|
 org.onap.vid|service|service|
-org.onap.portal.test|admin|AAF Namespace Administrators|"{'org.onap.portal.test|access|*|*'}"
-org.onap.portal.test|oof-homing||
-org.onap.portal.test|owner|AAF Namespace Owners|"{'org.onap.portal.test|access|*|read'}"
-org.onap.portal.test|user1||
-org.onap|admin|Onap Admins|"{'org.onap.access|*|*'}"
-org.onap|owner|onap Owners|"{'org.onap.access|*|read'}"
-org.osaaf|admin|OSAAF Admins|"{'org.osaaf.access|*|*'}"
-org.osaaf|owner|OSAAF Owners|"{'org.osaaf.access|*|read,approve'}"
-org.onap.sdc|ADMIN|ADMIN|
-org.onap.sdc|Account_Administrator||
-org.onap.sdc|TESTOR|TESTOR|
-org.onap.sdc|admin|AAF Namespace Administrators|"{'org.onap.sdc|access|*|*'}"
-org.onap.sdc|app|app|
-org.onap.sdc|owner|AAF Namespace Owners|"{'org.onap.sdc|access|*|read'}"
-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-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'}"
-org.onap.dmaap-bc.api|Orchestrator||"{'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|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|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|GET', '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|PortalUser||"{'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|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|GET', 'org.onap.dmaap-bc.api|topics|onapdemo|GET'}"
-org.onap.dmaap-bc.api|admin|AAF Namespace Administrators|"{'org.onap.dmaap-bc.api|access|*|*'}"
-org.onap.dmaap-bc.api|owner|AAF Namespace Owners|"{'org.onap.dmaap-bc.api|access|*|read'}"
-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|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|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.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.vid|certman|local|request,ignoreIPs,showpass'}"
-org.osaaf.aaf|owner|AAF Owners|"{'org.osaaf.aaf.access|*|read,approve'}"
-org.osaaf.aaf|service||
-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.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|admin|Onap Admins|"{'org.onap.access|*|*'}"
+org.onap|owner|onap Owners|"{'org.onap.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|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.clampdemo|admin|Onap Clamp Test  Admins|"{'org.onap.clampdemo.access|*|*'}"
+org.onap.clampdemo|owner|onap clamp Test Owners|"{'org.onap.clampdemo.access|*|read'}"
 org|admin|Org Admins|"{'org.access|*|*'}"
 org|owner|Org Owners|"{'org.access|*|read,approve'}"
 org.onap.portal|Account_Administrator|Account Administrator|
-org.onap.portal|Portal_Notification_Admin||"{'org.onap.portal|url|edit_notification|*', 'org.onap.portal|url|getAdminNotifications|*', 'org.onap.portal|url|saveNotification|*'}"
+org.onap.portal|Portal_Designer|Portal Designer|
+org.onap.portal|Portal_Governor|Portal Governor|
+org.onap.portal|Portal_Notification_Admin|Portal_Notification_Admin|
+org.onap.portal|Portal_Operations|Portal Operations|
+org.onap.portal|Portal_Tester|Portal Tester|
 org.onap.portal|Portal_Usage_Analyst|Portal Usage Analyst|"{'org.onap.portal|menu|menu_web_analytics|*'}"
 org.onap.portal|Restricted_App_Role|Restricted App Role|
 org.onap.portal|Standard_User|Standard User|"{'org.onap.portal|menu|menu_ajax|*', 'org.onap.portal|menu|menu_customer_create|*', 'org.onap.portal|menu|menu_customer|*', 'org.onap.portal|menu|menu_home|*', 'org.onap.portal|menu|menu_logout|*', 'org.onap.portal|menu|menu_map|*', 'org.onap.portal|menu|menu_profile|*', 'org.onap.portal|menu|menu_reports|*', 'org.onap.portal|menu|menu_tab|*', 'org.onap.portal|url|login|*'}"
 org.onap.portal|System_Administrator|System Administrator|"{'org.onap.portal|menu|menu_admin|*', 'org.onap.portal|menu|menu_ajax|*', 'org.onap.portal|menu|menu_customer_create|*', 'org.onap.portal|menu|menu_customer|*', 'org.onap.portal|menu|menu_feedback|*', 'org.onap.portal|menu|menu_help|*', 'org.onap.portal|menu|menu_home|*', 'org.onap.portal|menu|menu_job_create|*', 'org.onap.portal|menu|menu_job|*', 'org.onap.portal|menu|menu_logout|*', 'org.onap.portal|menu|menu_notes|*', 'org.onap.portal|menu|menu_process|*', 'org.onap.portal|menu|menu_profile_create|*', 'org.onap.portal|menu|menu_profile_import|*', 'org.onap.portal|menu|menu_profile|*', 'org.onap.portal|menu|menu_reports|*', 'org.onap.portal|menu|menu_sample|*', 'org.onap.portal|menu|menu_tab|*', 'org.onap.portal|url|login|*'}"
 org.onap.portal|Usage_Analyst|Usage Analyst|"{'org.onap.portal|menu|menu_web_analytics|*'}"
+org.onap.portal|abc|abc|
 org.onap.portal|admin|Portal Admins|"{'org.onap.portal.access|*|*'}"
-org.onap.portal|app||"{'org.onap.portal|access|*|*'}"
+org.onap.portal|app|app|
 org.onap.portal|designer|Portal Designer|"{'org.onap.portal.access|*|read'}"
 org.onap.portal|governor|Portal Governor|"{'org.onap.portal.access|*|read'}"
 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.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.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.clampdemo|admin|Onap Clamp Test  Admins|"{'org.onap.clampdemo.access|*|*'}"
-org.onap.clampdemo|owner|onap clamp Test Owners|"{'org.onap.clampdemo.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.vid|certman|local|request,ignoreIPs,showpass'}"
+org.osaaf.aaf|owner|AAF Owners|"{'org.osaaf.aaf.access|*|read,approve'}"
+org.osaaf.aaf|service||
diff --git a/auth/sample/cass_data/user_role.dat b/auth/sample/cass_data/user_role.dat
index 27bd2e6..8dc1c26 100644
--- a/auth/sample/cass_data/user_role.dat
+++ b/auth/sample/cass_data/user_role.dat
@@ -1,135 +1,216 @@
-mmanager@people.osaaf.org|org.onap.aaf-sms.admin|2019-01-18 19:11:11.056+0000|org.onap.aaf-sms|admin
-mmanager@people.osaaf.org|org.onap.aaf-sms.owner|2019-01-18 19:11:11.056+0000|org.onap.aaf-sms|owner
-mmanager@people.osaaf.org|org.onap.aai.admin|2019-01-18 19:12:02.376+0000|org.onap.aai|admin
-mmanager@people.osaaf.org|org.onap.aai.owner|2019-01-18 19:12:02.376+0000|org.onap.aai|owner
-mmanager@people.osaaf.org|org.onap.appc.admin|2019-01-18 19:12:08.205+0000|org.onap.appc|admin
-mmanager@people.osaaf.org|org.onap.appc.owner|2019-01-18 19:12:08.205+0000|org.onap.appc|owner
-mmanager@people.osaaf.org|org.onap.clamp.admin|2019-01-18 19:11:48.308+0000|org.onap.clamp|admin
-mmanager@people.osaaf.org|org.onap.clamp.owner|2019-01-18 19:11:48.308+0000|org.onap.clamp|owner
-mmanager@people.osaaf.org|org.onap.dcae.admin|2019-01-18 19:12:17.183+0000|org.onap.dcae|admin
-mmanager@people.osaaf.org|org.onap.dcae.owner|2019-01-18 19:12:17.183+0000|org.onap.dcae|owner
-mmanager@people.osaaf.org|org.onap.dmaap-bc.admin|2019-01-18 19:13:14.377+0000|org.onap.dmaap-bc|admin
-mmanager@people.osaaf.org|org.onap.dmaap-bc.owner|2019-01-18 19:13:14.377+0000|org.onap.dmaap-bc|owner
-mmanager@people.osaaf.org|org.onap.dmaap-dr.owner|2019-02-17 10:50:01.436+0000|org.onap.dmaap-dr|owner
-mmanager@people.osaaf.org|org.onap.dmaap-mr.admin|2019-01-18 19:13:20.031+0000|org.onap.dmaap-mr|admin
-mmanager@people.osaaf.org|org.onap.dmaap-mr.owner|2019-01-18 19:13:20.031+0000|org.onap.dmaap-mr|owner
-mmanager@people.osaaf.org|org.onap.oof.admin|2019-01-18 19:13:25.467+0000|org.onap.oof|admin
-mmanager@people.osaaf.org|org.onap.oof.owner|2019-01-18 19:13:25.467+0000|org.onap.oof|owner
-mmanager@people.osaaf.org|org.onap.policy.admin|2019-02-13 19:45:18.174+0000|org.onap.policy|admin
-mmanager@people.osaaf.org|org.onap.policy.owner|2019-02-13 19:45:18.174+0000|org.onap.policy|owner
-mmanager@people.osaaf.org|org.onap.portal.admin|2019-02-20 18:37:44.285+0000|org.onap.portal|admin
-mmanager@people.osaaf.org|org.onap.portal.owner|2019-02-20 18:37:38.317+0000|org.onap.portal|owner
-mmanager@people.osaaf.org|org.onap.sdc.admin|2019-03-14 17:26:40.787+0000|org.onap.sdc|admin
-mmanager@people.osaaf.org|org.onap.sdc.owner|2019-03-14 17:26:40.787+0000|org.onap.sdc|owner
-mmanager@people.osaaf.org|org.onap.sdnc.admin|2019-01-18 19:13:32.203+0000|org.onap.sdnc|admin
-mmanager@people.osaaf.org|org.onap.sdnc.owner|2019-01-18 19:13:32.203+0000|org.onap.sdnc|owner
-mmanager@people.osaaf.org|org.onap.so.admin|2019-03-14 17:26:08.685+0000|org.onap.so|admin
-mmanager@people.osaaf.org|org.onap.so.owner|2019-03-14 17:26:08.685+0000|org.onap.so|owner
-mmanager@people.osaaf.org|org.onap.vfc.admin|2019-03-25 15:11:00.909+0000|org.onap.vfc|admin
-mmanager@people.osaaf.org|org.onap.vfc.owner|2019-03-25 15:11:00.909+0000|org.onap.vfc|owner
-mmanager@people.osaaf.org|org.onap.vid.admin|2019-02-15 15:49:59.019+0000|org.onap.vid|admin
-mmanager@people.osaaf.org|org.onap.vid.owner|2019-02-15 15:11:39.751+0000|org.onap.vid|owner
-portal@portal.onap.org|org.onap.portal.app|2019-03-12 17:48:48.086+0000|org.onap.portal|app
-shi@portal.onap.org|org.onap.portal.admin|2018-08-31 00:00:00.000+0000|org.onap.portal|admin
-demo@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-03-13 15:42:58.918+0000|org.onap.dmaap.mr|view
-demo@people.osaaf.org|org.onap.aai.Account_Administrator|2019-03-24 17:46:14.390+0000|org.onap.aai|Account_Administrator
-demo@people.osaaf.org|org.onap.aai.member|2019-02-27 16:13:12.499+0000|org.onap.aai|member
-demo@people.osaaf.org|org.onap.aai.resources_all|2019-02-28 18:42:44.496+0000|org.onap.aai|resources_all
-demo@people.osaaf.org|org.onap.aai.traversal_advanced|2019-03-05 15:10:31.811+0000|org.onap.aai|traversal_advanced
-demo@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-02-16 21:56:30.350+0000|org.onap.dmaap-bc.api|Controller
-demo@people.osaaf.org|org.onap.dmaap.mr.create|2019-03-13 18:08:37.114+0000|org.onap.dmaap.mr|create
-demo@people.osaaf.org|org.onap.dmaap.mr.destroy|2019-03-13 18:09:23.757+0000|org.onap.dmaap.mr|destroy
-demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-03-13 18:10:15.955+0000|org.onap.dmaap.mr|mrtesttopic.pub
-demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-03-13 18:09:47.647+0000|org.onap.dmaap.mr|mrtesttopic.sub
-demo@people.osaaf.org|org.onap.dmaap.mr.view|2019-03-13 18:05:55.587+0000|org.onap.dmaap.mr|view
-demo@people.osaaf.org|org.onap.policy.Account_Administrator|2019-03-24 17:46:17.656+0000|org.onap.policy|Account_Administrator
-demo@people.osaaf.org|org.onap.policy.System_Administrator|2019-03-24 21:40:15.672+0000|org.onap.policy|System_Administrator
-demo@people.osaaf.org|org.onap.policy.pdpd.admin|2019-04-02 14:03:35.543+0000|org.onap.policy|pdpd.admin
-demo@people.osaaf.org|org.onap.portal.Account_Administrator|2019-03-24 17:46:15.992+0000|org.onap.portal|Account_Administrator
-demo@people.osaaf.org|org.onap.portal.Portal_Notification_Admin|2019-03-24 21:27:47.253+0000|org.onap.portal|Portal_Notification_Admin
-demo@people.osaaf.org|org.onap.portal.System_Administrator|2019-03-24 21:27:46.401+0000|org.onap.portal|System_Administrator
-demo@people.osaaf.org|org.onap.portal.admin|2018-10-31 00:00:00.000+0000|org.onap.portal|admin
-demo@people.osaaf.org|org.onap.portal.test.admin|2019-02-07 15:02:00.509+0000|org.onap.portal.test|admin
-demo@people.osaaf.org|org.onap.portal.test.owner|2019-02-07 15:02:00.509+0000|org.onap.portal.test|owner
-demo@people.osaaf.org|org.onap.portal.test.user1|2019-02-07 15:15:06.360+0000|org.onap.portal.test|user1
-demo@people.osaaf.org|org.onap.sdc.ADMIN|2019-03-24 21:37:50.052+0000|org.onap.sdc|ADMIN
-demo@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-03-24 17:46:20.150+0000|org.onap.sdc|Account_Administrator
-demo@people.osaaf.org|org.onap.vid.Account_Administrator|2019-03-24 17:46:21.719+0000|org.onap.vid|Account_Administrator
-demo@people.osaaf.org|org.onap.vid.System_Administrator|2019-03-24 21:39:30.745+0000|org.onap.vid|System_Administrator
-jh0003@people.osaaf.org|org.onap.portal.admin|2018-10-31 00:00:00.000+0000|org.onap.portal|admin
-jh0003@people.osaaf.org|org.onap.sdc.ADMIN|2019-03-24 21:37:51.730+0000|org.onap.sdc|ADMIN
-jh0003@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-03-24 21:37:52.394+0000|org.onap.sdc|Account_Administrator
-cs0008@people.osaaf.org|org.onap.portal.designer|2018-10-31 00:00:00.000+0000|org.onap.portal|designer
-cs0008@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:49.994+0000|org.onap.sdc|TESTOR
-jm0007@people.osaaf.org|org.onap.portal.tester|2018-10-31 00:00:00.000+0000|org.onap.portal|tester
-jm0007@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:49.378+0000|org.onap.sdc|TESTOR
-op0001@people.osaaf.org|org.onap.portal.ops|2018-10-31 00:00:00.000+0000|org.onap.portal|ops
-op0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:50.070+0000|org.onap.sdc|TESTOR
-gv0001@people.osaaf.org|org.onap.portal.governor|2018-10-31 00:00:00.000+0000|org.onap.portal|governor
-gv0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:52.838+0000|org.onap.sdc|TESTOR
-pm0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:49.993+0000|org.onap.sdc|TESTOR
-ps0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:50.822+0000|org.onap.sdc|TESTOR
-aaf_admin@people.osaaf.org|org.onap.aaf-sms.admin|2019-01-18 20:02:28.637+0000|org.onap.aaf-sms|admin
-aaf_admin@people.osaaf.org|org.onap.aai.admin|2019-01-18 20:02:38.090+0000|org.onap.aai|admin
-aaf_admin@people.osaaf.org|org.onap.appc.admin|2019-01-18 20:02:44.874+0000|org.onap.appc|admin
-aaf_admin@people.osaaf.org|org.onap.clamp.admin|2019-01-18 20:01:27.855+0000|org.onap.clamp|admin
-aaf_admin@people.osaaf.org|org.onap.dcae.admin|2019-01-18 20:02:51.905+0000|org.onap.dcae|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.admin|2019-01-18 20:03:00.950+0000|org.onap.dmaap-bc|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-02-16 21:44:19.671+0000|org.onap.dmaap-bc.api|Controller
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.admin|2019-02-16 20:35:47.061+0000|org.onap.dmaap-bc.api|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.owner|2019-02-16 20:35:47.061+0000|org.onap.dmaap-bc.api|owner
-aaf_admin@people.osaaf.org|org.onap.dmaap-dr.admin|2019-02-17 10:50:01.436+0000|org.onap.dmaap-dr|admin
-aaf_admin@people.osaaf.org|org.onap.dmaap-mr.admin|2019-01-18 20:03:10.921+0000|org.onap.dmaap-mr|admin
-aaf_admin@people.osaaf.org|org.onap.oof.admin|2019-01-18 20:03:19.273+0000|org.onap.oof|admin
-aaf_admin@people.osaaf.org|org.onap.policy.admin|2019-02-13 19:45:18.174+0000|org.onap.policy|admin
-aaf_admin@people.osaaf.org|org.onap.portal.admin|2019-02-20 18:37:55.465+0000|org.onap.portal|admin
-aaf_admin@people.osaaf.org|org.onap.sdc.admin|2019-03-14 17:26:40.787+0000|org.onap.sdc|admin
-aaf_admin@people.osaaf.org|org.onap.sdc.owner|2019-03-14 17:26:40.787+0000|org.onap.sdc|owner
-aaf_admin@people.osaaf.org|org.onap.sdnc.admin|2019-01-18 20:03:25.173+0000|org.onap.sdnc|admin
-aaf_admin@people.osaaf.org|org.onap.so.admin|2019-03-14 17:26:08.685+0000|org.onap.so|admin
-aaf_admin@people.osaaf.org|org.onap.so.owner|2019-03-14 17:26:08.685+0000|org.onap.so|owner
-aaf_admin@people.osaaf.org|org.onap.vfc.admin|2019-03-25 15:11:00.909+0000|org.onap.vfc|admin
-aaf_admin@people.osaaf.org|org.onap.vid.admin|2019-02-15 15:10:50.313+0000|org.onap.vid|admin
-aaf_admin@people.osaaf.org|org.osaaf.aaf.admin|2018-10-31 00:00:00.000+0000|org.osaaf.aaf|admin
-aaf_admin@people.osaaf.org|org.osaaf.people.admin|2019-01-18 18:58:25.577+0000|org.osaaf.people|admin
-aaf_admin@people.osaaf.org|org.osaaf.people.owner|2019-01-18 18:58:25.577+0000|org.osaaf.people|owner
-deployer@people.osaaf.org|org.osaaf.aaf.deploy|2018-10-31 00:00:00.000+0000|org.osaaf.aaf|deploy
-portal_admin@people.osaaf.org|org.onap.portal.admin|2019-03-12 21:27:10.597+0000|org.onap.portal|admin
-aaf@aaf.osaaf.org|org.admin|2018-10-31 00:00:00.000+0000|org|admin
-aaf@aaf.osaaf.org|org.osaaf.aaf.admin|2018-10-31 00:00:00.000+0000|org.osaaf.aaf|admin
-aaf@aaf.osaaf.org|org.osaaf.aaf.service|2019-01-17 10:39:33.473+0000|org.osaaf.aaf|service
-aaf@aaf.osaaf.org|org.osaaf.people.admin|2019-03-12 17:38:10.720+0000|org.osaaf.people|admin
-osaaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-01-19 01:17:50.525+0000|org.osaaf.aaf|admin
-aaf-sms@aaf-sms.onap.org|org.onap.aaf-sms.service|2018-10-25 11:07:56.161+0000|org.onap.aaf-sms|service
-clamp@clamp.osaaf.org|org.onap.clamp.service|2019-01-19 16:04:25.475+0000|org.onap.clamp|service
-clamp@clamp.onap.org|org.onap.clamp.clds.admin.dev|2018-08-31 00:00:00.000+0000|org.onap.clamp|clds.admin.dev
-clamp@clamp.onap.org|org.onap.clamp.clds.designer.dev|2018-08-31 00:00:00.000+0000|org.onap.clamp|clds.designer.dev
-clamp@clamp.onap.org|org.onap.clamp.clds.vf_filter_all.dev|2018-08-31 00:00:00.000+0000|org.onap.clamp|clds.vf_filter_all.dev
-clamp@clamp.onap.org|org.onap.clamp.service|2019-01-19 16:05:29.023+0000|org.onap.clamp|service
-clamp@clamp.onap.org|org.onap.clampdemo.owner|2018-08-31 00:00:00.000+0000|org.onap.clampdemo|owner
-clamp@clamp.onap.org|org.onap.clampdemo.service|2018-08-31 00:00:00.000+0000|org.onap.clampdemo|admin
-clamp@clamp.onap.org|org.onap.clamptest.owner|2018-08-31 00:00:00.000+0000|org.onap.clamptest|owner
-clamp@clamp.onap.org|org.onap.clamptest.service|2018-08-31 00:00:00.000+0000|org.onap.clamptest|admin
-clamp@clamptest.onap.org|org.onap.clamptest.owner|2018-08-31 00:00:00.000+0000|org.onap.clamptest|owner
-clamp@clamptest.onap.org|org.onap.clamptest.service|2018-08-31 00:00:00.000+0000|org.onap.clamptest|admin
-clamp@clampdemo.onap.org|org.onap.clampdemo.owner|2018-08-31 00:00:00.000+0000|org.onap.clampdemo|owner
-clamp@clampdemo.onap.org|org.onap.clampdemo.service|2018-08-31 00:00:00.000+0000|org.onap.clampdemo|admin
-aai@aai.onap.org|org.onap.aai.admin|2018-12-05 12:53:12.506+0000|org.onap.aai|admin
-appc@appc.onap.org|org.onap.appc.admin|2018-12-06 20:01:35.380+0000|org.onap.appc|admin
-dcae@dcae.onap.org|org.onap.dcae.seeCerts|2019-02-07 18:17:35.485+0000|org.onap.dcae|seeCerts
-oof@oof.onap.org|org.onap.oof.service|2018-10-25 12:32:37.101+0000|org.onap.oof|service
-so@so.onap.org|org.onap.so.app|2019-03-14 17:31:26.590+0000|org.onap.so|app
-sdc@sdc.onap.org|org.onap.aai.resources_all|2019-03-14 18:40:55.439+0000|org.onap.aai|resources_all
-onap-sdnc@sdnc.onap.org|org.onap.sdnc.service|2018-11-09 01:40:36.805+0000|org.onap.sdnc|service
-vfc@vfc.onap.org|org.onap.vfc.service|2019-03-25 15:40:06.287+0000|org.onap.vfc|service
-policy@policy.onap.org|org.onap.policy.admin|2019-03-21 19:00:42.526+0000|org.onap.policy|admin
-policy@policy.onap.org|org.onap.policy.pdpd.admin|2019-04-02 14:17:19.001+0000|org.onap.policy|pdpd.admin
-policy@policy.onap.org|org.onap.policy.seeCerts|2019-02-15 14:44:47.491+0000|org.onap.policy|seeCerts
-vid1@people.osaaf.org|org.onap.vid.System_Administrator|2019-03-24 21:39:30.715+0000|org.onap.vid|System_Administrator
-vid2@people.osaaf.org|org.onap.vid.Standard_User|2019-03-24 21:39:31.423+0000|org.onap.vid|Standard_User
-vid2@people.osaaf.org|org.onap.vid.System_Administrator|2019-03-24 21:39:30.709+0000|org.onap.vid|System_Administrator
-dmaap-bc@dmaap-bc.onap.org|org.onap.dmaap-bc.seeCerts|2019-02-03 20:01:23.825+0000|org.onap.dmaap-bc|seeCerts
-dmaap-bc@bc.dmaap.onap.org|org.onap.dmaap.bc.service|2018-11-09 01:46:01.277+0000|org.onap.dmaap.bc|service
-dmaap-dr@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-02-17 17:00:02.098+0000|org.onap.dmaap-dr|seeCerts
-dmaap-dr-prov@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-02-17 17:41:33.710+0000|org.onap.dmaap-dr|seeCerts
-dmaap-dr-node@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-02-17 17:41:42.031+0000|org.onap.dmaap-dr|seeCerts
+dmaap-dr-prov@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-04 19:37:28.000+0000|org.onap.dmaap-dr|seeCerts
+sdc@sdc.onap.org|org.onap.aai.resources_all|2019-04-04 19:37:28.000+0000|org.onap.aai|resources_all
+sdc@sdc.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:30:34.355+0000|org.onap.aai|traversal_advanced
+dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.admin|2018-12-05 15:59:50.847+0000|org.onap.dmaap.mr|admin
+dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.create|2019-03-12 19:31:56.341+0000|org.onap.dmaap.mr|create
+dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.destroy|2019-03-12 19:36:25.501+0000|org.onap.dmaap.mr|destroy
+dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-03-12 19:37:10.089+0000|org.onap.dmaap.mr|mrtesttopic.pub
+dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-03-12 19:37:02.593+0000|org.onap.dmaap.mr|mrtesttopic.sub
+dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.service|2018-10-24 19:10:39.834+0000|org.onap.dmaap.mr|service
+dmaapmr@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-03-12 18:49:31.735+0000|org.onap.dmaap.mr|view
+appc@appc.onap.org|org.onap.aai.resources_all|2019-04-05 08:34:17.022+0000|org.onap.aai|resources_all
+appc@appc.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:30:59.491+0000|org.onap.aai|traversal_advanced
+appc@appc.onap.org|org.onap.appc.admin|2019-04-04 19:37:28.000+0000|org.onap.appc|admin
+jonathan@people.osaaf.org|org.admin|2018-10-14 00:43:06.769+0000|org|admin
+jonathan@people.osaaf.org|org.onap.owner|2018-10-14 00:42:22.279+0000|org.onap|owner
+jonathan@people.osaaf.org|org.onap.portal.admin|2018-10-30 20:33:01.287+0000|org.onap.portal|admin
+jonathan@people.osaaf.org|org.openecomp.owner|2018-10-14 00:42:14.387+0000|org.openecomp|owner
+jonathan@people.osaaf.org|org.osaaf.aaf.admin|2018-10-14 00:43:24.384+0000|org.osaaf.aaf|admin
+jonathan@people.osaaf.org|org.osaaf.owner|2018-10-14 00:42:07.535+0000|org.osaaf|owner
+jonathan@people.osaaf.org|org.osaaf.people.admin|2018-10-30 21:18:26.583+0000|org.osaaf.people|admin
+jonathan@people.osaaf.org|org.osaaf.people.owner|2018-10-30 21:18:26.583+0000|org.osaaf.people|owner
+jonathan@people.osaaf.org|org.owner|2018-10-14 00:41:36.791+0000|org|owner
+appc123@appc.onap.org|org.onap.appc.admin|2018-08-31 00:00:00.000+0000|org.onap.appc|admin
+appc123@appc.onap.org|org.onap.appc.odl|2018-08-31 00:00:00.000+0000|org.onap.appc|odl
+djtimoney@people.osaaf.org|org.onap.sdnc.admin|2019-02-15 19:00:45.146+0000|org.onap.sdnc|admin
+djtimoney@people.osaaf.org|org.onap.sdnc.owner|2019-02-15 19:00:51.995+0000|org.onap.sdnc|owner
+jm0007@people.osaaf.org|org.onap.portal.tester|2019-04-04 19:37:28.000+0000|org.onap.portal|tester
+jm0007@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-04 19:37:28.000+0000|org.onap.sdc|TESTOR
+dmaap-dr-node@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-04 19:37:28.000+0000|org.onap.dmaap-dr|seeCerts
+dmaap-dr@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-04-04 19:37:28.000+0000|org.onap.dmaap-dr|seeCerts
+vid@vid.onap.org|org.onap.aai.resources_all|2019-04-05 08:33:59.704+0000|org.onap.aai|resources_all
+vid@vid.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:30:47.838+0000|org.onap.aai|traversal_advanced
+op0001@people.osaaf.org|org.onap.portal.ops|2019-04-04 19:37:28.000+0000|org.onap.portal|ops
+op0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-04 19:37:28.000+0000|org.onap.sdc|TESTOR
+aaronh@people.osaaf.org|org.onap.appc.admin|2018-12-06 21:23:26.569+0000|org.onap.appc|admin
+pm0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-04 19:37:28.000+0000|org.onap.sdc|TESTOR
+m99501@dmaapBC.openecomp.org|org.openecomp.dmaapBC.owner|2018-08-31 00:00:00.000+0000|org.openecomp.dmaapBC|owner
+m99501@dmaapBC.openecomp.org|org.openecomp.dmaapBC.service|2018-08-31 00:00:00.000+0000|org.openecomp.dmaapBC|admin
+vfc@vfc.onap.org|org.onap.aai.resources_all|2019-04-05 08:34:51.552+0000|org.onap.aai|resources_all
+vfc@vfc.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:31:50.749+0000|org.onap.aai|traversal_advanced
+vfc@vfc.onap.org|org.onap.vfc.service|2019-04-04 19:37:28.000+0000|org.onap.vfc|service
+pomba@pomba.onap.org|org.onap.aai.resources_all|2019-04-05 15:35:27.485+0000|org.onap.aai|resources_all
+pomba@pomba.onap.org|org.onap.aai.traversal_advanced|2019-04-05 15:35:13.294+0000|org.onap.aai|traversal_advanced
+sdnc@sdnc.onap.org|org.onap.aai.resources_all|2019-04-05 08:32:41.559+0000|org.onap.aai|resources_all
+sdnc@sdnc.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:29:52.674+0000|org.onap.aai|traversal_advanced
+saratp@people.osaaf.org|org.onap.oof.admin|2018-10-25 12:32:10.860+0000|org.onap.oof|admin
+saratp@people.osaaf.org|org.onap.oof.owner|2018-10-25 12:32:10.860+0000|org.onap.oof|owner
+vid2@people.osaaf.org|org.onap.vid.Standard_User|2019-04-04 19:37:28.000+0000|org.onap.vid|Standard_User
+vid2@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-04 19:37:28.000+0000|org.onap.vid|System_Administrator
+aaf_admin@people.osaaf.org|org.onap.aaf-sms.admin|2019-04-04 19:37:28.000+0000|org.onap.aaf-sms|admin
+aaf_admin@people.osaaf.org|org.onap.aai.admin|2019-04-04 19:37:28.000+0000|org.onap.aai|admin
+aaf_admin@people.osaaf.org|org.onap.appc.admin|2019-04-04 19:37:28.000+0000|org.onap.appc|admin
+aaf_admin@people.osaaf.org|org.onap.clamp.admin|2019-04-04 19:37:28.000+0000|org.onap.clamp|admin
+aaf_admin@people.osaaf.org|org.onap.dcae.admin|2019-04-04 19:37:28.000+0000|org.onap.dcae|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-04-05 17:13:55.581+0000|org.onap.dmaap-bc-mm-prov|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-04-05 17:21:10.445+0000|org.onap.dmaap-bc-topic-mgr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.admin|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc.api|Controller
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.admin|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc.api|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-bc.api.owner|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc.api|owner
+aaf_admin@people.osaaf.org|org.onap.dmaap-dr.admin|2019-04-04 19:37:28.000+0000|org.onap.dmaap-dr|admin
+aaf_admin@people.osaaf.org|org.onap.dmaap-mr.admin|2019-04-04 19:37:28.000+0000|org.onap.dmaap-mr|admin
+aaf_admin@people.osaaf.org|org.onap.oof.admin|2019-04-04 19:37:28.000+0000|org.onap.oof|admin
+aaf_admin@people.osaaf.org|org.onap.policy.admin|2019-04-04 19:37:28.000+0000|org.onap.policy|admin
+aaf_admin@people.osaaf.org|org.onap.pomba.admin|2019-04-05 13:51:01.549+0000|org.onap.pomba|admin
+aaf_admin@people.osaaf.org|org.onap.portal.admin|2019-04-04 19:37:28.000+0000|org.onap.portal|admin
+aaf_admin@people.osaaf.org|org.onap.sdc.admin|2019-04-04 19:37:28.000+0000|org.onap.sdc|admin
+aaf_admin@people.osaaf.org|org.onap.sdc.owner|2019-04-04 19:37:28.000+0000|org.onap.sdc|owner
+aaf_admin@people.osaaf.org|org.onap.sdnc.admin|2019-04-04 19:37:28.000+0000|org.onap.sdnc|admin
+aaf_admin@people.osaaf.org|org.onap.so.admin|2019-04-04 19:37:28.000+0000|org.onap.so|admin
+aaf_admin@people.osaaf.org|org.onap.so.owner|2019-04-04 19:37:28.000+0000|org.onap.so|owner
+aaf_admin@people.osaaf.org|org.onap.vfc.admin|2019-04-04 19:37:28.000+0000|org.onap.vfc|admin
+aaf_admin@people.osaaf.org|org.onap.vid.admin|2019-04-04 19:37:28.000+0000|org.onap.vid|admin
+aaf_admin@people.osaaf.org|org.osaaf.aaf.admin|2019-04-04 19:37:28.000+0000|org.osaaf.aaf|admin
+aaf_admin@people.osaaf.org|org.osaaf.people.admin|2019-04-04 19:37:28.000+0000|org.osaaf.people|admin
+aaf_admin@people.osaaf.org|org.osaaf.people.owner|2019-04-04 19:37:28.000+0000|org.osaaf.people|owner
+shi@portal.onap.org|org.onap.portal.admin|2019-04-04 19:37:28.000+0000|org.onap.portal|admin
+clamp@clamp.osaaf.org|org.onap.clamp.service|2019-04-04 19:37:28.000+0000|org.onap.clamp|service
+vid1@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-04 19:37:28.000+0000|org.onap.vid|System_Administrator
+dglfromatt@people.osaaf.org|org.onap.dmaap.bc.admin|2018-11-09 01:26:06.470+0000|org.onap.dmaap.bc|admin
+dglfromatt@people.osaaf.org|org.onap.dmaap.bc.owner|2018-11-09 01:26:12.626+0000|org.onap.dmaap.bc|owner
+dglfromatt@people.osaaf.org|org.onap.dmaapbc.admin|2018-10-20 18:22:18.270+0000|org.onap.dmaapbc|admin
+dglfromatt@people.osaaf.org|org.onap.dmaapbc.owner|2018-10-20 18:22:18.270+0000|org.onap.dmaapbc|owner
+mmanager@people.osaaf.org|org.onap.aaf-sms.admin|2019-04-04 19:37:28.000+0000|org.onap.aaf-sms|admin
+mmanager@people.osaaf.org|org.onap.aaf-sms.owner|2019-04-04 19:37:28.000+0000|org.onap.aaf-sms|owner
+mmanager@people.osaaf.org|org.onap.aai.admin|2019-04-04 19:37:28.000+0000|org.onap.aai|admin
+mmanager@people.osaaf.org|org.onap.aai.owner|2019-04-04 19:37:28.000+0000|org.onap.aai|owner
+mmanager@people.osaaf.org|org.onap.appc.admin|2019-04-04 19:37:28.000+0000|org.onap.appc|admin
+mmanager@people.osaaf.org|org.onap.appc.owner|2019-04-04 19:37:28.000+0000|org.onap.appc|owner
+mmanager@people.osaaf.org|org.onap.clamp.admin|2019-04-04 19:37:28.000+0000|org.onap.clamp|admin
+mmanager@people.osaaf.org|org.onap.clamp.owner|2019-04-04 19:37:28.000+0000|org.onap.clamp|owner
+mmanager@people.osaaf.org|org.onap.dcae.admin|2019-04-04 19:37:28.000+0000|org.onap.dcae|admin
+mmanager@people.osaaf.org|org.onap.dcae.owner|2019-04-04 19:37:28.000+0000|org.onap.dcae|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.admin|2019-04-05 17:13:55.581+0000|org.onap.dmaap-bc-mm-prov|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc-mm-prov.owner|2019-04-05 17:13:55.581+0000|org.onap.dmaap-bc-mm-prov|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.admin|2019-04-05 17:21:10.445+0000|org.onap.dmaap-bc-topic-mgr|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc-topic-mgr.owner|2019-04-05 17:21:10.445+0000|org.onap.dmaap-bc-topic-mgr|owner
+mmanager@people.osaaf.org|org.onap.dmaap-bc.admin|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc|admin
+mmanager@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-04 18:34:59.001+0000|org.onap.dmaap-bc.api|Controller
+mmanager@people.osaaf.org|org.onap.dmaap-bc.owner|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc|owner
+mmanager@people.osaaf.org|org.onap.dmaap-dr.owner|2019-04-04 19:37:28.000+0000|org.onap.dmaap-dr|owner
+mmanager@people.osaaf.org|org.onap.dmaap-mr.admin|2019-04-04 19:37:28.000+0000|org.onap.dmaap-mr|admin
+mmanager@people.osaaf.org|org.onap.dmaap-mr.owner|2019-04-04 19:37:28.000+0000|org.onap.dmaap-mr|owner
+mmanager@people.osaaf.org|org.onap.oof.admin|2019-04-04 19:37:28.000+0000|org.onap.oof|admin
+mmanager@people.osaaf.org|org.onap.oof.owner|2019-04-04 19:37:28.000+0000|org.onap.oof|owner
+mmanager@people.osaaf.org|org.onap.policy.admin|2019-04-04 19:37:28.000+0000|org.onap.policy|admin
+mmanager@people.osaaf.org|org.onap.policy.owner|2019-04-04 19:37:28.000+0000|org.onap.policy|owner
+mmanager@people.osaaf.org|org.onap.pomba.admin|2019-04-05 13:51:01.549+0000|org.onap.pomba|admin
+mmanager@people.osaaf.org|org.onap.pomba.owner|2019-04-05 13:51:01.549+0000|org.onap.pomba|owner
+mmanager@people.osaaf.org|org.onap.portal.admin|2019-04-04 19:37:28.000+0000|org.onap.portal|admin
+mmanager@people.osaaf.org|org.onap.portal.owner|2019-04-04 19:37:28.000+0000|org.onap.portal|owner
+mmanager@people.osaaf.org|org.onap.sdc.admin|2019-04-04 19:37:28.000+0000|org.onap.sdc|admin
+mmanager@people.osaaf.org|org.onap.sdc.owner|2019-04-04 19:37:28.000+0000|org.onap.sdc|owner
+mmanager@people.osaaf.org|org.onap.sdnc.admin|2019-04-04 19:37:28.000+0000|org.onap.sdnc|admin
+mmanager@people.osaaf.org|org.onap.sdnc.owner|2019-04-04 19:37:28.000+0000|org.onap.sdnc|owner
+mmanager@people.osaaf.org|org.onap.so.admin|2019-04-04 19:37:28.000+0000|org.onap.so|admin
+mmanager@people.osaaf.org|org.onap.so.owner|2019-04-04 19:37:28.000+0000|org.onap.so|owner
+mmanager@people.osaaf.org|org.onap.vfc.admin|2019-04-04 19:37:28.000+0000|org.onap.vfc|admin
+mmanager@people.osaaf.org|org.onap.vfc.owner|2019-04-04 19:37:28.000+0000|org.onap.vfc|owner
+mmanager@people.osaaf.org|org.onap.vid.admin|2019-04-04 19:37:28.000+0000|org.onap.vid|admin
+mmanager@people.osaaf.org|org.onap.vid.owner|2019-04-04 19:37:28.000+0000|org.onap.vid|owner
+cs0008@people.osaaf.org|org.onap.portal.designer|2019-04-04 19:37:28.000+0000|org.onap.portal|designer
+cs0008@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-04 19:37:28.000+0000|org.onap.sdc|TESTOR
+ps0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-04 19:37:28.000+0000|org.onap.sdc|TESTOR
+gv0001@people.osaaf.org|org.onap.portal.governor|2019-04-04 19:37:28.000+0000|org.onap.portal|governor
+gv0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-04-04 19:37:28.000+0000|org.onap.sdc|TESTOR
+m99751@dmaapBC.openecomp.org|org.openecomp.dmaapBC.admin|2018-08-31 00:00:00.000+0000|org.openecomp.dmaapBC|admin
+m99751@dmaapBC.openecomp.org|org.openecomp.dmaapBC.owner|2018-08-31 00:00:00.000+0000|org.openecomp.dmaapBC|owner
+xuegao@people.osaaf.org|org.onap.clamp.admin|2018-10-23 15:50:48.247+0000|org.onap.clamp|admin
+xuegao@people.osaaf.org|org.onap.clamp.clds.admin.dev|2018-10-23 15:51:40.394+0000|org.onap.clamp|clds.admin.dev
+xuegao@people.osaaf.org|org.onap.clamp.owner|2018-10-18 14:20:42.671+0000|org.onap.clamp|owner
+aai@aai.onap.org|org.onap.aai.admin|2019-04-04 19:37:28.000+0000|org.onap.aai|admin
+aai@aai.onap.org|org.onap.aai.resources_all|2019-04-05 08:32:16.771+0000|org.onap.aai|resources_all
+aai@aai.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:29:29.071+0000|org.onap.aai|traversal_advanced
+demo@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-04-04 19:37:28.000+0000|org.onap.dmaap.mr|view
+clamp@clampdemo.onap.org|org.onap.clampdemo.owner|2019-04-04 19:37:28.000+0000|org.onap.clampdemo|owner
+clamp@clampdemo.onap.org|org.onap.clampdemo.service|2019-04-04 19:37:28.000+0000|org.onap.clampdemo|admin
+jh0003@people.osaaf.org|org.onap.portal.admin|2019-04-04 19:37:28.000+0000|org.onap.portal|admin
+jh0003@people.osaaf.org|org.onap.sdc.ADMIN|2019-04-04 19:37:28.000+0000|org.onap.sdc|ADMIN
+jh0003@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-04-04 19:37:28.000+0000|org.onap.sdc|Account_Administrator
+oof@oof.onap.org|org.onap.aai.resources_all|2019-04-05 08:34:26.957+0000|org.onap.aai|resources_all
+oof@oof.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:31:12.086+0000|org.onap.aai|traversal_advanced
+oof@oof.onap.org|org.onap.oof.service|2019-04-04 19:37:28.000+0000|org.onap.oof|service
+onap-sdnc@sdnc.onap.org|org.onap.sdnc.service|2019-04-04 19:37:28.000+0000|org.onap.sdnc|service
+dmaap-bc@bc.dmaap.onap.org|org.onap.dmaap.bc.service|2019-04-04 19:37:28.000+0000|org.onap.dmaap.bc|service
+osaaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-04-04 19:37:28.000+0000|org.osaaf.aaf|admin
+demo@people.osaaf.org|org.onap.aai.Account_Administrator|2019-04-04 19:37:28.000+0000|org.onap.aai|Account_Administrator
+demo@people.osaaf.org|org.onap.aai.member|2019-04-04 19:37:28.000+0000|org.onap.aai|member
+demo@people.osaaf.org|org.onap.aai.resources_readonly|2019-04-05 08:35:04.833+0000|org.onap.aai|resources_readonly
+demo@people.osaaf.org|org.onap.aai.traversal_basic|2019-04-05 08:32:04.181+0000|org.onap.aai|traversal_basic
+demo@people.osaaf.org|org.onap.dmaap-bc.api.Controller|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc.api|Controller
+demo@people.osaaf.org|org.onap.dmaap.mr.create|2019-04-04 19:37:28.000+0000|org.onap.dmaap.mr|create
+demo@people.osaaf.org|org.onap.dmaap.mr.destroy|2019-04-04 19:37:28.000+0000|org.onap.dmaap.mr|destroy
+demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-04-04 19:37:28.000+0000|org.onap.dmaap.mr|mrtesttopic.pub
+demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-04-04 19:37:28.000+0000|org.onap.dmaap.mr|mrtesttopic.sub
+demo@people.osaaf.org|org.onap.dmaap.mr.view|2019-04-04 19:37:28.000+0000|org.onap.dmaap.mr|view
+demo@people.osaaf.org|org.onap.policy.Account_Administrator|2019-04-04 19:37:28.000+0000|org.onap.policy|Account_Administrator
+demo@people.osaaf.org|org.onap.policy.System_Administrator|2019-04-04 19:37:28.000+0000|org.onap.policy|System_Administrator
+demo@people.osaaf.org|org.onap.policy.pdpd.admin|2019-04-04 19:37:28.000+0000|org.onap.policy|pdpd.admin
+demo@people.osaaf.org|org.onap.portal.Account_Administrator|2019-04-04 19:37:28.000+0000|org.onap.portal|Account_Administrator
+demo@people.osaaf.org|org.onap.portal.System_Administrator|2019-04-04 19:37:28.000+0000|org.onap.portal|System_Administrator
+demo@people.osaaf.org|org.onap.portal.admin|2019-04-04 19:37:28.000+0000|org.onap.portal|admin
+demo@people.osaaf.org|org.onap.portal.test.admin|2019-04-04 19:37:28.000+0000|org.onap.portal.test|admin
+demo@people.osaaf.org|org.onap.portal.test.owner|2019-04-04 19:37:28.000+0000|org.onap.portal.test|owner
+demo@people.osaaf.org|org.onap.portal.test.user1|2019-04-04 19:37:28.000+0000|org.onap.portal.test|user1
+demo@people.osaaf.org|org.onap.sdc.ADMIN|2019-04-04 19:37:28.000+0000|org.onap.sdc|ADMIN
+demo@people.osaaf.org|org.onap.sdc.Account_Administrator|2019-04-04 19:37:28.000+0000|org.onap.sdc|Account_Administrator
+demo@people.osaaf.org|org.onap.vid.Account_Administrator|2019-04-04 19:37:28.000+0000|org.onap.vid|Account_Administrator
+demo@people.osaaf.org|org.onap.vid.System_Administrator|2019-04-04 19:37:28.000+0000|org.onap.vid|System_Administrator
+ryan@appc.onap.org|org.onap.appc.admin|2018-08-31 00:00:00.000+0000|org.onap.appc|admin
+ryan@appc.onap.org|org.onap.appc.odl|2018-08-31 00:00:00.000+0000|org.onap.appc|odl
+portal_admin@people.osaaf.org|org.onap.portal.admin|2019-04-04 19:37:28.000+0000|org.onap.portal|admin
+clamp@clamp.onap.org|org.onap.clamp.clds.admin.dev|2019-04-04 19:37:28.000+0000|org.onap.clamp|clds.admin.dev
+clamp@clamp.onap.org|org.onap.clamp.clds.designer.dev|2019-04-04 19:37:28.000+0000|org.onap.clamp|clds.designer.dev
+clamp@clamp.onap.org|org.onap.clamp.clds.vf_filter_all.dev|2019-04-04 19:37:28.000+0000|org.onap.clamp|clds.vf_filter_all.dev
+clamp@clamp.onap.org|org.onap.clamp.service|2019-04-04 19:37:28.000+0000|org.onap.clamp|service
+clamp@clamp.onap.org|org.onap.clampdemo.owner|2019-04-04 19:37:28.000+0000|org.onap.clampdemo|owner
+clamp@clamp.onap.org|org.onap.clampdemo.service|2019-04-04 19:37:28.000+0000|org.onap.clampdemo|admin
+clamp@clamp.onap.org|org.onap.clamptest.owner|2019-04-04 19:37:28.000+0000|org.onap.clamptest|owner
+clamp@clamp.onap.org|org.onap.clamptest.service|2019-04-04 19:37:28.000+0000|org.onap.clamptest|admin
+clamp@clamptest.onap.org|org.onap.clamptest.owner|2019-04-04 19:37:28.000+0000|org.onap.clamptest|owner
+clamp@clamptest.onap.org|org.onap.clamptest.service|2019-04-04 19:37:28.000+0000|org.onap.clamptest|admin
+policy@policy.onap.org|org.onap.aai.resources_all|2019-04-05 08:33:06.493+0000|org.onap.aai|resources_all
+policy@policy.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:30:22.571+0000|org.onap.aai|traversal_advanced
+policy@policy.onap.org|org.onap.policy.admin|2019-04-04 19:37:28.000+0000|org.onap.policy|admin
+policy@policy.onap.org|org.onap.policy.pdpd.admin|2019-04-04 19:37:28.000+0000|org.onap.policy|pdpd.admin
+policy@policy.onap.org|org.onap.policy.seeCerts|2019-04-04 19:37:28.000+0000|org.onap.policy|seeCerts
+sunilu@people.osaaf.org|org.onap.dmaap.mr.admin|2018-10-24 18:21:05.870+0000|org.onap.dmaap.mr|admin
+sunilu@people.osaaf.org|org.onap.dmaap.mr.create|2019-03-12 19:34:47.197+0000|org.onap.dmaap.mr|create
+sunilu@people.osaaf.org|org.onap.dmaap.mr.destroy|2019-03-12 19:35:04.204+0000|org.onap.dmaap.mr|destroy
+sunilu@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.pub|2019-03-12 19:36:01.605+0000|org.onap.dmaap.mr|mrtesttopic.pub
+sunilu@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-03-12 19:35:37.633+0000|org.onap.dmaap.mr|mrtesttopic.sub
+sunilu@people.osaaf.org|org.onap.dmaap.mr.owner|2018-10-24 18:21:05.870+0000|org.onap.dmaap.mr|owner
+sunilu@people.osaaf.org|org.onap.dmaap.mr.view|2019-03-12 19:33:55.136+0000|org.onap.dmaap.mr|view
+deployer@people.osaaf.org|org.osaaf.aaf.deploy|2019-04-04 19:37:28.000+0000|org.osaaf.aaf|deploy
+so@so.onap.org|org.onap.aai.resources_all|2019-04-05 08:32:28.427+0000|org.onap.aai|resources_all
+so@so.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:29:41.621+0000|org.onap.aai|traversal_advanced
+so@so.onap.org|org.onap.so.app|2019-04-04 19:37:28.000+0000|org.onap.so|app
+ryany@people.osaaf.org|org.onap.appc.admin|2018-12-06 20:00:59.991+0000|org.onap.appc|admin
+ryany@people.osaaf.org|org.onap.appc.owner|2018-12-06 20:00:51.151+0000|org.onap.appc|owner
+aaf@aaf.osaaf.org|org.admin|2019-04-04 19:37:28.000+0000|org|admin
+aaf@aaf.osaaf.org|org.osaaf.aaf.admin|2019-04-04 19:37:28.000+0000|org.osaaf.aaf|admin
+aaf@aaf.osaaf.org|org.osaaf.aaf.service|2019-04-04 19:37:28.000+0000|org.osaaf.aaf|service
+aaf@aaf.osaaf.org|org.osaaf.people.admin|2019-04-04 19:37:28.000+0000|org.osaaf.people|admin
+dmaap-bc@dmaap-bc.onap.org|org.onap.dmaap-bc.seeCerts|2019-04-04 19:37:28.000+0000|org.onap.dmaap-bc|seeCerts
+kirank@people.osaaf.org|org.onap.aaf-sms.admin|2018-10-25 11:06:30.380+0000|org.onap.aaf-sms|admin
+kirank@people.osaaf.org|org.onap.aaf-sms.owner|2018-10-25 11:06:30.380+0000|org.onap.aaf-sms|owner
+dcae@dcae.onap.org|org.onap.aai.resources_all|2019-04-05 08:32:52.704+0000|org.onap.aai|resources_all
+dcae@dcae.onap.org|org.onap.aai.traversal_advanced|2019-04-05 08:30:08.257+0000|org.onap.aai|traversal_advanced
+dcae@dcae.onap.org|org.onap.dcae.seeCerts|2019-04-04 19:37:28.000+0000|org.onap.dcae|seeCerts
+aaf-authz@aaf.osaaf.org|org.osaaf.aaf.service|2018-11-01 19:58:35.364+0000|org.osaaf.aaf|service
+richardt@people.osaaf.org|org.onap.sdnc.admin|2018-11-09 01:18:12.468+0000|org.onap.sdnc|admin
+richardt@people.osaaf.org|org.onap.sdnc.owner|2018-11-09 01:18:12.468+0000|org.onap.sdnc|owner
+jimmy@people.osaaf.org|org.onap.aai.admin|2018-12-05 12:51:20.953+0000|org.onap.aai|admin
+jimmy@people.osaaf.org|org.onap.aai.owner|2018-12-05 12:51:20.953+0000|org.onap.aai|owner
+aaf-sms@aaf-sms.onap.org|org.onap.aaf-sms.service|2019-04-04 19:37:28.000+0000|org.onap.aaf-sms|service
diff --git a/auth/sample/data/sample.identities.dat b/auth/sample/data/sample.identities.dat
index e41bb25..fe1d947 100644
--- a/auth/sample/data/sample.identities.dat
+++ b/auth/sample/data/sample.identities.dat
@@ -58,6 +58,7 @@
 sdnc|ONAP SDNC Application|SDNC|ONAP Application|||a|aaf_admin
 vfc|ONAP VFC Application|VNC|ONAP Application|||a|aaf_admin
 policy|ONAP Policy Application|POLICY|ONAP Application|||a|aaf_admin
+pomba|ONAP Pomba Application|POMBA|ONAP Application|||a|aaf_admin
 
 # VID Identities
 vid|ONAP VID Application|VID|ONAP Application|||a|aaf_admin
@@ -66,8 +67,8 @@
 
 # DMAAP Identities
 dmaap-bc|ONAP DMaap BC Application|DMaap BC|ONAP Application|||a|aaf_admin
-dmaap_bc_topic_mgr|ONAP DMaap BC Topic Manager|DMaap BC Topic Manager|DMaap BC|||a|aaf_admin
-dmaap_bc_mm_prov|ONAP DMaap BC Provisioning Manager|DMaap BC Provision Manager|DMaap BC|||a|aaf_admin
+dmaap-bc-topic-mgr|ONAP DMaap BC Topic Manager|DMaap BC Topic Manager|DMaap BC|||a|aaf_admin
+dmaap-bc-mm-prov|ONAP DMaap BC Provisioning Manager|DMaap BC Provision Manager|DMaap BC|||a|aaf_admin
 dmaap-mr|ONAP DMaap MR Application|DMaap MR|ONAP Application|||a|aaf_admin
 dmaap-dr|ONAP DMaap DR|Prov|DMaap DR|||a|aaf_admin
 dmaap-dr-prov|ONAP DMaap DR Prov|Prov|DMaap MR|||a|aaf_admin