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=3e90087c0b0873b0be0773d1360decef38b3febb;hb=32cdd553a8668e6d03a9cf5b11b360d35a63c87f;hp=cd08cd4d6d3dcd919f0f04c245695ee737ba5c33;hpb=2c0dd5c5136e249f63f1d3296063795cde30c399;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 cd08cd4d..3e90087c 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
@@ -79,15 +79,16 @@ public class TestConnectivity {
 				List<SecuritySetter<HttpURLConnection>> lss = loadSetters(access,si);
 				/////////
 				print(true,"Test Connections driven by AAFLocator");
-				URI serviceURI = new URI(aaflocate+"/locate/AAF_NS.service/2.0");
+				URI serviceURI = new URI(Defaults.AAF_URL);
 
 				for(URI uri : new URI[] {
 						serviceURI,
-						new URI(aaflocate+"/locate/AAF_NS.service:2.0"),
-						new URI(aaflocate+"/locate/AAF_NS.locate:2.0"),
-						new URI(aaflocate+"/locate/AAF_NS.token:2.0"),
-						new URI(aaflocate+"/locate/AAF_NS.certman:2.0"),
-						new URI(aaflocate+"/locate/AAF_NS.hello")
+						new URI(Defaults.OAUTH2_TOKEN_URL),
+						new URI(Defaults.OAUTH2_INTROSPECT_URL),
+						new URI(Defaults.CM_URL),
+						new URI(Defaults.GUI_URL),
+						new URI(Defaults.FS_URL),
+						new URI(Defaults.HELLO_URL)
 				}) {
 					Locator<URI> locator = new AAFLocator(si, uri);
 					try {
@@ -105,14 +106,6 @@ public class TestConnectivity {
 					permTest(locator,ss);
 				}
 
-				/////////
-				// Removed for ONAP
-//				print(true,"Test Proxy Access driven by AAFLocator");
-//				locator = new AAFLocator(si, new URI(aaflocate+"/AAF_NS.gw:2.0/proxy"));
-//				for(SecuritySetter<HttpURLConnection> ss : lss) {
-//					permTest(locator,ss);
-//				}
-
 				//////////
 				print(true,"Test essential BasicAuth Service call, driven by AAFLocator");
 				for(SecuritySetter<HttpURLConnection> ss : lss) {
@@ -133,7 +126,7 @@ public class TestConnectivity {
 		print(true,"Load Security Setters from Configuration Information");
 		String user = access.getProperty(Config.AAF_APPID);
 
-		ArrayList<SecuritySetter<HttpURLConnection>> lss = new ArrayList<SecuritySetter<HttpURLConnection>>();
+		ArrayList<SecuritySetter<HttpURLConnection>> lss = new ArrayList<>();
 		
 
 		try {
@@ -163,7 +156,7 @@ public class TestConnectivity {
 		String tokenURL = access.getProperty(Config.AAF_OAUTH2_TOKEN_URL);
 		String locateURL=access.getProperty(Config.AAF_LOCATE_URL);
 		if(tokenURL==null || (tokenURL.contains("/locate/") && locateURL!=null)) {
-			tokenURL=locateURL+"/locate/AAF_NS.token:2.0/token";
+			tokenURL=Defaults.OAUTH2_TOKEN_URL+"/token";
 		}
 
 		try {