}
}
+ public static void clear() {
+ byApprover.clear();
+ byUser.clear();
+ byTicket.clear();
+ list.clear();
+ cache.resetLocalData();
+ }
// public void update(AuthzTrans trans, ApprovalDAO apprDAO, boolean dryRun) {
// if (dryRun) {
// trans.info().printf("Would update Approval %s, %s, last_notified %s",add.id,add.status,add.last_notified);
}
return reason;
}
+
+
+ public static void clear() {
+ data.clear();
+ byNS.clear();
+ }
}
\ No newline at end of file
deleteRoles.clear();
}
+ public static void clear() {
+ data.clear();
+ keys.clear();
+ byName.clear();
+ deleteRoles.clear();
+ }
+
}
\ No newline at end of file
public static String histSubject(List<String> row) {
return row.get(1) + '|' + row.get(2);
}
+
+ public static void clear() {
+ data.clear();
+ byUser.clear();
+ byRole.clear();
+ cache.resetLocalData();
+
+ }
}
\ No newline at end of file
tt.done();
}
- // Load Cred. We don't follow Visitor, because we have to gather up everything into Identity Anyway
- Cred.load(trans, session);
minOwners=1;
writerList.put(EXTEND,extendCW);
// Load full data of the following
- Approval.load(trans, session, Approval.v2_0_17);
- Role.load(trans, session);
ln = new LastNotified(session);
} finally {
@Override
protected void run(AuthzTrans trans) {
+ TimeTaken tt;
AuthzTrans noAvg = trans.env().newTransNoAvg();
////////////////////
// Load all Notifieds, and either add to local Data, or mark for Deletion.
ln.loadAll(noAvg,expireRange.approveDelete,deleteCW);
- ////////////////////
- final Map<UUID,Ticket> goodTickets = new TreeMap<>();
- TimeTaken tt = trans.start("Analyze Expired Futures",Trans.SUB);
+ // Hold Good Tickets to keyed User/Role for UserRole Step
+ Map<String,Ticket> mur = new TreeMap<>();
+
try {
- Future.load(noAvg, session, Future.withConstruct, fut -> {
- List<Approval> appls = Approval.byTicket.get(fut.id());
- if(!futureRange.inRange(fut.expires())) {
- deleteCW.comment("Future %s expired", fut.id());
- Future.row(deleteCW,fut);
- if(appls!=null) {
- for(Approval a : appls) {
- Approval.row(deleteCW, a);
+ Approval.load(trans, session, Approval.v2_0_17);
+
+ ////////////////////
+ final Map<UUID,Ticket> goodTickets = new TreeMap<>();
+ tt = trans.start("Analyze Expired Futures",Trans.SUB);
+ try {
+ Future.load(noAvg, session, Future.withConstruct, fut -> {
+ List<Approval> appls = Approval.byTicket.get(fut.id());
+ if(!futureRange.inRange(fut.expires())) {
+ deleteCW.comment("Future %s expired", fut.id());
+ Future.row(deleteCW,fut);
+ if(appls!=null) {
+ for(Approval a : appls) {
+ Approval.row(deleteCW, a);
+ }
}
+ } else if(appls==null) { // Orphaned Future (no Approvals)
+ deleteCW.comment("Future is Orphaned");
+ Future.row(deleteCW,fut);
+ } else {
+ goodTickets.put(fut.fdd.id, new Ticket(fut));
+ }
+ });
+ } finally {
+ tt.done();
+ }
+
+ Set<String> approvers = new TreeSet<>();
+ tt = trans.start("Connect Approvals with Futures",Trans.SUB);
+ try {
+ for(Approval appr : Approval.list) {
+ Ticket ticket=null;
+ UUID ticketID = appr.getTicket();
+ if(ticketID!=null) {
+ ticket = goodTickets.get(appr.getTicket());
+ }
+ if(ticket == null) { // Orphaned Approvals, no Futures
+ deleteCW.comment("Approval is Orphaned");
+ Approval.row(deleteCW, appr);
+ } else {
+ ticket.approvals.add(appr); // add to found Ticket
+ approvers.add(appr.getApprover());
}
- } else if(appls==null) { // Orphaned Future (no Approvals)
- deleteCW.comment("Future is Orphaned");
- Future.row(deleteCW,fut);
- } else {
- goodTickets.put(fut.fdd.id, new Ticket(fut));
- }
- });
- } finally {
- tt.done();
- }
-
- Set<String> approvers = new TreeSet<>();
- tt = trans.start("Connect Approvals with Futures",Trans.SUB);
- try {
- for(Approval appr : Approval.list) {
- Ticket ticket=null;
- UUID ticketID = appr.getTicket();
- if(ticketID!=null) {
- ticket = goodTickets.get(appr.getTicket());
- }
- if(ticket == null) { // Orphaned Approvals, no Futures
- deleteCW.comment("Approval is Orphaned");
- Approval.row(deleteCW, appr);
- } else {
- ticket.approvals.add(appr); // add to found Ticket
- approvers.add(appr.getApprover());
}
- }
- } finally {
- tt.done();
- }
-
- /* Run through all Futures, and see if
- * 1) they have been executed (no longer valid)
- * 2) The current Approvals indicate they can proceed
- */
- Map<String,Pending> pendingApprs = new HashMap<>();
- Map<String,Pending> pendingTemp = new HashMap<>();
-
- // Convert Good Tickets to keyed User/Role for UserRole Step
- Map<String,Ticket> mur = new TreeMap<>();
- String approver;
-
- tt = trans.start("Analyze Good Tickets",Trans.SUB);
- try {
- for(Ticket ticket : goodTickets.values()) {
- try {
- pendingTemp.clear();
- switch(ticket.f.target()) {
- case "user_role":
- int state[][] = new int[3][3];
- int type;
-
- for(Approval appr : ticket.approvals) {
- switch(appr.getType()) {
- case "owner":
- type=owner;
- break;
- case "supervisor":
- type=supervisor;
- break;
- default:
- type=0;
+ } finally {
+ tt.done();
+ }
+
+ /* Run through all Futures, and see if
+ * 1) they have been executed (no longer valid)
+ * 2) The current Approvals indicate they can proceed
+ */
+ Map<String,Pending> pendingApprs = new HashMap<>();
+ Map<String,Pending> pendingTemp = new HashMap<>();
+
+ String approver;
+
+ tt = trans.start("Analyze Good Tickets",Trans.SUB);
+ try {
+ for(Ticket ticket : goodTickets.values()) {
+ try {
+ pendingTemp.clear();
+ switch(ticket.f.target()) {
+ case "user_role":
+ int state[][] = new int[3][3];
+ int type;
+
+ for(Approval appr : ticket.approvals) {
+ switch(appr.getType()) {
+ case "owner":
+ type=owner;
+ break;
+ case "supervisor":
+ type=supervisor;
+ break;
+ default:
+ type=0;
+ }
+ ++state[type][total]; // count per type
+ switch(appr.getStatus()) {
+ case "pending":
+ ++state[type][pending];
+ approver = appr.getApprover();
+ Pending n = pendingTemp.get(approver);
+ if(n==null) {
+ Date lastNotified = ln.lastNotified(approver,"ur",ticket.f.fdd.target_key);
+ pendingTemp.put(approver,new Pending(lastNotified));
+ } else {
+ n.inc();
+ }
+ break;
+ case "approved":
+ ++state[type][approved];
+ break;
+ default:
+ ++state[type][unknown];
+ }
}
- ++state[type][total]; // count per type
- switch(appr.getStatus()) {
- case "pending":
- ++state[type][pending];
- approver = appr.getApprover();
- Pending n = pendingTemp.get(approver);
- if(n==null) {
- Date lastNotified = ln.lastNotified(approver,"ur",ticket.f.fdd.target_key);
- pendingTemp.put(approver,new Pending(lastNotified));
- } else {
- n.inc();
+
+ // To Approve:
+ // Always must have at least 1 owner
+ if((state[owner][total]>0 && state[owner][approved]>0) &&
+ // If there are no Supervisors, that's ok
+ (state[supervisor][total]==0 ||
+ // But if there is a Supervisor, they must have approved
+ (state[supervisor][approved]>0))) {
+ UserRoleDAO.Data urdd = new UserRoleDAO.Data();
+ try {
+ urdd.reconstitute(ticket.f.fdd.construct);
+ if(urdd.expires.before(ticket.f.expires())) {
+ extendCW.row("extend_ur",urdd.user,urdd.role,ticket.f.expires());
+ }
+ } catch (IOException e) {
+ trans.error().log("Could not reconstitute UserRole");
}
- break;
- case "approved":
- ++state[type][approved];
- break;
- default:
- ++state[type][unknown];
- }
- }
-
- // To Approve:
- // Always must have at least 1 owner
- if((state[owner][total]>0 && state[owner][approved]>0) &&
- // If there are no Supervisors, that's ok
- (state[supervisor][total]==0 ||
- // But if there is a Supervisor, they must have approved
- (state[supervisor][approved]>0))) {
- UserRoleDAO.Data urdd = new UserRoleDAO.Data();
- try {
- urdd.reconstitute(ticket.f.fdd.construct);
- if(urdd.expires.before(ticket.f.expires())) {
- extendCW.row("extend_ur",urdd.user,urdd.role,ticket.f.expires());
+ } else { // Load all the Pending.
+ for(Entry<String, Pending> es : pendingTemp.entrySet()) {
+ Pending p = pendingApprs.get(es.getKey());
+ if(p==null) {
+ pendingApprs.put(es.getKey(), es.getValue());
+ } else {
+ p.inc(es.getValue());
}
- } catch (IOException e) {
- trans.error().log("Could not reconstitute UserRole");
- }
- } else { // Load all the Pending.
- for(Entry<String, Pending> es : pendingTemp.entrySet()) {
- Pending p = pendingApprs.get(es.getKey());
- if(p==null) {
- pendingApprs.put(es.getKey(), es.getValue());
- } else {
- p.inc(es.getValue());
}
}
+ break;
+ }
+ } finally {
+ if("user_role".equals(ticket.f.fdd.target)) {
+ String key = ticket.f.fdd.target_key;
+ if(key!=null) {
+ mur.put(key, ticket);
}
- break;
- }
- } finally {
- if("user_role".equals(ticket.f.fdd.target)) {
- String key = ticket.f.fdd.target_key;
- if(key!=null) {
- mur.put(key, ticket);
}
}
}
+ } finally {
+ tt.done();
}
- } finally {
- tt.done();
- }
-
- // Good Tickets no longer needed
- goodTickets.clear();
-
- /**
- * Decide to Notify about Approvals, based on activity/last Notified
- */
- tt = trans.start("Analyze Approval Reminders", Trans.SUB);
- try {
- GregorianCalendar gc = new GregorianCalendar();
- gc.add(GregorianCalendar.DAY_OF_WEEK, 5);
- Date remind = gc.getTime();
-
- for(Entry<String, Pending> es : pendingApprs.entrySet()) {
- Pending p = es.getValue();
- if(p.newApprovals()
- || p.earliest() == null
- || p.earliest().after(remind)) {
- p.row(needApproveCW,es.getKey());
+ // Good Tickets no longer needed
+ goodTickets.clear();
+
+ /**
+ * Decide to Notify about Approvals, based on activity/last Notified
+ */
+ tt = trans.start("Analyze Approval Reminders", Trans.SUB);
+ try {
+ GregorianCalendar gc = new GregorianCalendar();
+ gc.add(GregorianCalendar.DAY_OF_WEEK, 5);
+ Date remind = gc.getTime();
+
+ for(Entry<String, Pending> es : pendingApprs.entrySet()) {
+ Pending p = es.getValue();
+ if(p.newApprovals()
+ || p.earliest() == null
+ || p.earliest().after(remind)) {
+ p.row(needApproveCW,es.getKey());
+ }
}
+ } finally {
+ tt.done();
}
- } finally {
- tt.done();
- }
-
- // clear out Approval Intermediates
- pendingTemp = null;
- pendingApprs = null;
-
+
+ // clear out Approval Intermediates
+ pendingTemp = null;
+ pendingApprs = null;
+ } finally {
+ Approval.clear();
+ }
+
/**
Run through User Roles.
Owners are treated specially in next section.
Regular roles are checked against Date Ranges. If match Date Range, write out to appropriate file.
- */
- try {
- tt = trans.start("Analyze UserRoles, storing Owners",Trans.SUB);
- Set<String> specialCommented = new HashSet<>();
- Map<String, Set<UserRole>> owners = new TreeMap<>();
- try {
- UserRole.load(noAvg, session, UserRole.v2_0_11, ur -> {
- Identity identity;
- try {
- identity = trans.org().getIdentity(noAvg,ur.user());
- if(identity==null) {
- // Candidate for Delete, but not Users if Special
- String id = ur.user();
- for(String s : specialDomains) {
- if(id.endsWith(s)) {
+ */
+
+ try {
+ Role.load(trans, session);
+
+ try {
+ tt = trans.start("Analyze UserRoles, storing Owners",Trans.SUB);
+ Set<String> specialCommented = new HashSet<>();
+ Map<String, Set<UserRole>> owners = new TreeMap<>();
+ try {
+ UserRole.load(noAvg, session, UserRole.v2_0_11, ur -> {
+ Identity identity;
+ try {
+ identity = trans.org().getIdentity(noAvg,ur.user());
+ if(identity==null) {
+ // Candidate for Delete, but not Users if Special
+ String id = ur.user();
+ for(String s : specialDomains) {
+ if(id.endsWith(s)) {
+ if(!specialCommented.contains(id)) {
+ deleteCW.comment("ID %s is part of special Domain %s (UR Org Check)", id,s);
+ specialCommented.add(id);
+ }
+ return;
+ }
+ }
+ if(specialNames.contains(id)) {
if(!specialCommented.contains(id)) {
- deleteCW.comment("ID %s is part of special Domain %s (UR Org Check)", id,s);
+ deleteCW.comment("ID %s is a special ID (UR Org Check)", id);
specialCommented.add(id);
}
return;
}
- }
- if(specialNames.contains(id)) {
- if(!specialCommented.contains(id)) {
- deleteCW.comment("ID %s is a special ID (UR Org Check)", id);
- specialCommented.add(id);
- }
+ ur.row(deleteCW, UserRole.UR,"Not in Organization");
+ return;
+ } else if(Role.byName.get(ur.role())==null) {
+ ur.row(deleteCW, UserRole.UR,String.format("Role %s does not exist", ur.role()));
return;
}
- ur.row(deleteCW, UserRole.UR,"Not in Organization");
- return;
- } else if(Role.byName.get(ur.role())==null) {
- ur.row(deleteCW, UserRole.UR,String.format("Role %s does not exist", ur.role()));
- return;
- }
- // Just let expired UserRoles sit until deleted
- if(futureRange.inRange(ur.expires())) {
- if(!mur.containsKey(ur.user() + '|' + ur.role())) {
- // Cannot just delete owners, unless there is at least one left. Process later
- if ("owner".equals(ur.rname())) {
- Set<UserRole> urs = owners.get(ur.role());
- if (urs == null) {
- urs = new HashSet<UserRole>();
- owners.put(ur.role(), urs);
- }
- urs.add(ur);
- } else {
- Range r = writeAnalysis(noAvg,ur);
- if(r!=null) {
- Approval existing = findApproval(ur);
- if(existing==null) {
- ur.row(needApproveCW,UserRole.APPROVE_UR);
+ // Just let expired UserRoles sit until deleted
+ if(futureRange.inRange(ur.expires())) {
+ if(!mur.containsKey(ur.user() + '|' + ur.role())) {
+ // Cannot just delete owners, unless there is at least one left. Process later
+ if ("owner".equals(ur.rname())) {
+ Set<UserRole> urs = owners.get(ur.role());
+ if (urs == null) {
+ urs = new HashSet<UserRole>();
+ owners.put(ur.role(), urs);
+ }
+ urs.add(ur);
+ } else {
+ Range r = writeAnalysis(noAvg,ur);
+ if(r!=null) {
+ Approval existing = findApproval(ur);
+ if(existing==null) {
+ ur.row(needApproveCW,UserRole.APPROVE_UR);
+ }
}
}
}
}
+ } catch (OrganizationException e) {
+ noAvg.error().log(e);
}
- } catch (OrganizationException e) {
- noAvg.error().log(e);
- }
- });
- } finally {
- tt.done();
- }
-
- /**
- Now Process Owners, one owner Role at a time, ensuring one is left,
- preferably a good one. If so, process the others as normal.
-
- Otherwise, write to ExpiredOwners Report
- */
- tt = trans.start("Analyze Owners Separately",Trans.SUB);
- try {
- if (!owners.values().isEmpty()) {
- File file = new File(logDir(), EXPIRED_OWNERS + sdate + CSV);
- final CSV ownerCSV = new CSV(env.access(),file);
- CSV.Writer expOwner = ownerCSV.writer();
- expOwner.row(INFO,EXPIRED_OWNERS,sdate,2);
-
- try {
- for (Set<UserRole> sur : owners.values()) {
- int goodOwners = 0;
- for (UserRole ur : sur) {
- if (ur.expires().after(now)) {
- ++goodOwners;
- }
- }
+ });
+ } finally {
+ tt.done();
+ }
+ mur.clear();
+
+ /**
+ Now Process Owners, one owner Role at a time, ensuring one is left,
+ preferably a good one. If so, process the others as normal.
+
+ Otherwise, write to ExpiredOwners Report
+ */
+ tt = trans.start("Analyze Owners Separately",Trans.SUB);
+ try {
+ if (!owners.values().isEmpty()) {
+ File file = new File(logDir(), EXPIRED_OWNERS + sdate + CSV);
+ final CSV ownerCSV = new CSV(env.access(),file);
+ CSV.Writer expOwner = ownerCSV.writer();
+ expOwner.row(INFO,EXPIRED_OWNERS,sdate,2);
- for (UserRole ur : sur) {
- if (goodOwners >= minOwners) {
- Range r = writeAnalysis(noAvg, ur);
- if(r!=null) {
+ try {
+ for (Set<UserRole> sur : owners.values()) {
+ int goodOwners = 0;
+ for (UserRole ur : sur) {
+ if (ur.expires().after(now)) {
+ ++goodOwners;
+ }
+ }
+
+ for (UserRole ur : sur) {
+ if (goodOwners >= minOwners) {
+ Range r = writeAnalysis(noAvg, ur);
+ if(r!=null) {
+ Approval existing = findApproval(ur);
+ if(existing==null) {
+ ur.row(needApproveCW,UserRole.APPROVE_UR);
+ }
+ }
+ } else {
+ expOwner.row("owner",ur.role(), ur.user(), Chrono.dateOnlyStamp(ur.expires()));
Approval existing = findApproval(ur);
if(existing==null) {
ur.row(needApproveCW,UserRole.APPROVE_UR);
}
}
- } else {
- expOwner.row("owner",ur.role(), ur.user(), Chrono.dateOnlyStamp(ur.expires()));
- Approval existing = findApproval(ur);
- if(existing==null) {
- ur.row(needApproveCW,UserRole.APPROVE_UR);
- }
}
}
- }
- } finally {
- if(expOwner!=null) {
- expOwner.close();
+ } finally {
+ if(expOwner!=null) {
+ expOwner.close();
+ }
}
}
- }
- } finally {
- tt.done();
- }
+ } finally {
+ tt.done();
+ }
+ } finally {
+ Role.clear();
+ UserRole.clear();
+ }
/**
* Check for Expired Credentials
- *
- *
*/
- tt = trans.start("Analyze Expired Credentials",Trans.SUB);
try {
- for (Cred cred : Cred.data.values()) {
- List<Instance> linst = cred.instances;
- if(linst!=null) {
- Instance lastBath = null;
- for(Instance inst : linst) {
- // if(inst.attn>0) {
- // writeAnalysis(trans, cred, inst);
- // // Special Behavior: only eval the LAST Instance
- // } else
- // All Creds go through Life Cycle
- if(deleteDate!=null && inst.expires.before(deleteDate)) {
- writeAnalysis(noAvg, cred, inst); // will go to Delete
- // Basic Auth has Pre-EOL notifications IF there is no Newer Credential
- } else if (inst.type == CredDAO.BASIC_AUTH || inst.type == CredDAO.BASIC_AUTH_SHA256) {
- if(lastBath==null || lastBath.expires.before(inst.expires)) {
- lastBath = inst;
- }
- }
- }
- if(lastBath!=null) {
- writeAnalysis(noAvg, cred, lastBath);
+ // Load Cred. We don't follow Visitor, because we have to gather up everything into Identity Anyway
+ Cred.load(trans, session);
+
+ tt = trans.start("Analyze Expired Credentials",Trans.SUB);
+ try {
+ for (Cred cred : Cred.data.values()) {
+ List<Instance> linst = cred.instances;
+ if(linst!=null) {
+ Instance lastBath = null;
+ for(Instance inst : linst) {
+ // if(inst.attn>0) {
+ // writeAnalysis(trans, cred, inst);
+ // // Special Behavior: only eval the LAST Instance
+ // } else
+ // All Creds go through Life Cycle
+ if(deleteDate!=null && inst.expires.before(deleteDate)) {
+ writeAnalysis(noAvg, cred, inst); // will go to Delete
+ // Basic Auth has Pre-EOL notifications IF there is no Newer Credential
+ } else if (inst.type == CredDAO.BASIC_AUTH || inst.type == CredDAO.BASIC_AUTH_SHA256) {
+ if(lastBath==null || lastBath.expires.before(inst.expires)) {
+ lastBath = inst;
+ }
+ }
+ }
+ if(lastBath!=null) {
+ writeAnalysis(noAvg, cred, lastBath);
+ }
}
- }
+ }
+ } finally {
+ tt.done();
}
} finally {
- tt.done();
+ Cred.clear();
}
-
+
////////////////////
tt = trans.start("Analyze Expired X509s",Trans.SUB);
try {
try {
RegistrationPropHolder rph = new RegistrationPropHolder(access,0);
- String aaf_url = rph.replacements("https://"+Config.AAF_LOCATE_URL_TAG+"/%CNS."+name, null,null);
+ String aaf_url = rph.replacements(getClass().getSimpleName(),"https://"+Config.AAF_LOCATE_URL_TAG+"/%CNS."+name, null,null);
//access.getProperty("/locate/"+name+':'+version;
access.printf(Level.INIT,"Creating DirectAAFLocator to %s",aaf_url);
uri = new URI(aaf_url);
--- /dev/null
+#########
+# ============LICENSE_START====================================================
+# org.onap.aaf
+# ===========================================================================
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# ===========================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END====================================================
+#
+FROM ${DOCKER_REPOSITORY}/onap/aaf/aaf_core:${AAF_VERSION}
+MAINTAINER AAF Team, AT&T 2018
+ENV VERSION=${AAF_VERSION}
+
+LABEL description="aaf_hello"
+LABEL version=${AAF_VERSION}
+
+COPY bin/pod_wait.sh /opt/app/aaf/bin/
+COPY etc /opt/app/osaaf/etc
+RUN mkdir -p /opt/app/aaf/status
+RUN if [ -n "${DUSER}" ]; then chown ${DUSER}:${DUSER} /opt/app/aaf/status \
+ && chown ${DUSER}:${DUSER} /opt/app/osaaf \
+ && chown -R ${DUSER}:${DUSER} /opt/app/aaf; fi
+
+CMD []
cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar sample/bin
cp -Rf ../conf/CA sample
-
# AAF Config image (for AAF itself)
sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
-e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
-e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
-e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
-e 's/${DUSER}/'${DUSER}'/g' \
- docker/Dockerfile.client > sample/Dockerfile
+ docker/Dockerfile.agent > sample/Dockerfile
$DOCKER build -t ${ORG}/${PROJECT}/aaf_agent:${VERSION} sample
$DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_agent:${VERSION}
$DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_agent:latest
-e 's/${DUSER}/'${DUSER}'/g' \
Dockerfile.core >../aaf_${VERSION}/Dockerfile
cd ..
+echo "#######"
+pwd
+echo "#######"
$DOCKER build -t ${ORG}/${PROJECT}/aaf_core:${VERSION} aaf_${VERSION}
$DOCKER tag ${ORG}/${PROJECT}/aaf_core:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_core:${VERSION}
$DOCKER tag ${ORG}/${PROJECT}/aaf_core:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_core:latest
# Do all the Containers related to AAF Services
#######
if [ $AAF_COMPONENTS == "ALL" ]; then
- AAF_COMPONENTS=$(ls ../aaf_${VERSION}/bin | grep -v '\.')
+ AAF_COMPONENTS=$(cat components)
fi
-echo "$0: AAF_COMPONENTS=$AAF_COMPONENTS"
cp ../sample/bin/pod_wait.sh ../aaf_${VERSION}/bin
for AAF_COMPONENT in ${AAF_COMPONENTS}; do
echo Building aaf_$AAF_COMPONENT...
+ if [ "hello" = "${AAF_COMPONENT}" ]; then
+ echo Building Hello separately
+ DF="Dockerfile.hello"
+ cp -Rf ../sample/etc ../aaf_${VERSION}/etc
+ else
+ DF="Dockerfile.ms"
+ fi
sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
-e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
-e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
-e 's/${DUSER}/'${DUSER}'/g' \
- Dockerfile.ms >../aaf_${VERSION}/Dockerfile
+ $DF >../aaf_${VERSION}/Dockerfile
cd ..
$DOCKER build -t ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} aaf_${VERSION}
$DOCKER tag ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION}
$DOCKER tag ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest
rm aaf_${VERSION}/Dockerfile
+ if [ -e aaf_${VERSION}/etc ]; then
+ rm -Rf aaf_${VERSION}/etc
+ fi
cd -
-
done
+
+# Final cleanup
rm ../aaf_${VERSION}/bin/pod_wait.sh
aaf.orig/
pause/
aaf.new/
+aaf.props
--- /dev/null
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
--- /dev/null
+#########
+## ============LICENSE_START====================================================
+## org.onap.aaf
+## ===========================================================================
+## Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+## ===========================================================================
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ============LICENSE_END====================================================
+##
+
+apiVersion: v1
+appVersion: "1.0"
+description: AAF Hello Helm Chart
+name: aaf-hello
+version: 2.1.11-SNAPSHOT
--- /dev/null
+AAF Persistence basics loaded
spec:
volumes:
# Use this Pod Sharing dir to declare various States of starting
- - name: {{ .Chart.Name }}-config-vol
- persistentVolumeClaim:
- claimName: {{ .Chart.Name }}-config-pvc
- - name: {{ .Chart.Name }}-status-vol
- persistentVolumeClaim:
- claimName: {{ .Chart.Name }}-status-pvc
+ - name: hello-config-vol
+ emptyDir: {}
initContainers:
- - name: {{ .Chart.Name }}-config-container
- image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
+ - name: hello-config-container
+ image: {{ .Values.image.repository }}onap/aaf/aaf_agent:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
volumeMounts:
- - mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
+ - mountPath: "/opt/app/osaaf/local"
+ name: hello-config-vol
+ command: ["bash","-c","cd /opt/app/osaaf/local && /opt/app/aaf_config/bin/agent.sh place aaf@aaf.osaaf.org aaf"]
env:
- - name: AAF_ENV
- value: "{{ .Values.cadi.aaf_env }}"
+ - name: "AAF_ENV"
+ value: "DEV"
+ - name: "AAF_FQDN"
+ value: "aaf-locate.onap"
+ - name: "APP_FQDN"
+ value: "aaf"
+ - name: "APP_FQI"
+ value: "aaf@aaf.osaaf.org"
- name: LATITUDE
value: "{{ .Values.cadi.cadi_latitude }}"
- name: LONGITUDE
value: "{{ .Values.cadi.cadi_longitude }}"
- - name: aaf_locator_container
- value: "helm"
- - name: aaf_locator_container_ns
+ - name: "CONTAINER_NS"
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- - name: aaf_locate_url
- value: "https://aaf-locate.onap:8095"
- - name: aaf_locator_public_hostname
- value: "aaf.osaaf.org"
-# - name: CASSANDRA_USER
-# value: ""
-# - name: CASSANDRA_PASSWORD
-# value: ""
-# - name: CASSANDRA_PORT
-# value: ""
- containers:
+ - name: "DEPLOY_FQI"
+ value: "deployer@people.osaaf.org"
+ - name: "DEPLOY_PASSWORD"
+ value: "demo123456!"
+
###
### AAF-HELLO
###
- - name: {{ .Chart.Name }}-hello
+ containers:
+ - name: aaf-hello
image: {{ .Values.image.repository }}onap/aaf/aaf_hello:{{ .Values.image.version }}
imagePullPolicy: IfNotPresent
- command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"]
+ command: ["/bin/bash","-c","cd /opt/app/aaf && exec bin/hello"]
volumeMounts:
- - mountPath: "/opt/app/osaaf"
- name: {{ .Chart.Name }}-config-vol
- - mountPath: "/opt/app/aaf/status"
- name: {{ .Chart.Name }}-status-vol
+ - mountPath: "/opt/app/osaaf/local"
+ name: hello-config-vol
ports:
- name: aaf-hello
protocol: TCP
containerPort: 8130
- env:
- - name: aaf_locator_ns
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
--- /dev/null
+#########
+## ============LICENSE_START====================================================
+## org.onap.aaf
+## ===========================================================================
+## Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+## ===========================================================================
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ============LICENSE_END====================================================
+##
+#
+# Default values for aaf.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global:
+ persistence:
+ enabled: true
+ common:
+ namespace: "onap"
+
+replicas:
+ hello: 1
+
+ingress:
+ enabled: false
+
+cadi:
+ hostname: "aaf.onap"
+ cadi_latitude: "38.0"
+ cadi_longitude: "-72.0"
+ aaf_env: "DEV"
+
+persistence:
+ # Note: Minikube will persist to /data on your host machine
+ mountPath: "/data/aaf"
+ hello:
+ volumeReclaimPolicy: Retain
+ accessMode: ReadWriteOnce
+ size: 1Gi
+ mountSubPath: "config"
+ storageClass: "manual"
+
+image:
+ # When using locally built Docker Container, set Repository to ""
+ repository: ""
+ # When using Docker Repo, add, and include trailing "/"
+ # repository: nexus3.onap.org:10003/
+ # repository: localhost:5000/
+ version: 2.1.11-SNAPSHOT
+
+resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ # limits:
+ # cpu: 100m
+ # memory: 128Mi
+ # requests:
+ # cpu: 100m
+ # memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
ports:
- name: aaf-gui
protocol: TCP
- port: 8200
nodePort: 30083
+ port: 8200
+ targetPort: 8200
---
apiVersion: apps/v1
kind: Deployment
oauth: 1
cm: 1
gui: 1
- hello: 0
ingress:
enabled: false
persistence:
# Note: Minikube will persist to /data on your host machine
mountPath: "/data/aaf"
- config:
+ cass:
volumeReclaimPolicy: Retain
accessMode: ReadWriteOnce
- size: 2Gi
- mountSubPath: "config"
+ size: 10Gi
+ mountSubPath: "cass"
storageClass: "manual"
status:
volumeReclaimPolicy: Delete
size: 10M
mountSubPath: "status"
storageClass: "manual"
- cass:
+ config:
volumeReclaimPolicy: Retain
accessMode: ReadWriteOnce
- size: 10Gi
- mountSubPath: "cass"
+ size: 2Gi
+ mountSubPath: "config"
+ storageClass: "manual"
+ hello:
+ volumeReclaimPolicy: Retain
+ accessMode: ReadWriteOnce
+ size: 1Gi
+ mountSubPath: "config"
storageClass: "manual"
image:
if [ ! "${DEPLOY_PASSWORD}" = "" ]; then
echo aaf_password=enc:$(sso_encrypt ${DEPLOY_PASSWORD}) >> ${SSO}
fi
+ if [ ! -z "${CONTAINER_NS}" ]; then
+ echo "aaf_locator_container_ns=${CONTAINER_NS}" >> ${SSO}
+ fi
+ if [ ! -z "${AAF_ENV}" ]; then
+ echo "aaf_env=${AAF_ENV}" >> ${SSO}
+ fi
echo aaf_locate_url=https://${AAF_FQDN}:8095 >> ${SSO}
echo aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:${AAF_INTERFACE_VERSION} >> ${SSO}
taillog)
sh /opt/app/osaaf/logs/taillog
;;
+ testConnectivity|testconnectivity)
+ echo "--- Test Connectivity ---"
+ $JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar org.onap.aaf.cadi.aaf.TestConnectivity $LOCAL/org.osaaf.aaf.props
+ ;;
--help | -?)
case "$1" in
"")
aaf_locator_entries=cm
port=8150
aaf_locator_public_port.helm=30084
-# aaf_locator_public_port.oom=
+aaf_locator_public_port.oom=31114
#Certman
cm_public_dir=/opt/app/osaaf/public
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props
aaf_locator_entries=fs
port=8096
-aaf_locator_port.helm=30085
-# aaf_locator_port.oom=
+aaf_locator_public_port.helm=30085
+aaf_locator_public_port.oom=31115
aaf_public_dir=/opt/app/osaaf/public
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props
aaf_locator_entries=gui
port=8200
-aaf_locator_port.helm=30083
-#aaf_locator_port.oom=
+aaf_locator_public_port.helm=30083
+aaf_locator_public_port.oom=31113
aaf_gui_title=AAF
aaf_gui_copyright=(c) 2018 AT&T Intellectual Property. All rights reserved.
aaf_locator_entries=hello
port=8130
aaf_locator_public_port.helm=30086
-#aaf_locator_public_port.oom=
+aaf_locator_public_port.oom=31116
aaf_locator_entries=locate
port=8095
aaf_locator_public_port.helm=30081
-#aaf_locator_public_port.oom=
+aaf_locator_public_port.oom=31111
##
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
aaf_locator_entries=oauth,token,introspect
+aaf_locator_fqdn.helm=%CNS.aaf-oauth
+aaf_locator_fqdn.oom=%CNS.aaf-oauth
port=8140
aaf_locator_public_port.helm=30082
-#aaf_locator_public_port.oom=
+aaf_locator_public_port.oom=31112
aaf_locator_entries=service
port=8100
aaf_locator_public_port.helm=30080
-#aaf_locator_public_port.oom=
+aaf_locator_public_port.oom=31110
# 3) Helm (Kubernetes and Helm)\r
# 4) OOM (Kubernetes with OOM)\r
################################\r
-aaf_locator_ns=AAF_NS\r
+aaf_locator_app_ns=%AAF_NS\r
aaf_locator_name=%NS.%N\r
aaf_locator_name.docker=%CNS.%NS.%N\r
aaf_locator_name.helm=%CNS.%NS.%N\r
}
try {
RegistrationPropHolder rph = new RegistrationPropHolder(access, 0);
- str = rph.replacements(str, null,null);
+ str = rph.replacements("AAFCon",str, null,null);
} catch (UnknownHostException e) {
throw new CadiException(e);
}
throw new LocatorException(e1);
}
try {
- aaf_locator_host = rph.replacements("https://"+Config.AAF_LOCATE_URL_TAG,null,null);
+ aaf_locator_host = rph.replacements(getClass().getSimpleName(),"https://"+Config.AAF_LOCATE_URL_TAG,null,null);
aaf_locator_uri = new URI(aaf_locator_host);
access.printf(Level.INFO, "AbsAAFLocator AAF URI is %s",aaf_locator_uri);
} catch (URISyntaxException e) {
throw new LocatorException(e);
}
- name = rph.replacements(name, null,null);
+ name = rph.replacements(getClass().getSimpleName(),name, null,null);
access.printf(Level.INFO, "AbsAAFLocator name is %s",aaf_locator_uri);
epList = new LinkedList<>();
import java.util.List;
import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Access.Level;
import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.cadi.aaf.Defaults;
import org.onap.aaf.cadi.config.Config;
import org.onap.aaf.cadi.util.Split;
import locate.v1_0.MgmtEndpoint;
+import locate.v1_0.MgmtEndpoint.SpecialPorts;
import locate.v1_0.MgmtEndpoints;
public class RegistrationCreator {
} catch (NumberFormatException | UnknownHostException e) {
throw new CadiException("Error extracting Data from Properties for Registrar",e);
}
-
+
+ if(access.willLog(Level.INFO)) {
+ access.log(Level.INFO, print(new StringBuilder(),me.getMgmtEndpoint()));
+ }
return me;
}
+ private StringBuilder print(StringBuilder sb, List<MgmtEndpoint> lme) {
+ int cnt = 0;
+ for(MgmtEndpoint m : lme) {
+ print(sb,cnt++,m);
+ }
+ return sb;
+ }
+
+ private void print(StringBuilder out, int cnt, MgmtEndpoint mep) {
+ out.append("\nManagement Endpoint - ");
+ out.append(cnt);
+ out.append("\n\tName: ");
+ out.append(mep.getName());
+ out.append("\n\tHostname: ");
+ out.append(mep.getHostname());
+ out.append("\n\tLatitude: ");
+ out.append(mep.getLatitude());
+ out.append("\n\tLongitude: ");
+ out.append(mep.getLongitude());
+ out.append("\n\tVersion: ");
+ out.append(mep.getMajor());
+ out.append('.');
+ out.append(mep.getMinor());
+ out.append('.');
+ out.append(mep.getPkg());
+ out.append('.');
+ out.append(mep.getPatch());
+ out.append("\n\tPort: ");
+ out.append(mep.getPort());
+ out.append("\n\tProtocol: ");
+ out.append(mep.getProtocol());
+ out.append("\n\tSpecial Ports:");
+ for( SpecialPorts sp : mep.getSpecialPorts()) {
+ out.append("\n\t\tName: ");
+ out.append(sp.getName());
+ out.append("\n\t\tPort: ");
+ out.append(sp.getPort());
+ out.append("\n\t\tProtocol: ");
+ out.append(sp.getProtocol());
+ out.append("\n\t\t Versions: ");
+ boolean first = true;
+ for(String s : sp.getProtocolVersions()) {
+ if(first) {
+ first = false;
+ } else {
+ out.append(',');
+ }
+ out.append(s);
+ }
+ }
+ boolean first = true;
+ out.append("\n\tSubProtocol: ");
+ for(String s : mep.getSubprotocol()) {
+ if(first) {
+ first = false;
+ } else {
+ out.append(',');
+ }
+ out.append(s);
+ }
+ }
+
private MgmtEndpoint copy(MgmtEndpoint mep) {
MgmtEndpoint out = new MgmtEndpoint();
out.setName(mep.getName());
import java.net.UnknownHostException;
import org.junit.Test;
+import org.mockito.internal.configuration.DefaultInjectionEngine;
import org.onap.aaf.cadi.CadiException;
import org.onap.aaf.cadi.PropAccess;
import org.onap.aaf.cadi.config.Config;
pa.setProperty(Config.AAF_LOCATOR_PUBLIC_HOSTNAME,k8s_public_hostname);
pa.setProperty(Config.AAF_LOCATOR_PUBLIC_PORT+DOT_OOM,Integer.toString(public_port));
+ pa.setProperty(Config.AAF_LOCATOR_APP_NS, Config.AAF_ROOT_NS_DEF);
rc = new RegistrationCreator(pa);
for(MgmtEndpoint me : rc.create(port).getMgmtEndpoint()) {
switch(me.getName()) {
public static final String AAF_LOCATOR_VERSION = "aaf_locator_version";
public static final String AAF_LOCATOR_PROTOCOL = "aaf_locator_protocol";
public static final String AAF_LOCATOR_SUBPROTOCOL = "aaf_locator_subprotocol";
- public static final String AAF_LOCATOR_NS = "aaf_locator_ns";
+ public static final String AAF_LOCATOR_APP_NS = "aaf_locator_app_ns";
public static final String AAF_LOCATOR_ENTRIES = "aaf_locator_entries";
public static final String AAF_LOCATOR_FQDN = "aaf_locator_fqdn";
public static final String AAF_LOCATOR_NAME = "aaf_locator_name";
if (rv == null) {
rph.access().log(Level.INIT,tag,"is not explicitly set");
} else {
- rv = rph.replacements(rv, null, null);
+ rv = rph.replacements("Config.logProp",rv, null, null);
rph.access().log(Level.INIT,tag,"is set to",rv);
}
return rv;
RegistrationPropHolder rph;
try {
rph = new RegistrationPropHolder(access, 0);
- url = rph.replacements(_url, null, null);
+ url = rph.replacements("Config.loadLocator",_url, null, null);
access.printf(Level.INFO, "loadLocator URL is %s",url);
} catch (UnknownHostException | CadiException e1) {
throw new LocatorException(e1);
import org.onap.aaf.cadi.Access;
import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.Access.Level;
import org.onap.aaf.cadi.util.Split;
public class RegistrationPropHolder {
private final String PUBLIC_NAME="%NS.%N";
+ private final String REGI="RegistrationProperty: %s='%s'";
private final Access access;
public String hostname;
private int port;
public final String lentries;
public final String lcontainer;
public final String default_container;
+ private static boolean firstlog = true;
public RegistrationPropHolder(final Access access, final int port) throws UnknownHostException, CadiException {
this.access = access;
this.port = port;
lentries=access.getProperty(Config.AAF_LOCATOR_ENTRIES,"");
-
default_container = access.getProperty(Config.AAF_LOCATOR_CONTAINER, "");
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"default_container",default_container);
+ }
if(!default_container.isEmpty()) {
lcontainer=',' + default_container; // "" makes a blank default Public Entry
str = access.getProperty(Config.AAF_LOCATOR_PUBLIC_PORT+'.'+default_container, null);
if(str!=null) {
public_port=Integer.decode(str);
}
-
+ if(firstlog) {
+ access.printf(Level.INIT, "RegistrationProperty: public_port='%d'",public_port);
+ }
+
hostname = access.getProperty(Config.HOSTNAME, null);
if (hostname==null) {
hostname = Inet4Address.getLocalHost().getHostName();
if (hostname==null) {
mustBeDefined(errs,Config.HOSTNAME);
}
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"hostname",hostname);
+ }
public_hostname = access.getProperty(Config.AAF_LOCATOR_PUBLIC_HOSTNAME, hostname);
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"public_hostname",public_hostname);
+ }
- default_name = access.getProperty(Config.AAF_LOCATOR_NAME, "%CNS.%NS.%N");
+ default_name = access.getProperty(Config.AAF_LOCATOR_NAME, PUBLIC_NAME);
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"default_name",default_name);
+ }
latitude=null;
String slatitude = access.getProperty(Config.CADI_LATITUDE, null);
} else {
latitude = Float.parseFloat(slatitude);
}
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"latitude",slatitude);
+ }
longitude=null;
String slongitude = access.getProperty(Config.CADI_LONGITUDE, null);
} else {
longitude = Float.parseFloat(slongitude);
}
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"longitude",slongitude);
+ }
String dot_le;
// Note: only one of the ports can be public... Therefore, only the last
for(String le : Split.splitTrim(',', lcontainer)) {
- dot_le = le.isEmpty()?"":"."+le;
+ dot_le = le.isEmpty()?le :"."+le;
str = access.getProperty(Config.AAF_LOCATOR_PUBLIC_HOSTNAME+dot_le,null);
- if( str != null) {
+ if( str != null && !str.isEmpty()) {
public_hostname=str;
+ if(firstlog) {
+ access.printf(Level.INIT, "RegistrationProperty: public_hostname(overloaded by %s)='%s'",dot_le,public_hostname);
+ }
}
}
default_fqdn = access.getProperty(Config.AAF_LOCATOR_FQDN, hostname);
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"default_fqdn",default_fqdn);
+ }
default_container_ns = access.getProperty(Config.AAF_LOCATOR_CONTAINER_NS,"");
-
+ if(firstlog) {
+ access.printf(Level.INIT, REGI,"default_container_ns",default_container_ns);
+ }
if(errs.length()>0) {
throw new CadiException(errs.toString());
}
+ firstlog = false;
}
private void mustBeDefined(StringBuilder errs, String propname) {
} else {
str = access.getProperty(Config.AAF_LOCATOR_FQDN+dot_le, default_fqdn);
}
- return replacements(str,entry,dot_le);
+ return replacements("RegistrationPropHolder.getEntryFQDN",str,entry,dot_le);
}
public String getEntryName(final String entry, final String dot_le) {
} else {
str = access.getProperty(Config.AAF_LOCATOR_NAME+dot_le, default_name);
}
- return replacements(str,entry,dot_le);
+ return replacements("RegistrationPropHolder.getEntryName",str,entry,dot_le);
}
private String getNS(String dot_le) {
String ns;
- ns = access.getProperty(Config.AAF_LOCATOR_NS+dot_le,null);
+ ns = access.getProperty(Config.AAF_LOCATOR_APP_NS+dot_le,null);
if(ns==null) {
- ns = access.getProperty(Config.AAF_ROOT_NS, "");
+ ns = access.getProperty(Config.AAF_LOCATOR_APP_NS, "");
}
return ns;
}
- public String replacements(String source, final String name, final String _dot_le) {
+ public String replacements(final String fromCode, final String source, final String name, final String _dot_le) {
if(source == null) {
return "";
} else if(source.isEmpty()) {
return source;
}
-
+ String value = source;
String dot_le;
if(_dot_le==null) {
dot_le = default_container.isEmpty()?"":'.'+default_container;
String str;
if(aaf_locator_host!=null) {
- if("https://AAF_LOCATE_URL".equals(source)) {
- source = aaf_locator_host;
+ if("https://AAF_LOCATE_URL".equals(value)) {
+ value = aaf_locator_host;
} else {
str = aaf_locator_host;
- if(source.indexOf(Config.AAF_LOCATE_URL_TAG)>=0) {
+ if(value.indexOf(Config.AAF_LOCATE_URL_TAG)>=0) {
if(!str.endsWith("/")) {
str+='/';
}
if(!str.endsWith("/locate/")) {
str+="locate/";
}
- source = source.replace("https://AAF_LOCATE_URL/", str);
+ value = value.replace("https://AAF_LOCATE_URL/", str);
}
}
}
- int atC = source.indexOf("%C");
+ int atC = value.indexOf("%C");
if(atC>=0) {
// aaf_locator_container_ns
str = access.getProperty(Config.AAF_LOCATOR_CONTAINER_NS+dot_le, default_container_ns);
if(str.isEmpty()) {
- source = source.replace("%CNS"+'.', str);
+ value = value.replace("%CNS"+'.', str);
}
- source = source.replace("%CNS", str);
+ value = value.replace("%CNS", str);
str = access.getProperty(Config.AAF_LOCATOR_CONTAINER+dot_le,default_container);
if(str.isEmpty()) {
- source = source.replace("%C"+'.', str);
+ value = value.replace("%C"+'.', str);
}
- source = source.replace("%C", str);
+ value = value.replace("%C", str);
}
- if(source.indexOf("%NS")>=0) {
+ if(value.indexOf("%NS")>=0) {
str = getNS(dot_le);
if(str==null || str.isEmpty()) {
- source = source.replace("%NS"+'.', str);
+ value = value.replace("%NS"+'.', str);
}
- source = source.replace("%NS", str);
+ value = value.replace("%NS", str);
}
// aaf_root_ns
- if(source.indexOf("AAF_NS")>=0) {
+ if(value.indexOf("AAF_NS")>=0) {
str = access.getProperty(Config.AAF_ROOT_NS, Config.AAF_ROOT_NS_DEF);
- String temp = source.replace("%AAF_NS", str);
- if(temp.equals(source)) { // intended
- source = source.replace("AAF_NS", str); // Backward Compatibility
+ String temp = value.replace("%AAF_NS", str);
+ if(temp.equals(value)) { // intended
+ value = value.replace("AAF_NS", str); // Backward Compatibility
} else {
- source = temp;
+ value = temp;
}
}
- if(source.indexOf('%')>=0) {
+ if(value.indexOf('%')>=0) {
// These shouldn't be expected to have dot elements
if(name!=null) {
- source = source.replace("%N", name);
+ value = value.replace("%N", name);
}
if(default_fqdn!=null) {
- source = source.replace("%DF", default_fqdn);
+ value = value.replace("%DF", default_fqdn);
}
if(public_hostname!=null) {
- source = source.replace("%PH", public_hostname);
+ value = value.replace("%PH", public_hostname);
}
}
- return source;
+ access.printf(Level.DEBUG,
+ "RegistrationReplacement from %s, source: %s, dot_le: %s, value: %s",
+ fromCode,source,dot_le,value);
+
+ return value;
}
public int getEntryPort(final String dot_le) {
}
String ns = "myns";
- pa.setProperty(Config.AAF_LOCATOR_NS, ns);
+ pa.setProperty(Config.AAF_LOCATOR_APP_NS, ns);
for(String dot_le : new String[] {"",".helm"}) {
assertEquals(rph.hostname,rph.default_fqdn);
assertEquals("",rph.lcontainer);
}
String ns2 = "onap";
- pa.setProperty(Config.AAF_LOCATOR_NS+".helm", ns2);
+ pa.setProperty(Config.AAF_LOCATOR_APP_NS+".helm", ns2);
for(String dot_le : new String[] {"",".helm"}) {
assertEquals(rph.hostname,rph.default_fqdn);
assertEquals("",rph.lcontainer);
final String url = "https://aaf.osaaf.org:8095/org.osaaf.aaf.service:2.1";
String name="theName";
- assertEquals(url,rph.replacements(url, name, ""));
+ assertEquals(url,rph.replacements(getClass().getSimpleName(),url, name, ""));
String alu = "aaf.osaaf.org:8095";
String curl = url.replace(alu, Config.AAF_LOCATE_URL_TAG);
pa.setProperty(Config.AAF_LOCATE_URL,"https://"+alu);
- assertEquals(url.replace("8095","8095/locate"),rph.replacements(curl, name, ""));
+ assertEquals(url.replace("8095","8095/locate"),rph.replacements(getClass().getSimpleName(),curl, name, ""));
String root_ns = "org.osaaf.aaf";
curl = url.replace(root_ns, "AAF_NS");
pa.setProperty(Config.AAF_ROOT_NS,root_ns);
- assertEquals(url,rph.replacements(curl, name, ""));
+ assertEquals(url,rph.replacements(getClass().getSimpleName(),curl, name, ""));
curl = url.replace(root_ns, "%AAF_NS");
pa.setProperty(Config.AAF_ROOT_NS,root_ns);
- assertEquals(url,rph.replacements(curl, name, ""));
+ assertEquals(url,rph.replacements(getClass().getSimpleName(),curl, name, ""));
final String fqdn = "%C.%CNS.%NS.%N";
String target = "myns.theName";
- assertEquals(target,rph.replacements(fqdn, name, ""));
+ assertEquals(target,rph.replacements(getClass().getSimpleName(),fqdn, name, ""));
pa.setProperty(Config.AAF_LOCATOR_CONTAINER_NS+".hello", "mycontns");
- target = "mycontns.org.osaaf.aaf.theName";
- assertEquals(target,rph.replacements(fqdn, name, ".hello"));
+ target = "mycontns.myns.theName";
+ assertEquals(target,rph.replacements(getClass().getSimpleName(),fqdn, name, ".hello"));
pa.setProperty(Config.AAF_LOCATOR_CONTAINER+".hello","helloC");
- target = "helloC.mycontns.org.osaaf.aaf.theName";
- assertEquals(target,rph.replacements(fqdn, name, ".hello"));
+ target = "helloC.mycontns.myns.theName";
+ assertEquals(target,rph.replacements(getClass().getSimpleName(),fqdn, name, ".hello"));
pa.setProperty(Config.AAF_LOCATOR_CONTAINER_NS,"c_ns");
target = "c_ns.myns.theName";
- assertEquals(target,rph.replacements(fqdn, name, ""));
+ assertEquals(target,rph.replacements(getClass().getSimpleName(),fqdn, name, ""));
} catch (UnknownHostException | CadiException e) {
Code Review / aaf / authz.git / commitdiff