X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfigure%2FAgent.java;h=98abfbf9cd11ab0ad0beb5550cc771614083a6d5;hb=f6f44f558ce4f04605269f71a10d6df054295f6a;hp=4dd86fe097c8417e4fa6befa1dd579adc76f07d2;hpb=355b886d817295d2bca5af28f01576bf4a3ded18;p=aaf%2Fauthz.git

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 4dd86fe0..98abfbf9 100644
--- 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
@@ -86,7 +86,8 @@ import locate.v1_1.Configuration;
 import locate.v1_1.Configuration.Props;
 
 public class Agent {
-    private static final String HASHES = "################################################################";
+    private static final String AGENT_LOAD_URLS = "Agent:loadURLs";
+	private static final String HASHES = "################################################################";
     private static final String PRINT = "print";
     private static final String FILE = "file";
     public static final String PKCS12 = "pkcs12";
@@ -311,7 +312,7 @@ public class Agent {
 	    	String dot_le = access.getProperty(Config.AAF_LOCATOR_CONTAINER,null);
 	    	dot_le=dot_le==null?"":'.'+dot_le;
 	    	String version = access.getProperty(Config.AAF_API_VERSION,Config.AAF_DEFAULT_API_VERSION);
-	        for(String u : new String[] {"aaf","locate","oauth","cm","gui","fs","hello","token","introspect"}) {
+	        for(String u : new String[] {"locate","aaf","oauth","cm","gui","fs","hello","token","introspect"}) {
 	        	String tag;
 	        	String append=null;
 	        	switch(u) {
@@ -336,12 +337,14 @@ public class Agent {
 		        	} else {
 		        		lhost=Config.AAF_LOCATE_URL_TAG;
 		        	}
-		        	value = rph.replacements("Agent:loadURLs",
+		        	value = rph.replacements(AGENT_LOAD_URLS,
 		        			proto + lhost + "/%CNS.%AAF_NS." + ("aaf".equals(u)?"service":u) + ':' + version, 
 		        			null,dot_le);
 		        	if(append!=null) {
 		        		value+=append;
 		        	}
+	        	} else {
+	        		value = rph.replacements(AGENT_LOAD_URLS, value,null,dot_le);
 	        	}
 	        	rv.put(tag, value);
 	        };
@@ -390,6 +393,9 @@ public class Agent {
     private static String fqi(Deque<String> cmds) {
         if (cmds.size()<1) {
             String alias = env.getProperty(Config.CADI_ALIAS);
+            if(alias==null) {
+            	alias = env.getProperty(Config.AAF_APPID);
+            }
             return alias!=null?alias:AAFSSO.cons.readLine("AppID: ");
         }
         return cmds.removeFirst();