1 files changed, 53 insertions, 42 deletions

diff --git a/auth/sample/cass_data/perm.dat b/auth/sample/cass_data/perm.dat
index 71cfa5a6..90df5178 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|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.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_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.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|*||"{'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.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|*|*|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.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_tab|*|Sample Tab Menu|"{'org.onap.portal|Standard_User
 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'}