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=e50b52d8f12cd234982ca05443a49b31fa18552a;hb=dbec47530c91b6cd586fb05b44fd27444301e04a;hp=6d0ea9565a236b4f121249614a310edf537b52c1;hpb=5c01796be69ed71c360dade8a080a4fd22c06447;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 6d0ea956..e50b52d8 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
@@ -319,11 +319,11 @@ public class Agent {
 	        		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;
-	        		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;
@@ -823,7 +823,7 @@ public class Agent {
             	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) {