X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2FTestConnectivity.java;h=d380474331631633e768504eef397a3be3f07c05;hb=be7e0d14765b8fb1520c457ab99ddedf0f7ab65e;hp=004c43c5b028e45c446c2786d0d736a614d5ade4;hpb=08755cae37030d74d8fcadf38f9919c9d9fd21c0;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java
index 004c43c5..d3804743 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/TestConnectivity.java
@@ -142,9 +142,19 @@ public class TestConnectivity {
     }
     
     private static URI uri(PropAccess access, String ms) throws URISyntaxException {
-		String aaf_root_ns = access.getProperty(Config.AAF_ROOT_NS,"AAF_NS");
+		String aaf_root_ns = access.getProperty(Config.AAF_ROOT_NS,Config.AAF_ROOT_NS_DEF);
 		String aaf_api_version = access.getProperty(Config.AAF_API_VERSION,Config.AAF_DEFAULT_API_VERSION);
 		String aaf_locate_url = access.getProperty(Config.AAF_LOCATE_URL,Defaults.AAF_LOCATE_CONST);
+		String aaf_container = access.getProperty(Config.AAF_LOCATOR_CONTAINER,null);
+		if(aaf_container!=null) {
+			String ns = access.getProperty(Config.AAF_LOCATOR_CONTAINER_NS+'.'+aaf_container,null);
+			if(ns==null) {
+				ns = access.getProperty(Config.AAF_LOCATOR_CONTAINER_NS,null);
+			}
+			if(ns!=null) {
+				aaf_root_ns=ns + '.' + aaf_root_ns;
+			}
+		}
 		if("cm".equals(ms) && "2.0".equals(aaf_api_version)) {
 			ms = "certman";
 		}
@@ -187,6 +197,7 @@ public class TestConnectivity {
         if (tokenURL==null || (tokenURL.contains("/locate/") && locateURL!=null)) {
             tokenURL=Config.OAUTH2_TOKEN_URL_DEF;
         }
+        
 
         try {
             HRenewingTokenSS hrtss = new HRenewingTokenSS(access, tokenURL);