diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2019-05-31 10:02:47 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2019-05-31 10:09:32 -0500 |
| commit | 98adb75e5e627d28ecdf659f4c8ed640ce53ed5e (patch) | |
| tree | d7f2bb6a52a5118b49d38ddc7e80e1da6f998070 /cadi/core | |
| parent | dc87ad47ebe4915de69a7c8ce424c4ab517bb513 (diff) | |
Update DNSLocator code and use
Issue-ID: AAF-838
Change-Id: Ieaf112365e40237b6f252371d2d2f95e9bc47f89
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'cadi/core')
| -rw-r--r-- | cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java index 8cb1045b..52bb53ef 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java @@ -221,6 +221,7 @@ public class Config { public static final String AAF_URL_GUI="aaf_url_gui"; public static final String AAF_URL_FS="aaf_url_fs"; public static final String AAF_URL_CM = "aaf_url_cm"; + public static final String AAF_URL_CM_DEF = "https://AAF_LOCATE_URL/AAF_NS.cm:"+AAF_DEFAULT_API_VERSION; public static final String AAF_URL_HELLO = "aaf_url_hello"; public static final String CM_TRUSTED_CAS = "cm_trusted_cas"; @@ -856,18 +857,24 @@ public class Config { } catch (UnknownHostException | CadiException e1) { throw new LocatorException(e1); } - + + String aaf_locator_class; + if(_url.equals(url) && !url.contains("/locate/")) { + aaf_locator_class = "org.onap.aaf.cadi.locator.DNSLocator"; + } else { + aaf_locator_class = AAF_LOCATOR_CLASS_DEF; + } try { - Class<?> lcls = loadClass(access,AAF_LOCATOR_CLASS_DEF); + Class<?> lcls = loadClass(access,aaf_locator_class); if (lcls==null) { throw new CadiException("Need to include aaf-cadi-aaf jar for AAFLocator"); } // First check for preloaded try { - Method meth = lcls.getMethod("create",String.class); - locator = (Locator<URI>)meth.invoke(null,url); + Method meth = lcls.getMethod("create",Access.class,String.class); + locator = (Locator<URI>)meth.invoke(null,access,url); } catch (Exception e) { - access.log(Level.DEBUG, "(Not fatal) Cannot load by create(String)", e); + access.log(Level.TRACE, "(Not fatal) Cannot load by create(String)", e); } if (locator==null) { URI locatorURI = new URI(url); |