Add deploy plugin to cadi shiro,oauth

Also add docker-compose file for csit jobs.

Issue-ID: AAF-199
Change-Id: I454eb1d602677126283502658c356ff4411dcb6e
Signed-off-by: Sai Gandham <sg481n@att.com>

diff --git a/auth/auth-service/src/main/resources/docker-compose/.gitignore b/auth/auth-service/src/main/resources/docker-compose/.gitignore
deleted file mode 100644 (file)
index fc7349f..0000000
--- a/auth/auth-service/src/main/resources/docker-compose/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/docker-compose.yml
-/startupaaf.sh

diff --git a/auth/auth-service/src/main/resources/docker-compose/data/ecomp.cql b/auth/auth-service/src/main/resources/docker-compose/data/ecomp.cql
index 6fddf65..c479839 100644 (file)
--- a/auth/auth-service/src/main/resources/docker-compose/data/ecomp.cql
+++ b/auth/auth-service/src/main/resources/docker-compose/data/ecomp.cql
@@ -4,6 +4,21 @@ USE authz;
 INSERT INTO cred (id,ns,type,cred,expires)
   VALUES ('dgl@openecomp.org','org.openecomp',1,0xab3831f27b39d7a039f9a92aa2bbfe51,'2020-12-31');
 
+INSERT INTO cred (id,ns,type,cred,expires)
+  VALUES ('ryan@appc.onap.org','org.onap.appc',1,0x9fb680a2292b51d5dc40335cabfa1a9a,'2020-12-31');
+
+INSERT INTO cred (id,ns,type,cred,expires)
+  VALUES ('sai@onap.org','org.onap.appc',1,0x9fb680a2292b51d5dc40335cabfa1a9a,'2020-12-31');
+
+INSERT INTO cred (id,ns,type,cred,expires)
+  VALUES ('shi@portal.onap.org','org.onap.portal',1,0xab3831f27b39d7a039f9a92aa2bbfe51,'2020-12-31');
+
+INSERT INTO cred (id,ns,type,cred,expires)
+  VALUES ('admin@portal.onap.org','org.onap.portal',1,0x37c77980eee6a7d47050d199f7191ba9,'2020-12-31');
+
+INSERT INTO cred (id,ns,type,cred,expires)
+  VALUES ('clamp@clamp.onap.org','org.onap.clamp',1,0xe18977785f423b7c3e5d1f283fce4e2e,'2020-12-31');
+
 INSERT INTO cred (id,ns,type,cred,expires)
   VALUES ('m99751@dmaapBC.openecomp.org','org.openecomp.dmaapBC',1,0xab3831f27b39d7a039f9a92aa2bbfe51,'2020-12-31');
 
@@ -21,10 +36,10 @@ INSERT INTO role(ns, name, perms, description)
 INSERT INTO role(ns, name, perms, description)
   VALUES('com','owner',{'com.access|*|read'},'Com Owners');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('com','access','*','read',{'com.owner'},'Com Read Access');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('com','access','*','*',{'com.admin'},'Com Write Access');
 
 INSERT INTO user_role(user,role,expires,ns,rname)
@@ -49,10 +64,10 @@ INSERT INTO role(ns, name, perms, description)
 INSERT INTO role(ns, name, perms, description)
   VALUES('org','owner',{'org.access|*|read'},'Com Owners');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('org','access','*','read',{'org.owner'},'Com Read Access');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('org','access','*','*',{'org.admin'},'Com Write Access');
 
 INSERT INTO user_role(user,role,expires,ns,rname)
@@ -73,10 +88,10 @@ INSERT INTO role(ns, name, perms,description)
 INSERT INTO role(ns, name, perms,description)
   VALUES('com.att','owner',{'com.att.access|*|read'},'AT&T Owners');
 
-INSERT INTO perm(ns, type, instance, action, roles,description) 
+INSERT INTO perm(ns, type, instance, action, roles,description)
   VALUES ('com.att','access','*','read',{'com.att.owner'},'AT&T Read Access');
 
-INSERT INTO perm(ns, type, instance, action, roles,description) 
+INSERT INTO perm(ns, type, instance, action, roles,description)
   VALUES ('com.att','access','*','*',{'com.att.admin'},'AT&T Write Access');
 
 INSERT INTO user_role(user,role,expires,ns,rname)
@@ -96,17 +111,17 @@ INSERT INTO role(ns, name, perms, description)
 INSERT INTO role(ns, name, perms, description)
   VALUES('com.att.aaf','owner',{'com.att.aaf.access|*|read'},'AAF Owners');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('com.att.aaf','access','*','read',{'com.att.aaf.owner'},'AAF Read Access');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('com.att.aaf','access','*','*',{'com.att.aaf.admin'},'AAF Write Access');
 
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('dgl@openecomp.org','com.att.aaf.admin','2020-12-31','com.att.aaf','admin');
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('dgl@openecomp.org','com.att.aaf.owner','2020-12-31','com.att.aaf','owner');
-  
+
 
 // Create org.openecomp
 INSERT INTO ns (name,scope,description,parent,type)
@@ -118,52 +133,74 @@ INSERT INTO role(ns, name, perms, description)
 INSERT INTO role(ns, name, perms, description)
   VALUES('org.openecomp','owner',{'org.openecomp.access|*|read'},'OpenEcomp Owners');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('org.openecomp','access','*','read',{'org.openecomp.owner'},'OpenEcomp Read Access');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('org.openecomp','access','*','*',{'org.openecomp.admin'},'OpenEcomp Write Access');
 
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('dgl@openecomp.org','org.openecomp.admin','2020-12-31','org.openecomp','admin');
 
-// Create org.openecomp.dmaapBC
 
+
+
+// Create org.onap
 INSERT INTO ns (name,scope,description,parent,type)
-  VALUES('org.openecomp.dmaapBC',3,'Application Authorization Framework','org.openecomp',3);
+  VALUES('org.onap',2,'Open ONAP NS','com.att',2);
 
-//INSERT INTO role(ns, name, perms, description)
-//  VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*'},'AAF Admins');
+INSERT INTO role(ns, name, perms, description)
+  VALUES('org.onap','admin',{'org.onap.access|*|*'},'onap Admins');
 
-INSERT INTO role(ns, name, perms, description) 
-VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*','org.openecomp.dmaapBC.topicFactory|:org.openecomp.dmaapBC.topic:org.openecomp.dmaapBC|create','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|sub','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|pub'},'AAF Admins');
+INSERT INTO role(ns, name, perms, description)
+  VALUES('org.onap','owner',{'org.onap.access|*|read'},'onap Owners');
 
-//INSERT INTO role(ns, name, perms, description) 
-//VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|sub'},'AAF Admins');
+INSERT INTO perm(ns, type, instance, action, roles, description)
+  VALUES ('org.onap','access','*','read',{'org.onap.owner'},'onap Read Access');
 
-//INSERT INTO role(ns, name, perms, description) 
-//VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|pub'},'AAF Admins');
+INSERT INTO perm(ns, type, instance, action, roles, description)
+  VALUES ('org.onap','access','*','*',{'org.onap.admin'},'onap Write Access');
 
+INSERT INTO user_role(user,role,expires,ns,rname)
+  VALUES ('dgl@openecomp.org','org.onap.admin','2020-12-31','org.onap','admin');
+  
+INSERT INTO user_role(user,role,expires,ns,rname)
+  VALUES ('dgl@openecomp.org','org.onap.owner','2020-12-31','org.onap','admin');
+
+
+// Create org.openecomp.dmaapBC
+
+INSERT INTO ns (name,scope,description,parent,type)
+  VALUES('org.openecomp.dmaapBC',3,'Application Authorization Framework','org.openecomp',3);
+
+
+INSERT INTO role(ns, name, perms, description)
+  VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*','org.openecomp.dmaapBC.topicFactory|:org.openecomp.dmaapBC.topic:org.openecomp.dmaapBC|create','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|sub','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|pub'},'AAF Admins');
 
 
 INSERT INTO role(ns, name, perms, description)
   VALUES('org.openecomp.dmaapBC','owner',{'org.openecomp.dmaapBC.access|*|read'},'AAF Owners');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('org.openecomp.dmaapBC','access','*','read',{'org.openecomp.dmaapBC.owner'},'AAF Read Access');
 
-INSERT INTO perm(ns, type, instance, action, roles, description) 
+INSERT INTO perm(ns, type, instance, action, roles, description)
   VALUES ('org.openecomp.dmaapBC','access','*','*',{'org.openecomp.dmaapBC.admin'},'AAF Write Access');
 
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('dgl@openecomp.org','org.openecomp.dmaapBC.admin','2020-12-31','org.openecomp.dmaapBC','admin');
+  
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('dgl@openecomp.org','org.openecomp.dmaapBC.owner','2020-12-31','org.openecomp.dmaapBC','owner');
+  
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('m99751@dmaapBC.openecomp.org','org.openecomp.dmaapBC.admin','2020-12-31','org.openecomp.dmaapBC','admin');
+  
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('m99751@dmaapBC.openecomp.org','org.openecomp.dmaapBC.owner','2020-12-31','org.openecomp.dmaapBC','owner');
+  
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('m99501@dmaapBC.openecomp.org','org.openecomp.dmaapBC.admin','2020-12-31','org.openecomp.dmaapBC','admin');
+  
 INSERT INTO user_role(user,role,expires,ns,rname)
   VALUES ('m99501@dmaapBC.openecomp.org','org.openecomp.dmaapBC.owner','2020-12-31','org.openecomp.dmaapBC','owner');

diff --git a/auth/auth-service/src/main/resources/docker-compose/data/ecomp.txt b/auth/auth-service/src/main/resources/docker-compose/data/ecomp.txt
new file mode 100644 (file)
index 0000000..bf1bc3c
--- /dev/null
+++ b/auth/auth-service/src/main/resources/docker-compose/data/ecomp.txt
@@ -0,0 +1,302 @@
+USE authz;\r
+\r
+// Create Root pass\r
+INSERT INTO cred (id,ns,type,cred,expires)\r
+  VALUES ('dgl@openecomp.org','org.openecomp',1,0xab3831f27b39d7a039f9a92aa2bbfe51,'2020-12-31');\r
+\r
+INSERT INTO cred (id,ns,type,cred,expires)\r
+  VALUES ('ryan@appc.onap.org','org.onap.appc',1,0x9fb680a2292b51d5dc40335cabfa1a9a,'2020-12-31');\r
+\r
+INSERT INTO cred (id,ns,type,cred,expires)\r
+  VALUES ('sai@onap.org','org.onap.appc',1,0x9fb680a2292b51d5dc40335cabfa1a9a,'2020-12-31');\r
+\r
+INSERT INTO cred (id,ns,type,cred,expires)\r
+  VALUES ('shi@portal.onap.org','org.onap.portal',1,0xab3831f27b39d7a039f9a92aa2bbfe51,'2020-12-31');\r
+\r
+INSERT INTO cred (id,ns,type,cred,expires)\r
+  VALUES ('admin@portal.onap.org','org.onap.portal',1,0x37c77980eee6a7d47050d199f7191ba9,'2020-12-31');\r
+\r
+INSERT INTO cred (id,ns,type,cred,expires)\r
+  VALUES ('m99751@dmaapBC.openecomp.org','org.openecomp.dmaapBC',1,0xab3831f27b39d7a039f9a92aa2bbfe51,'2020-12-31');\r
+\r
+INSERT INTO cred (id,ns,type,cred,expires)\r
+  VALUES ('m99501@dmaapBC.openecomp.org','org.openecomp.dmaapBC',1,0xab3831f27b39d7a039f9a92aa2bbfe51,'2020-12-31');\r
+\r
+\r
+// Create 'com' root NS\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('com',1,'Root Namespace',null,1);\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('com','admin',{'com.access|*|*'},'Com Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('com','owner',{'com.access|*|read'},'Com Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('com','access','*','read',{'com.owner'},'Com Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('com','access','*','*',{'com.admin'},'Com Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','com.owner','2020-12-31','com','owner');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','com.admin','2020-12-31','com','admin');\r
+\r
+// Create org root NS\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org',1,'Root Namespace Org',null,1);\r
+\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org.openecomp.dcae',3,'DCAE Namespace Org','org.openecomp',3);\r
+\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org.openecomp.dmaapBC',3,'DMaaP BC Namespace Org','org.openecomp',3);\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org','admin',{'org.access|*|*'},'Com Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org','owner',{'org.access|*|read'},'Com Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org','access','*','read',{'org.owner'},'Com Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org','access','*','*',{'org.admin'},'Com Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.owner','2020-12-31','org','owner');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.admin','2020-12-31','org','admin');\r
+\r
+\r
+// Create com.att\r
+\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('com.att',2,'AT&T Namespace','com',2);\r
+\r
+INSERT INTO role(ns, name, perms,description)\r
+  VALUES('com.att','admin',{'com.att.access|*|*'},'AT&T Admins');\r
+\r
+INSERT INTO role(ns, name, perms,description)\r
+  VALUES('com.att','owner',{'com.att.access|*|read'},'AT&T Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles,description)\r
+  VALUES ('com.att','access','*','read',{'com.att.owner'},'AT&T Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles,description)\r
+  VALUES ('com.att','access','*','*',{'com.att.admin'},'AT&T Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','com.att.owner','2020-12-31','com.att','owner');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','com.att.admin','2020-12-31','com.att','admin');\r
+\r
+// Create com.att.aaf\r
+\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('com.att.aaf',3,'Application Authorization Framework','com.att',3);\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('com.att.aaf','admin',{'com.att.aaf.access|*|*'},'AAF Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('com.att.aaf','owner',{'com.att.aaf.access|*|read'},'AAF Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('com.att.aaf','access','*','read',{'com.att.aaf.owner'},'AAF Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('com.att.aaf','access','*','*',{'com.att.aaf.admin'},'AAF Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','com.att.aaf.admin','2020-12-31','com.att.aaf','admin');\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','com.att.aaf.owner','2020-12-31','com.att.aaf','owner');\r
+\r
+\r
+// Create org.openecomp\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org.openecomp',2,'Open EComp NS','com.att',2);\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.openecomp','admin',{'org.openecomp.access|*|*'},'OpenEcomp Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.openecomp','owner',{'org.openecomp.access|*|read'},'OpenEcomp Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.openecomp','access','*','read',{'org.openecomp.owner'},'OpenEcomp Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.openecomp','access','*','*',{'org.openecomp.admin'},'OpenEcomp Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.openecomp.admin','2020-12-31','org.openecomp','admin');\r
+\r
+\r
+\r
+\r
+// Create org.onap\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org.onap',2,'Onap NS','com.att',2);\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap','admin',{'org.onap.access|*|*'},'Onap Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap','owner',{'org.onap.access|*|read'},'onap Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.onap','access','*','read',{'org.onap.owner'},'Onap Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.onap','access','*','*',{'org.onap.admin'},'Onap Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.onap.admin','2020-12-31','org.onap','admin');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('sai@onap.org','org.onap.admin','2020-12-31','org.onap','admin');\r
+\r
+\r
+\r
+// Create org.onap.appc\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org.onap.appc',2,'Onap NS','com.att',2);\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.appc','admin',{'org.onap.appc.access|*|*'},'OnapAPPC  Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.appc','owner',{'org.onap.appc.access|*|read'},'onap APPC Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.onap.appc','access','*','read',{'org.onap.appc.owner'},'Onap Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.onap.appc','access','*','*',{'org.onap.appc.admin'},'Onap Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.onap.appc.admin','2020-12-31','org.onap.appc','admin');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('sai@onap.org','org.onap.appc.admin','2020-12-31','org.onap.appc','admin');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('ryan@appc.onap.org','org.onap.appc.admin','2020-12-31','org.onap.appc','admin');\r
+\r
+\r
+\r
+// Create org.onap.portal\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org.onap.portal',2,'Onap NS','com.att',2);\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.portal','admin',{'org.onap.portal.access|*|*'},'Onap Portal  Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.portal','owner',{'org.onap.portal.access|*|read'},'onap Portal Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.onap.portal','access','*','read',{'org.onap.portal.owner'},'Onap Portal Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.onap.portal','access','*','*',{'org.onap.portal.admin'},'Onap Portal  Write Access');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.portal','System_Administrator',{'org.onap.portal.access|*|*'},\r
+  '{\"id\":\"1\",\"name\":\"System Administrator\",\"active\":\"true\",\"priority\":\"1\",\"appId\":\"NULL\",\"appRoleId\":\"NULL\"},'System Administrator');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.portal','Standard_User',{'org.onap.portal.access|*|*'},\r
+  '{\"id\":\"16\",\"name\":\"Standard User\",\"active\":\"true\",\"priority\":\"5\",\"appId\":\"NULL\",\"appRoleId\":\"NULL\"},'Standard User');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.portal','Restricted_App_Role',{'org.onap.portal.access|*|*'},\r
+  '{\"id\":\"900\",\"name\":\"Restricted App Role\",\"active\":\"true\",\"priority\":\"1\",\"appId\":\"NULL\",\"appRoleId\":\"NULL\"},'Restricted App Role');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.portal','Portal_Notification_Admin',{'org.onap.portal.access|*|*'},\r
+  '{\"id\":\"950\",\"name\":\"Portal Notification Admin\",\"active\":\"true\",\"priority\":\"1\",\"appId\":\"NULL\",\"appRoleId\":\"NULL\"},'Portal Notification Admin');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.onap.portal','Account_Administrator',{'org.onap.portal.access|*|*'},\r
+  '{\"id\":\"999\",\"name\":\"Account Administrator\",\"active\":\"true\",\"priority\":\"1\",\"appId\":\"NULL\",\"appRoleId\":\"NULL\"},'Account Administrator');\r
+\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.onap.portal.admin','2020-12-31','org.onap.portal','admin');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('admin@portal.onap.org','org.onap.portal.admin','2020-12-31','org.onap.portal','admin');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('shi@portal.onap.org','org.onap.portal.admin','2020-12-31','org.onap.portal','admin');\r
+\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('admin@portal.onap.org','org.onap.portal.admin','2020-12-31','org.onap.portal','System_Administrator');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('admin@portal.onap.org','org.onap.portal.admin','2020-12-31','org.onap.portal','Standard_User');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('admin@portal.onap.org','org.onap.portal.admin','2020-12-31','org.onap.portal','Restricted_App_Role');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('admin@portal.onap.org','org.onap.portal.admin','2020-12-31','org.onap.portal','Portal_Notification_Admin');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('admin@portal.onap.org','org.onap.portal.admin','2020-12-31','org.onap.portal','Account_Administrator');\r
+\r
+\r
+\r
+\r
+\r
+\r
+// Create org.openecomp.dmaapBC\r
+\r
+INSERT INTO ns (name,scope,description,parent,type)\r
+  VALUES('org.openecomp.dmaapBC',3,'Application Authorization Framework','org.openecomp',3);\r
+\r
+//INSERT INTO role(ns, name, perms, description)\r
+//  VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*'},'AAF Admins');\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*','org.openecomp.dmaapBC.topicFactory|:org.openecomp.dmaapBC.topic:org.openecomp.dmaapBC|create','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|sub','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|pub'},'AAF Admins');\r
+\r
+//INSERT INTO role(ns, name, perms, description)\r
+//VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|sub'},'AAF Admins');\r
+\r
+//INSERT INTO role(ns, name, perms, description)\r
+//VALUES('org.openecomp.dmaapBC','admin',{'org.openecomp.dmaapBC.access|*|*','org.openecomp.dmaapBC.mr.topic|:topic.org.openecomp.dmaapBC.newtopic|pub'},'AAF Admins');\r
+\r
+\r
+\r
+INSERT INTO role(ns, name, perms, description)\r
+  VALUES('org.openecomp.dmaapBC','owner',{'org.openecomp.dmaapBC.access|*|read'},'AAF Owners');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.openecomp.dmaapBC','access','*','read',{'org.openecomp.dmaapBC.owner'},'AAF Read Access');\r
+\r
+INSERT INTO perm(ns, type, instance, action, roles, description)\r
+  VALUES ('org.openecomp.dmaapBC','access','*','*',{'org.openecomp.dmaapBC.admin'},'AAF Write Access');\r
+\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.openecomp.dmaapBC.admin','2020-12-31','org.openecomp.dmaapBC','admin');\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('dgl@openecomp.org','org.openecomp.dmaapBC.owner','2020-12-31','org.openecomp.dmaapBC','owner');\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('m99751@dmaapBC.openecomp.org','org.openecomp.dmaapBC.admin','2020-12-31','org.openecomp.dmaapBC','admin');\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('m99751@dmaapBC.openecomp.org','org.openecomp.dmaapBC.owner','2020-12-31','org.openecomp.dmaapBC','owner');\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('m99501@dmaapBC.openecomp.org','org.openecomp.dmaapBC.admin','2020-12-31','org.openecomp.dmaapBC','admin');\r
+INSERT INTO user_role(user,role,expires,ns,rname)\r
+  VALUES ('m99501@dmaapBC.openecomp.org','org.openecomp.dmaapBC.owner','2020-12-31','org.openecomp.dmaapBC','owner');\r

diff --git a/auth/auth-service/src/main/resources/docker-compose/docker-compose.yml b/auth/auth-service/src/main/resources/docker-compose/docker-compose.yml
new file mode 100644 (file)
index 0000000..501bb30
--- /dev/null
+++ b/auth/auth-service/src/main/resources/docker-compose/docker-compose.yml
@@ -0,0 +1,57 @@
+#-------------------------------------------------------------------------------\r
+# ============LICENSE_START====================================================\r
+# * org.onap.aaf\r
+# * ===========================================================================\r
+# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+# * ===========================================================================\r
+# * Licensed under the Apache License, Version 2.0 (the "License");\r
+# * you may not use this file except in compliance with the License.\r
+# * You may obtain a copy of the License at\r
+# * \r
+#  *      http://www.apache.org/licenses/LICENSE-2.0\r
+# * \r
+#  * Unless required by applicable law or agreed to in writing, software\r
+# * distributed under the License is distributed on an "AS IS" BASIS,\r
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+# * See the License for the specific language governing permissions and\r
+# * limitations under the License.\r
+# * ============LICENSE_END====================================================\r
+# *\r
+# *\r
+#-------------------------------------------------------------------------------\r
+version: '2'\r
+services:\r
+  aaf_container:\r
+    image: onap/aaf/authz-service:1.0.1-SNAPSHOT\r
+    ports:\r
+      - "8101:8101"\r
+\r
+    links:\r
+      - cassandra_container\r
+    volumes:\r
+    # - ./authAPI.props:/opt/app/aaf/authz-service/2.0.15/etc/authAPI.props\r
+      - ./wait_for_host_port.sh:/tmp/wait_for_host_port.sh\r
+      - ./data2:/data\r
+    # - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh\r
+    #  - ./com.osaaf.common.props:/opt/app/aaf/authz-service/2.0.15/etc/com.osaaf.common.props\r
+    # - ./cadi-core-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-1.3.0.jar\r
+    #  - ./cadi-aaf-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-1.3.0.jar\r
+    # - ./cadi-client-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-client-1.3.0.jar\r
+    # - ./authz-service-2.0.15.jar:/opt/app/aaf/authz-service/2.0.15/lib/authz-service-2.0.15.jar\r
+    #  - ./dme2-3.1.200.jar:/opt/app/aaf/authz-service/2.0.15/lib/dme2-3.1.200.jar\r
+    entrypoint: ["bash", "-c", "/tmp/wait_for_host_port.sh cassandra_container 9042; sleep 20; /bin/sh -c ./startup.sh"]\r
+    environment:\r
+      - CASSANDRA_CLUSTER=cassandra_container\r
+    \r
+\r
+  cassandra_container:\r
+    image: cassandra:2.1.16\r
+    ports:\r
+      - "7000:7000"\r
+      - "7001:7001"\r
+      - "9042:9042"\r
+      - "9160:9160"\r
+    volumes:\r
+      - ./data:/data\r
+      - ./wait_for_host_port.sh:/tmp/wait_for_host_port.sh\r
+    entrypoint: ["bash", "-c", "(/tmp/wait_for_host_port.sh localhost 9042 cqlsh --file /data/init.cql -u cassandra -p cassandra localhost; cqlsh --file /data/ecomp.cql -u cassandra -p cassandra localhost) & (/docker-entrypoint.sh cassandra -f)"]\r

diff --git a/auth/auth-service/src/main/resources/docker-compose/startupaaf.sh b/auth/auth-service/src/main/resources/docker-compose/startupaaf.sh
new file mode 100644 (file)
index 0000000..b45bba5
--- /dev/null
+++ b/auth/auth-service/src/main/resources/docker-compose/startupaaf.sh
@@ -0,0 +1,34 @@
+# lji: this startup file shadows the existing extry point startup.sh file of the container
+# because we need to pass in the cassandra cluster location 
+
+LIB=/opt/app/aaf/authz-service/lib
+
+ETC=/opt/app/aaf/authz-service/etc
+DME2REG=/opt/dme2reg
+
+echo "this is LIB" $LIB
+echo "this is ETC" $ETC
+echo "this is DME2REG" $DME2REG
+
+CLASSPATH=$ETC
+for FILE in `find $LIB -name *.jar`; do
+  CLASSPATH=$CLASSPATH:$FILE
+done
+
+FILEPATHS="/opt/app/aaf/authz-service/etc/com.osaaf.common.props /opt/app/aaf/authz-service/etc/com.osaaf.common.props"
+for FILEPATH in $FILEPATHS: 
+do 
+  if [ -e ${FILEPATH} ]; then
+    if [ -z `grep "cassandra.clusters=$CASSANDRA_CLUSTER" $FILEPATH` ]; then 
+      echo "cassandra.clusters=$CASSANDRA_CLUSTER" >> $FILEPATH; 
+    fi
+  fi
+done
+
+
+java -classpath $CLASSPATH -DDME2_EP_REGISTRY_CLASS=DME2FS -DAFT_DME2_EP_REGISTRY_FS_DIR=$DME2REG org.onap.aaf.authz.service.AuthAPI
+
+# keet it running so we can check fs
+while sleep 2; do echo thinking; done
+
+

diff --git a/auth/auth-service/src/main/resources/docker-compose/sysctl.conf b/auth/auth-service/src/main/resources/docker-compose/sysctl.conf
new file mode 100644 (file)
index 0000000..c36fd68
--- /dev/null
+++ b/auth/auth-service/src/main/resources/docker-compose/sysctl.conf
@@ -0,0 +1,3 @@
+net.ipv6.conf.all.disable_ipv6=1
+net.ipv6.conf.default.disable_ipv6=1
+net.ipv6.conf.lol.disable_ipv6=1

diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index df841a1..b89b3fe 100644 (file)
--- a/cadi/oauth-enduser/pom.xml
+++ b/cadi/oauth-enduser/pom.xml
@@ -184,6 +184,15 @@
                     </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-deploy-plugin</artifactId>
+                                       <version>2.8.1</version>
+                                       <configuration>
+                                               <skip>true</skip>
+                                       </configuration>
+       
+                               </plugin>
                        </plugins>
                </pluginManagement>
        </build>

diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index 5dc86b2..69f2c74 100644 (file)
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -161,6 +161,15 @@
                     </execution>
                                </executions>
                        </plugin>
+                       <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-deploy-plugin</artifactId>
+                                       <version>2.8.1</version>
+                                       <configuration>
+                                               <skip>true</skip>
+                                       </configuration>
+       
+                               </plugin>
                </plugins>
                
        </build>