Fix testing results for Authn

Issue-ID: AAF-361
Change-Id: I8f78b41580368610e126aa4cc7cadf8ef204d03a
Signed-off-by: Instrumental <jonathan.gathman@att.com>

8 files changed, 18 insertions, 10 deletions

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 d873205c..35bcc5a9 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,7 +79,7 @@ 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(aaflocate+"/locate/AAF_NS.service:2.0");
 
 				for(URI uri : new URI[] {
 						serviceURI,
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLocator.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLocator.java
index 4ae1a051..00a40568 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLocator.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLocator.java
@@ -88,7 +88,7 @@ public class AAFLocator extends AbsAAFLocator<BasicTrans>  {
 							locatorURI.getUserInfo(),
 							locatorURI.getHost(),
 							locatorURI.getPort(),
-							"/locate/"+name + '/' + version,
+							"/locate/"+name + ':' + version,
 							null,
 							null
 							);
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
index c2848980..28bf6592 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
@@ -63,10 +63,10 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
 		super(pa, new RosettaEnv(pa.getProperties()),Token.class,"outgoing");
 		
 		if(access.getProperty(Config.AAF_OAUTH2_TOKEN_URL,null)==null) {
-			access.getProperties().put(Config.AAF_OAUTH2_TOKEN_URL, "https://AAF_LOCATE_URL/AAF_NS.token/2.0"); // Default to AAF
+			access.getProperties().put(Config.AAF_OAUTH2_TOKEN_URL, "https://AAF_LOCATE_URL/AAF_NS.token:2.0"); // Default to AAF
 		}
 		if(access.getProperty(Config.AAF_OAUTH2_INTROSPECT_URL,null)==null) {
-			access.getProperties().put(Config.AAF_OAUTH2_INTROSPECT_URL, "https://AAF_LOCATE_URL/AAF_NS.introspect/2.0"); // Default to AAF);
+			access.getProperties().put(Config.AAF_OAUTH2_INTROSPECT_URL, "https://AAF_LOCATE_URL/AAF_NS.introspect:2.0"); // Default to AAF);
 		}
 
 		symm = Symm.encrypt.obtain();
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java
index eeb9c623..e651fbc7 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java
@@ -105,7 +105,7 @@ public class JU_AAFLocator {
 		access.setProperty(Config.CADI_LATITUDE, "38.62");  // St Louis approx lat
 		access.setProperty(Config.CADI_LONGITUDE, "90.19");  // St Louis approx lon
 		SecurityInfoC<HttpURLConnection> si = SecurityInfoC.instance(access, HttpURLConnection.class);
-		URI locatorURI = new URI("https://somemachine.moc:10/com.att.aaf.service/2.0");
+		URI locatorURI = new URI("https://somemachine.moc:10/com.att.aaf.service:2.0");
 		AbsAAFLocator<BasicTrans> al = new AAFLocator(si, locatorURI) {
 			@Override
 			protected HClient createClient(SecuritySetter<HttpURLConnection> ss, URI uri, int connectTimeout) throws LocatorException {
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 dfcf7e3d..b4e31f2f 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
@@ -474,6 +474,14 @@ public class Config {
 			}
 		}
 		
+		// Add BasicAuth, if any, to x509Taf
+		if(x509TAF!=null) {
+			for( HttpTaf ht : htlist) {
+				if(ht instanceof BasicHttpTaf) {
+					x509TAF.add((BasicHttpTaf)ht);
+				}
+			}
+		}
 		/////////////////////////////////////////////////////
 		// Create EpiTaf from configured TAFs
 		/////////////////////////////////////////////////////
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java b/cadi/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
index ac824d0a..8fc985cf 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/taf/basic/BasicHttpTaf.java
@@ -130,7 +130,7 @@ public class BasicHttpTaf implements HttpTaf {
 
 				// ONLY FOR Last Ditch DEBUGGING... 
 				// access.log(Level.WARN,ba.getName() + ":" + new String(ba.getCred()));
-				if(cv.validate(ba.getShortName(), Type.PASSWORD, ba.getCred(), req)) {
+				if(cv.validate(ba.getName(), Type.PASSWORD, ba.getCred(), req)) {
 					return new BasicHttpTafResp(access,ba, ba.getName()+" authenticated by BasicAuth password",RESP.IS_AUTHENTICATED,resp,realm,false);
 				} else {
 					//TODO may need timed retries in a given time period
diff --git a/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OAuthExample.java b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OAuthExample.java
index 39e7b5b6..835e699b 100644
--- a/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OAuthExample.java
+++ b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OAuthExample.java
@@ -73,12 +73,12 @@ public class OAuthExample {
 		
 		// Obtain Endpoints for OAuth2 from Properties.  Expected is "cadi.properties" file, pointed to by "cadi_prop_files"
 		String tokenServiceURL = access.getProperty(Config.AAF_OAUTH2_TOKEN_URL,
-				"https://AAF_LOCATE_URL/AAF_NS.token/2.0"); // Default to AAF
+				"https://AAF_LOCATE_URL/AAF_NS.token:2.0"); // Default to AAF
 		String tokenIntrospectURL = access.getProperty(Config.AAF_OAUTH2_INTROSPECT_URL,
-				"https://AAF_LOCATE_URL/AAF_NS.introspect/2.0"); // Default to AAF);
+				"https://AAF_LOCATE_URL/AAF_NS.introspect:2.0"); // Default to AAF);
 		// Get Hello Service
 		final String endServicesURL = access.getProperty(Config.AAF_OAUTH2_HELLO_URL, 
-				"https://AAF_LOCATE_URL/AAF_NS.hello/2.0");
+				"https://AAF_LOCATE_URL/AAF_NS.hello:2.0");
 
 		final int CALL_TIMEOUT = Integer.parseInt(access.getProperty(Config.AAF_CALL_TIMEOUT,Config.AAF_CALL_TIMEOUT_DEF));
 		
diff --git a/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OnapClientExample.java b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OnapClientExample.java
index 441be4d2..4b29518f 100644
--- a/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OnapClientExample.java
+++ b/cadi/oauth-enduser/src/test/java/org/onap/aaf/cadi/enduser/test/OnapClientExample.java
@@ -104,7 +104,7 @@ public class OnapClientExample {
 				// These should NOT be used cross thread.
 				// Get Hello Service URL... roll your own in your own world.
 				final String endServicesURL = access.getProperty(Config.AAF_OAUTH2_HELLO_URL, 
-						"https://AAF_LOCATE_URL/AAF_NS.hello/2.0");
+						"https://AAF_LOCATE_URL/AAF_NS.hello:2.0");
 
 
 				TzClient helloClient = tcf.newTzClient(endServicesURL);