X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdirect%2FDirectAAFLocator.java;h=cc9ee66cea3dcd709eaafffc7f543ceed18d1be9;hb=refs%2Fchanges%2F57%2F78857%2F1;hp=93fab977559457b488b24c17769f2627d8b7bebf;hpb=bf3d3075cac610b901c951ae135fcdbcc6ffecb8;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java
index 93fab977..cc9ee66c 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java
@@ -23,6 +23,7 @@ package org.onap.aaf.auth.direct;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -34,8 +35,10 @@ import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLocator;
 import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.RegistrationPropHolder;
 import org.onap.aaf.misc.env.util.Split;
 
 import locate.v1_0.Endpoint;
@@ -70,8 +73,12 @@ public class DirectAAFLocator extends AbsAAFLocator<AuthzTrans> {
         }
         
         try {
-            uri = new URI(access.getProperty(Config.AAF_LOCATE_URL, "localhost")+"/locate/"+name+':'+version);
-        } catch (URISyntaxException e) {
+        	RegistrationPropHolder rph = new RegistrationPropHolder(access,0);
+        	String aaf_url = rph.replacements("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);
+        } catch (URISyntaxException | UnknownHostException | CadiException e) {
             throw new LocatorException(e);
         }
         myhostname=null;