Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Switch to new Locate Features
[aaf/authz.git]
/
cadi
/
aaf
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
cadi
/
configure
/
Agent.java
diff --git
a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
index
caf15d3
..
e50b52d
100644
(file)
--- a/
cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
+++ b/
cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
@@
-50,7
+50,6
@@
import org.onap.aaf.cadi.CmdLine;
import org.onap.aaf.cadi.LocatorException;
import org.onap.aaf.cadi.PropAccess;
import org.onap.aaf.cadi.Symm;
import org.onap.aaf.cadi.LocatorException;
import org.onap.aaf.cadi.PropAccess;
import org.onap.aaf.cadi.Symm;
-import org.onap.aaf.cadi.Access.Level;
import org.onap.aaf.cadi.aaf.client.ErrMessage;
import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
import org.onap.aaf.cadi.aaf.client.ErrMessage;
import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
@@
-320,11
+319,11
@@
public class Agent {
lhost=Config.AAF_LOCATE_URL_TAG;
}
String value = rph.replacements("Agent:loadURLs",
lhost=Config.AAF_LOCATE_URL_TAG;
}
String value = rph.replacements("Agent:loadURLs",
- proto + lhost + "/AAF_NS." + ("aaf".equals(u)?"service":u) + ':' + version,
+ proto + lhost + "/
%CNS.%
AAF_NS." + ("aaf".equals(u)?"service":u) + ':' + version,
null,dot_le);
switch(u) {
case "aaf": rv.put(Config.AAF_URL, value); break;
null,dot_le);
switch(u) {
case "aaf": rv.put(Config.AAF_URL, value); break;
- case "locate": rv.put(Config.
AAF_LOCATE_URL
, value); break;
+ case "locate": rv.put(Config.
getAAFLocateUrl(access)
, value); break;
case "token": rv.put(Config.AAF_OAUTH2_TOKEN_URL, value); break;
case "introspect": rv.put(Config.AAF_OAUTH2_INTROSPECT_URL, value); break;
case "cm": rv.put(Config.AAF_URL_CM, value); break;
case "token": rv.put(Config.AAF_OAUTH2_TOKEN_URL, value); break;
case "introspect": rv.put(Config.AAF_OAUTH2_INTROSPECT_URL, value); break;
case "cm": rv.put(Config.AAF_URL_CM, value); break;
@@
-808,7
+807,7
@@
public class Agent {
cred.add(Config.CADI_KEYFILE, cred.getKeyPath());
final String ssoAppID = propAccess.getProperty(Config.AAF_APPID);
cred.add(Config.CADI_KEYFILE, cred.getKeyPath());
final String ssoAppID = propAccess.getProperty(Config.AAF_APPID);
- if(fqi.equals(ssoAppID)) {
+ if(fqi
!=null && fqi
.equals(ssoAppID)) {
cred.addEnc(Config.AAF_APPPASS, propAccess, null);
// only Ask for Password when starting scratch
} else if(propAccess.getProperty(Config.CADI_PROP_FILES)==null) {
cred.addEnc(Config.AAF_APPPASS, propAccess, null);
// only Ask for Password when starting scratch
} else if(propAccess.getProperty(Config.CADI_PROP_FILES)==null) {
@@
-824,10
+823,15
@@
public class Agent {
app.add(es.getKey(), es.getValue());
}
app.add(es.getKey(), es.getValue());
}
- app.add(Config.AAF_LOCATE_URL, propAccess, null);
+ app.add(Config.AAF_LOCATE_URL, Config.getAAFLocateUrl(propAccess));
+ app.add(Config.AAF_ENV,propAccess, "DEV");
+ String release = propAccess.getProperty(Config.AAF_RELEASE);
+ if(release!=null) {
+ app.add(Config.AAF_RELEASE, release);
+ }
for(Entry<Object, Object> aaf_loc_prop : propAccess.getProperties().entrySet()) {
String key = aaf_loc_prop.getKey().toString();
for(Entry<Object, Object> aaf_loc_prop : propAccess.getProperties().entrySet()) {
String key = aaf_loc_prop.getKey().toString();
- if(
"aaf_env".equals(key) ||
key.startsWith("aaf_locator")) {
+ if(key.startsWith("aaf_locator")) {
app.add(key, aaf_loc_prop.getValue().toString());
}
}
app.add(key, aaf_loc_prop.getValue().toString());
}
}