From c8f8273a200559f87b883767758e4bda446dadfe Mon Sep 17 00:00:00 2001 From: Instrumental Date: Sat, 19 May 2018 14:51:40 -0500 Subject: [PATCH] Adjust temp_identity Issue-ID: AAF-294 Change-Id: I8f8dbe1164c6ec492e35e13ec2ed088624f62244 Signed-off-by: Instrumental --- auth/auth-cass/src/main/cql/osaaf.cql | 11 ----------- auth/auth-cass/src/main/cql/temp_identity.cql | 8 ++++++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/auth/auth-cass/src/main/cql/osaaf.cql b/auth/auth-cass/src/main/cql/osaaf.cql index e7385ab6..67107cb0 100644 --- a/auth/auth-cass/src/main/cql/osaaf.cql +++ b/auth/auth-cass/src/main/cql/osaaf.cql @@ -16,13 +16,6 @@ INSERT INTO perm(ns, type, instance, action, roles, description) INSERT INTO perm(ns, type, instance, action, roles, description) VALUES ('org','access','*','*',{'org.admin'},'Org Write Access'); -// Create Root pass -INSERT INTO cred (id,ns,type,cred,expires) - VALUES ('initial@osaaf.org','org.osaaf',1,0x008c5926ca861023c1d2a36653fd88e2,'2099-12-31') using TTL 14400; - -INSERT INTO user_role(user,role,expires,ns,rname) - VALUES ('initial@osaaf.org','org.admin','2099-12-31','org','admin') using TTL 14400; - // Create org.osaaf INSERT INTO ns (name,description,parent,scope,type) @@ -56,10 +49,6 @@ INSERT INTO perm(ns, type, instance, action, roles, description) INSERT INTO role(ns, name, perms, description) VALUES('org.osaaf.aaf','owner',{'org.osaaf.aaf.access|*|read,approve'},'AAF Owners'); -INSERT INTO user_role(user,role,expires,ns,rname) - VALUES ('initial@osaaf.org','org.osaaf.aaf.admin','2099-12-31','org.osaaf.aaf','admin') using TTL 14400; - - // ONAP Specific Entities // ONAP initial env Namespace INSERT INTO ns (name,description,parent,scope,type) diff --git a/auth/auth-cass/src/main/cql/temp_identity.cql b/auth/auth-cass/src/main/cql/temp_identity.cql index ba6e7828..7ca31203 100644 --- a/auth/auth-cass/src/main/cql/temp_identity.cql +++ b/auth/auth-cass/src/main/cql/temp_identity.cql @@ -1,8 +1,12 @@ USE authz; +// Create Root pass +INSERT INTO cred (id,ns,type,cred,expires) + VALUES ('initial@osaaf.org','org.osaaf',1,0xdd82c1882969461de74b46427961ea2c,'2099-12-31') using TTL 14400; INSERT INTO user_role(user,role,expires,ns,rname) - VALUES ('jonathan@people.osaaf.org','org.admin','2099-12-31','org','admin') ; + VALUES ('initial@osaaf.org','org.admin','2099-12-31','org','admin') using TTL 14400; INSERT INTO user_role(user,role,expires,ns,rname) - VALUES ('jonathan@people.osaaf.org','org.osaaf.aaf.admin','2099-12-31','org.osaaf.aaf','admin') ; + VALUES ('initial@osaaf.org','org.osaaf.aaf.admin','2099-12-31','org.osaaf.aaf','admin') using TTL 14400; + -- 2.16.6