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=refs%2Fchanges%2F51%2F56951%2F1;hp=3437194049998370db53fa7e16604ca02f776e09;hpb=f482ea06ac55e56025c64916592f07db2c1fddd7;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 34371940..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
@@ -64,14 +64,12 @@ public class TestConnectivity {
 			PropAccess access = new PropAccess(args);
 			String aaflocate;
 			if(args.length>1) {
-				aaflocate = "https://" + args[1] + "/locate";
+				aaflocate = "https://" + args[1];
 				access.setProperty(Config.AAF_LOCATE_URL, "https://" + args[1]);
 			} else {
 				aaflocate = access.getProperty(Config.AAF_LOCATE_URL);
 				if(aaflocate==null) {
 					print(true,"Properties must contain ",Config.AAF_LOCATE_URL);
-				} else if (!aaflocate.endsWith("/locate")) {
-					aaflocate += "/locate";
 				}
 			}
 			
@@ -81,16 +79,16 @@ public class TestConnectivity {
 				List<SecuritySetter<HttpURLConnection>> lss = loadSetters(access,si);
 				/////////
 				print(true,"Test Connections driven by AAFLocator");
-				URI serviceURI = new URI(aaflocate+"/AAF_NS.service/2.0");
+				URI serviceURI = new URI(Defaults.AAF_URL);
 
 				for(URI uri : new URI[] {
 						serviceURI,
-						new URI(aaflocate+"/AAF_NS.service:2.0"),
-						new URI(aaflocate+"/AAF_NS.service"),
-						new URI(aaflocate+"/AAF_NS.gw:2.0"),
-						new URI(aaflocate+"/AAF_NS.token:2.0"),
-						new URI(aaflocate+"/AAF_NS.certman:2.0"),
-						new URI(aaflocate+"/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 {
@@ -102,15 +100,8 @@ public class TestConnectivity {
 				}
 
 				/////////
-				print(true,"Test Service driven by AAFLocator");
-				Locator<URI> locator = new AAFLocator(si,new URI(aaflocate+"/AAF_NS.service:2.0"));
-				for(SecuritySetter<HttpURLConnection> ss : lss) {
-					permTest(locator,ss);
-				}
-
-				/////////
-				print(true,"Test Proxy Access driven by AAFLocator");
-				locator = new AAFLocator(si, new URI(aaflocate+"/AAF_NS.gw:2.0/proxy"));
+				print(true,"Test Service for Perms driven by AAFLocator");
+				Locator<URI> locator = new AAFLocator(si,serviceURI);
 				for(SecuritySetter<HttpURLConnection> ss : lss) {
 					permTest(locator,ss);
 				}
@@ -119,7 +110,7 @@ public class TestConnectivity {
 				print(true,"Test essential BasicAuth Service call, driven by AAFLocator");
 				for(SecuritySetter<HttpURLConnection> ss : lss) {
 					if(ss instanceof HBasicAuthSS) {
-						basicAuthTest(new AAFLocator(si, new URI(aaflocate+"/AAF_NS.service:2.0")),ss);
+						basicAuthTest(new AAFLocator(si, serviceURI),ss);
 					}
 				}
 				
@@ -135,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 {
@@ -165,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 {