Bootstrap Data update2.1.2

Requested by Jorge and Portal
Includes some scripts to make data loading easier

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

11 files changed, 279 insertions, 321 deletions

diff --git a/auth/sample/cass_data/config.dat b/auth/sample/cass_data/config.dat
index db722706..8c5e5c67 100644
--- a/auth/sample/cass_data/config.dat
+++ b/auth/sample/cass_data/config.dat
@@ -1,4 +1,5 @@
 aaf|aaf_env|DEV

+aaf|aaf_locate_url|https://aaf-onap-test.osaaf.org:8095

 aaf|aaf_oauth2_introspect_url|https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect

 aaf|aaf_oauth2_token_url|https://AAF_LOCATE_URL/AAF_NS.token:2.1/token

 aaf|aaf_url|https://AAF_LOCATE_URL/AAF_NS.service:2.1

diff --git a/auth/sample/cass_data/ns.dat b/auth/sample/cass_data/ns.dat
index 88987476..89f9b5f6 100644
--- a/auth/sample/cass_data/ns.dat
+++ b/auth/sample/cass_data/ns.dat
@@ -1,31 +1,31 @@
+org.onap.dmaap.mr||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.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.dmaap-bc.api||org.onap.dmaap-bc||3

 org.onap.sdc||org.onap||3

+org.onap.dmaap-bc.api||org.onap.dmaap-bc||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.clampdemo|Onap clamp demo NS|org.onap|2|2

-org.onap.appc||org.onap||3

-org.onap.dmaap.mr||org.onap||3

-org.openecomp.dmaapBC|DMaap NS|org.openecomp|3|3

-org.onap.dmaap-mr||org.onap||3

-org.onap.dmaapbc||org.onap||3

-org.onap.oof||org.onap||3

-org.onap.dmaap-bc||org.onap||3

-org.openecomp|Open EComp NS|org|2|2

-org.onap.portal.test||org.onap.portal||3

-org.onap.aai||org.onap||3

 org.onap.dmaap-dr||org.onap||3

+org.onap.clampdemo|Onap clamp demo NS|org.onap|2|2

 org.onap.clamp||org.onap||3

 org.onap.vfc||org.onap||3

 org.onap.vid||org.onap||3

 org.onap|ONAP|org|2|2

-org.onap.dmaap.bc||org.onap||3

 org.openecomp.dcae|DCAE Namespace Org|org.openecomp|3|3

 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 a42eab4b..71cfa5a6 100644
--- a/auth/sample/cass_data/perm.dat
+++ b/auth/sample/cass_data/perm.dat
@@ -5,23 +5,23 @@ org.onap.dmaap.mr|topic|:topic.org.onap.dmaap.mr.mrtesttopic|pub||"{'org.onap.dm
 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.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.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.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.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|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'}"

@@ -29,16 +29,6 @@ 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.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.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'}"

@@ -46,68 +36,19 @@ 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.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'}"

-org.onap.clamp|clds.cl|dev|*||"{'org.onap.clamp|service'}"

-org.onap.clamp|clds.cl|dev|read|Onap Clamp Dev Read Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|clds.admin.dev'}"

-org.onap.clamp|clds.cl|dev|update|Onap Clamp Dev Update Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|clds.admin.dev'}"

-org.onap.clamp|clds.cl.event|dev|*|Onap Clamp Dev Write Access|{'org.onap.clamp.clds.designer.dev'}

-org.onap.clamp|clds.cl.manage|dev|*|Onap Clamp Dev Manage Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|service'}"

-org.onap.clamp|clds.filter.vf|dev|*|Onap Clamp Filter All Dev  Access|"{'org.onap.clamp.clds.vf_filter_all.dev', 'org.onap.clamp|service'}"

-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.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.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.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'}"

-org.onap.vid|menu|menu_admin|*|Admin Menu|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_ajax|*|Ajax Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_changemanagement|*|VNF Changes|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_concept|*|CoNCEPT|

-org.onap.vid|menu|menu_customer|*|Customer Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_customer_create|*|Customer Create|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_doclib|*|Document Library Menu|

-org.onap.vid|menu|menu_feedback|*|Feedback Menu|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_help|*|Help Menu|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_home|*|Home Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_itracker|*|iTracker Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_job|*|Job Menu|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_job_create|*|Job Create|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_job_designer|*|Process in Designer view|

-org.onap.vid|menu|menu_logout|*|Logout Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_map|*|Map Menu|"{'org.onap.vid|Standard_User'}"

-org.onap.vid|menu|menu_newserinstance|*|Create New Service Instance|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_notes|*|Notes Menu|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_process|*|Process List|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_profile|*|Profile Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_profile_create|*|Profile Create|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_profile_import|*|Profile Import|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_reports|*|Reports Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_sample|*|Sample Pages Menu|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_searchexisting|*|Search for Existing Service Instances|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_servicemodels|*|Browse SDC Service Instances|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_tab|*|Sample Tab Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_task|*|Task Menu|

-org.onap.vid|menu|menu_task_search|*|Task Search|

-org.onap.vid|menu|menu_test|*|Test Menu|"{'org.onap.vid|System_Administrator'}"

-org.onap.vid|menu|menu_viewlog|*|Log Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

-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|access|*|*|Onap Write Access|{'org.onap.admin'}

-org.onap|access|*|read|Onap Read Access|{'org.onap.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.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'}"

@@ -171,11 +112,72 @@ org.onap.policy|url|policy_pdp|*|Policy PDP|"{'org.onap.policy|Policy_Admin', 'o
 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.osaaf|access|*|*|OSAAF Write Access|{'org.osaaf.admin'}

-org.osaaf|access|*|read,appove|OSAAF Read Access|{'org.osaaf.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.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'}"

+org.onap.clamp|clds.cl|dev|*||"{'org.onap.clamp|service'}"

+org.onap.clamp|clds.cl|dev|read|Onap Clamp Dev Read Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|clds.admin.dev'}"

+org.onap.clamp|clds.cl|dev|update|Onap Clamp Dev Update Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|clds.admin.dev'}"

+org.onap.clamp|clds.cl.event|dev|*|Onap Clamp Dev Write Access|{'org.onap.clamp.clds.designer.dev'}

+org.onap.clamp|clds.cl.manage|dev|*|Onap Clamp Dev Manage Access|"{'org.onap.clamp.clds.designer.dev', 'org.onap.clamp|service'}"

+org.onap.clamp|clds.filter.vf|dev|*|Onap Clamp Filter All Dev  Access|"{'org.onap.clamp.clds.vf_filter_all.dev', 'org.onap.clamp|service'}"

+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.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.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'}"

+org.onap.vid|menu|menu_admin|*|Admin Menu|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_ajax|*|Ajax Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_changemanagement|*|VNF Changes|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_concept|*|CoNCEPT|

+org.onap.vid|menu|menu_customer|*|Customer Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_customer_create|*|Customer Create|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_doclib|*|Document Library Menu|

+org.onap.vid|menu|menu_feedback|*|Feedback Menu|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_help|*|Help Menu|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_home|*|Home Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_itracker|*|iTracker Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_job|*|Job Menu|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_job_create|*|Job Create|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_job_designer|*|Process in Designer view|

+org.onap.vid|menu|menu_logout|*|Logout Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_map|*|Map Menu|"{'org.onap.vid|Standard_User'}"

+org.onap.vid|menu|menu_newserinstance|*|Create New Service Instance|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_notes|*|Notes Menu|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_process|*|Process List|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_profile|*|Profile Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_profile_create|*|Profile Create|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_profile_import|*|Profile Import|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_reports|*|Reports Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_sample|*|Sample Pages Menu|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_searchexisting|*|Search for Existing Service Instances|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_servicemodels|*|Browse SDC Service Instances|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_tab|*|Sample Tab Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_task|*|Task Menu|

+org.onap.vid|menu|menu_task_search|*|Task Search|

+org.onap.vid|menu|menu_test|*|Test Menu|"{'org.onap.vid|System_Administrator'}"

+org.onap.vid|menu|menu_viewlog|*|Log Menu|"{'org.onap.vid|Standard_User', 'org.onap.vid|System_Administrator'}"

+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|access|*|*|Onap Write Access|{'org.onap.admin'}

+org.onap|access|*|read|Onap Read Access|{'org.onap.owner'}

+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'}"

@@ -219,24 +221,25 @@ org.onap.dmaap-bc.api|topics|onapdemo|DELETE||"{'org.onap.dmaap-bc.api|Controlle
 org.onap.dmaap-bc.api|topics|onapdemo|GET||"{'org.onap.dmaap-bc.api|Controller', 'org.onap.dmaap-bc.api|Inventory', 'org.onap.dmaap-bc.api|Metrics', 'org.onap.dmaap-bc.api|Orchestrator', 'org.onap.dmaap-bc.api|PortalUser'}"

 org.onap.dmaap-bc.api|topics|onapdemo|POST||"{'org.onap.dmaap-bc.api|Controller', 'org.onap.dmaap-bc.api|Orchestrator'}"

 org.onap.dmaap-bc.api|topics|onapdemo|PUT||"{'org.onap.dmaap-bc.api|Controller', 'org.onap.dmaap-bc.api|Orchestrator'}"

-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.clamptest|access|*|*|Onap Write Access|{'org.onap.clamptest.admin'}

+org.onap.clamptest|access|*|read|Onap Read Access|{'org.onap.clamptest.owner'}

+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.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.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.clamptest|access|*|*|Onap Write Access|{'org.onap.clamptest.admin'}

-org.onap.clamptest|access|*|read|Onap Read Access|{'org.onap.clamptest.owner'}

 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|*|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'}"

 org.onap.portal|menu|menu_ajax|*|Ajax Menu|"{'org.onap.portal|Standard_User', 'org.onap.portal|System_Administrator'}"

 org.onap.portal|menu|menu_customer|*|Customer Menu|"{'org.onap.portal|Standard_User', 'org.onap.portal|System_Administrator'}"

@@ -265,5 +268,3 @@ org.onap.portal|url|getAdminNotifications|*|Admin Notifications|"{'org.onap.port
 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|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 149119d4..895db096 100644
--- a/auth/sample/cass_data/role.dat
+++ b/auth/sample/cass_data/role.dat
@@ -1,26 +1,41 @@
-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.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.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.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'}"

+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.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.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.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|*|*'}"

+org.onap.oof|owner|AAF Namespace Owners|"{'org.onap.oof|access|*|read'}"

+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.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.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|*'}"

@@ -37,6 +52,32 @@ org.onap.policy|pdpd.monitor|pdpd.monitor|"{'org.onap.policy|pdpd.telemetry|*|ge
 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.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.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.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|*'}"

+org.onap.vid|admin|AAF Namespace Administrators|"{'org.onap.vid|access|*|*'}"

+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.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|

@@ -45,11 +86,9 @@ 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.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|*|*'}"

-org.onap.oof|owner|AAF Namespace Owners|"{'org.onap.oof|access|*|read'}"

-org.onap.oof|service||"{'org.onap.oof|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-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'}"

@@ -57,19 +96,18 @@ org.onap.dmaap-bc.api|Orchestrator||"{'org.onap.dmaap-bc.api|dcaeLocations|onapd
 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.openecomp|admin|OpenEcomp Admins|"{'org.openecomp.access|*|*'}"

-org.openecomp|owner|OpenEcomp Owners|"{'org.openecomp.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.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.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.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|

@@ -87,46 +125,8 @@ 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.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.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-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.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.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.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|*'}"

-org.onap.vid|admin|AAF Namespace Administrators|"{'org.onap.vid|access|*|*'}"

-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|admin|Onap Admins|"{'org.onap.access|*|*'}"

-org.onap|owner|onap Owners|"{'org.onap.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.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.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.clampdemo|admin|Onap Clamp Test  Admins|"{'org.onap.clampdemo.access|*|*'}"

+org.onap.clampdemo|owner|onap clamp Test Owners|"{'org.onap.clampdemo.access|*|read'}"

diff --git a/auth/sample/cass_data/scrub.sh b/auth/sample/cass_data/scrub.sh
new file mode 100644
index 00000000..016b58a7
--- /dev/null
+++ b/auth/sample/cass_data/scrub.sh
@@ -0,0 +1,20 @@
+> user_role.dat
+for ID in $(grep -v "#" ../data/sample.identities.dat | awk -F\| '{print $1}' | grep -v "^$"); do
+  grep "$ID@" dats/user_role.dat >> user_role.dat
+done
+
+for D in ns ns_attrib perm role config; do 
+  cp dats/$D.dat .
+done
+
+echo "Roles in TEST data not in sample.identities.dat (../data)"
+UR="$(mktemp)"
+DUR="$(mktemp)"
+
+cat user_role.dat | awk -F\| '{print $1}' | sort -u > $UR
+cat dats/user_role.dat | awk -F\| '{print $1}' | sort -u > $DUR
+
+echo "Removed IDs from user_roles"
+diff $UR $DUR | grep "^>" | sort -u 
+
+rm "$UR" "$DUR"
diff --git a/auth/sample/cass_data/user_role.dat b/auth/sample/cass_data/user_role.dat
index d9832021..27bd2e61 100644
--- a/auth/sample/cass_data/user_role.dat
+++ b/auth/sample/cass_data/user_role.dat
@@ -1,40 +1,3 @@
-appc@appc.onap.org|org.onap.appc.admin|2018-12-06 20:01:35.380+0000|org.onap.appc|admin

-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

-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

-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

-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

-sdc@sdc.onap.org|org.onap.aai.resources_all|2019-03-14 18:40:55.439+0000|org.onap.aai|resources_all

-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

 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

@@ -66,37 +29,9 @@ mmanager@people.osaaf.org|org.onap.vfc.admin|2019-03-25 15:11:00.909+0000|org.on
 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

-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

-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

-ps0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:50.822+0000|org.onap.sdc|TESTOR

-dmaap-dr@dmaap-dr.onap.org|org.onap.dmaap-dr.seeCerts|2019-02-17 17:00:02.098+0000|org.onap.dmaap-dr|seeCerts

-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

-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

-pm0001@people.osaaf.org|org.onap.sdc.TESTOR|2019-03-24 21:37:49.993+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

-clamp@clamp.osaaf.org|org.onap.clamp.service|2019-01-19 16:04:25.475+0000|org.onap.clamp|service

-vfc@vfc.onap.org|org.onap.vfc.service|2019-03-25 15:40:06.287+0000|org.onap.vfc|service

-vid1@people.osaaf.org|org.onap.vid.System_Administrator|2019-03-24 21:39:30.715+0000|org.onap.vid|System_Administrator

-aai@aai.onap.org|org.onap.aai.admin|2018-12-05 12:53:12.506+0000|org.onap.aai|admin

-demo@mr.dmaap.onap.org|org.onap.dmaap.mr.view|2019-03-13 15:42:58.918+0000|org.onap.dmaap.mr|view

-onap-sdnc@sdnc.onap.org|org.onap.sdnc.service|2018-11-09 01:40:36.805+0000|org.onap.sdnc|service

-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

-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

-oof@oof.onap.org|org.onap.oof.service|2018-10-25 12:32:37.101+0000|org.onap.oof|service

-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

-dmaap-bc@bc.dmaap.onap.org|org.onap.dmaap.bc.service|2018-11-09 01:46:01.277+0000|org.onap.dmaap.bc|service

-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

 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

@@ -109,6 +44,7 @@ demo@people.osaaf.org|org.onap.dmaap.mr.mrtesttopic.sub|2019-03-13 18:09:47.647+
 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

@@ -120,7 +56,52 @@ demo@people.osaaf.org|org.onap.sdc.ADMIN|2019-03-24 21:37:50.052+0000|org.onap.s
 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

@@ -131,16 +112,24 @@ clamp@clamp.onap.org|org.onap.clamptest.owner|2018-08-31 00:00:00.000+0000|org.o
 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

-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

-so@so.onap.org|org.onap.so.app|2019-03-14 17:31:26.590+0000|org.onap.so|app

-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

+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

-dcae@dcae.onap.org|org.onap.dcae.seeCerts|2019-02-07 18:17:35.485+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

-aaf-sms@aaf-sms.onap.org|org.onap.aaf-sms.service|2018-10-25 11:07:56.161+0000|org.onap.aaf-sms|service

+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

diff --git a/auth/sample/data/.gitignore b/auth/sample/data/.gitignore
new file mode 100644
index 00000000..9dea1cde
--- /dev/null
+++ b/auth/sample/data/.gitignore
@@ -0,0 +1 @@
+identities.dat
diff --git a/auth/sample/data/identities.dat b/auth/sample/data/identities.dat
deleted file mode 100644
index 1fcc0f4e..00000000
--- a/auth/sample/data/identities.dat
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Sample Identities.dat
-# This file is for use with the "Default Organization". It is a simple mechanism to have a basic ILM structure to use with
-# out-of-the-box tire-kicking, or even for Small companies
-#
-# For Larger Companies, you will want to create a new class implementing the "Organization" interface, making calls to your ILM, or utilizing
-# batch feeds, as is appropriate for your company.
-#
-# Example Field Layout.  note, in this example, Application IDs and People IDs are mixed.  You may want to split
-# out AppIDs, choose your own status indicators, or whatever you use.
-#  0 - unique ID
-#  1 - full name
-#  2 - first name
-#  3 - last name
-#  4 - phone
-#  5 - official email
-#  6 - employment status e=employee, c=contractor, a=application, n=no longer with company
-#  7 - responsible to (i.e Supervisor for People, or AppOwner, if it's an App ID)
-#
-
-iowna|Ima D. Owner|Ima|Owner|314-123-2000|ima.d.owner@people.osaaf.com|e|
-mmanager|Mark D. Manager|Mark|Manager|314-123-1234|mark.d.manager@people.osaaf.com|e|iowna
-bdevl|Robert D. Developer|Bob|Developer|314-123-1235|bob.d.developer@people.osaaf.com|e|mmanager
-mmarket|Mary D. Marketer|Mary|Marketer|314-123-1236|mary.d.marketer@people.osaaf.com|e|mmanager
-ccontra|Clarice D. Contractor|Clarice|Contractor|314-123-1237|clarice.d.contractor@people.osaaf.com|c|mmanager
-iretired|Ira Lee M. Retired|Ira|Retired|314-123-1238|clarice.d.contractor@people.osaaf.com|n|mmanager
-
-# ONAP default Users
-demo|PORTAL DEMO|PORTAL|DEMO|||e|aaf_admin
-jh0003|PORTAL ADMIN|PORTAL|ADMIN|||e|aaf_admin
-cs0008|PORTAL DESIGNER|PORTAL|DESIGNER|||e|aaf_admin
-jm0007|PORTAL TESTER|PORTAL|TESTER|||e|aaf_admin
-op0001|PORTAL OPS|PORTAL|OPS|||e|aaf_admin
-gv0001|PORTAL GOVERNOR|PORTAL|GOVERNOR|||e|aaf_admin
-
-# AAF Defined Users
-aaf_admin|AAF Administrator|Mr AAF|AAF Admin|||e|mmanager
-deploy|Deployer|Deployer|Depoyer|||e|aaf_admin
-
-# Requested Users
-djtimoney|Dan Timoney|Dan|Timoney|||e|mmanager
-portal_admin|Portal Admin|Portal|Admin|||e|mmanager
-
-# ONAP App IDs
-aaf|AAF Application|AAF|Application|||a|aaf_admin
-aaf-sms|AAF SMS Application|AAF SMS|Application|||a|aaf_admin
-clamp|ONAP CLAMP Application|CLAMP|Application|||a|aaf_admin
-aai|ONAP AAI Application|AAI|ONAP Application|||a|aaf_admin
-appc|ONAP APPC Application|APPC|ONAP Application|||a|aaf_admin
-dcae|ONAP DCAE Application|CLAMP|ONAP Application|||a|aaf_admin
-oof|ONAP OOF Application|OOF|ONAP Application|||a|aaf_admin
-so|ONAP SO Application|SO|ONAP Application|||a|aaf_admin
-sdc|ONAP SDC Application|SDC|ONAP Application|||a|aaf_admin
-sdnc|ONAP SDNC Application|SDNC|ONAP Application|||a|aaf_admin
-vid|ONAP VID Application|VID|ONAP Application|||a|aaf_admin
-vnc|ONAP VNC Application|VNC|ONAP Application|||a|aaf_admin
-policy|ONAP Policy Application|POLICY|ONAP Application|||a|aaf_admin
-portal|ONAP Portal Application|PORTAL|ONAP Application|||a|aaf_admin
-
-# 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-mr|ONAP DMaap MR Application|DMaap MR|ONAP Application|||a|aaf_admin
-dmaap-dr-prov|ONAP DMaap DR Prov|Prov|DMaap MR|||a|aaf_admin
-dmaap-dr-node|ONAP DMaap DR Node|Node|DMaap MR|||a|aaf_admin
diff --git a/auth/sample/data/pull.sh b/auth/sample/data/pull.sh
new file mode 100644
index 00000000..3337a331
--- /dev/null
+++ b/auth/sample/data/pull.sh
@@ -0,0 +1 @@
+docker cp aaf_service:/opt/app/osaaf/data/identities.dat .
diff --git a/auth/sample/data/push.sh b/auth/sample/data/push.sh
new file mode 100644
index 00000000..3f30d5e9
--- /dev/null
+++ b/auth/sample/data/push.sh
@@ -0,0 +1 @@
+docker cp identities.dat aaf_service:/opt/app/osaaf/data
diff --git a/auth/sample/data/sample.identities.dat b/auth/sample/data/sample.identities.dat
index 1cd5eb51..e41bb25c 100644
--- a/auth/sample/data/sample.identities.dat
+++ b/auth/sample/data/sample.identities.dat
@@ -25,17 +25,22 @@ mmarket|Mary D. Marketer|Mary|Marketer|314-123-1236|mary.d.marketer@people.osaaf
 ccontra|Clarice D. Contractor|Clarice|Contractor|314-123-1237|clarice.d.contractor@people.osaaf.com|c|mmanager
 iretired|Ira Lee M. Retired|Ira|Retired|314-123-1238|clarice.d.contractor@people.osaaf.com|n|mmanager
 
-# ONAP default Users
-demo|PORTAL DEMO|PORTAL|DEMO|||e|aaf_admin
-jh0003|PORTAL ADMIN|PORTAL|ADMIN|||e|aaf_admin
-cs0008|PORTAL DESIGNER|PORTAL|DESIGNER|||e|aaf_admin
-jm0007|PORTAL TESTER|PORTAL|TESTER|||e|aaf_admin
-op0001|PORTAL OPS|PORTAL|OPS|||e|aaf_admin
-gv0001|PORTAL GOVERNOR|PORTAL|GOVERNOR|||e|aaf_admin
+# Portal Identities
+portal|ONAP Portal Application|PORTAL|ONAP Application|||a|aaf_admin
+shi|ONAP SHI Portal Identity|shi|Portal Application|||a|aaf_admin
+demo|PORTAL DEMO|demo|PORTAL|DEMO|||e|aaf_admin
+jh0003|PORTAL ADMIN|jh|PORTAL ADMIN|||e|aaf_admin
+cs0008|PORTAL DESIGNER|cs|PORTAL DESIGNER|||e|aaf_admin
+jm0007|PORTAL TESTER|jm|PORTAL TESTER|||e|aaf_admin
+op0001|PORTAL OPS|op|PORTAL OPS|||e|aaf_admin
+gv0001|GV PORTAL|gv|PORTAL|||e|aaf_admin
+pm0001|PM PORTAL|pm|PORTAL|||e|aaf_admin
+gs0001|GS PORTAL|gs|PORTAL|||e|aaf_admin
+ps0001|PS PORTAL|ps|PORTAL|||e|aaf_admin
 
 # AAF Defined Users
 aaf_admin|AAF Administrator|Mr AAF|AAF Admin|||e|mmanager
-deploy|Deployer|Deployer|Depoyer|||e|aaf_admin
+deployer|Deployer|Deployer|Depoyer|||e|aaf_admin
 
 # Requested Users
 portal_admin|Portal Admin|Portal|Admin|||e|mmanager
@@ -51,15 +56,20 @@ oof|ONAP OOF Application|OOF|ONAP Application|||a|aaf_admin
 so|ONAP SO Application|SO|ONAP Application|||a|aaf_admin
 sdc|ONAP SDC Application|SDC|ONAP Application|||a|aaf_admin
 sdnc|ONAP SDNC Application|SDNC|ONAP Application|||a|aaf_admin
-vid|ONAP VID Application|VID|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
-portal|ONAP Portal Application|PORTAL|ONAP Application|||a|aaf_admin
+
+# VID Identities
+vid|ONAP VID Application|VID|ONAP Application|||a|aaf_admin
+vid1|ONAP VID Application 1|VID 1|ONAP Application|||a|aaf_admin
+vid2|ONAP VID Application 2|VID 2|ONAP Application|||a|aaf_admin
 
 # 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-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
 dmaap-dr-node|ONAP DMaap DR Node|Node|DMaap MR|||a|aaf_admin
+