X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fregister%2FRegistrationCreator.java;h=fc3c18b0a09f021e9815e34515d06767a3bf78d7;hb=b3a6814af9ab63fa59d0233f5d2ebb032f0b1597;hp=ac715163b86608fc92f04852b7eb1c5277a1e66f;hpb=bd7def7ee2098af56ce66752f59c062d7923fb69;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java
index ac715163..fc3c18b0 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/register/RegistrationCreator.java
@@ -51,9 +51,11 @@ public class RegistrationCreator {
     	try {
     		String dot_le;
     		String version=null;
+    		String defProtocol="https";
     		
     		RegistrationPropHolder ph = new RegistrationPropHolder(access, port);
     		
+    		String firstPrivateHostname = null;
     		// Now, loop through by Container
     		for(String le : Split.splitTrim(',', ph.lcontainer)) {
     			if(le.isEmpty()) {
@@ -67,7 +69,7 @@ public class RegistrationCreator {
     					defData = locate = new MgmtEndpoint();
 
     					version = access.getProperty(Config.AAF_LOCATOR_VERSION, Defaults.AAF_VERSION);
-    					locate.setProtocol(access.getProperty(Config.AAF_LOCATOR_PROTOCOL,null));
+    					locate.setProtocol(defProtocol = access.getProperty(Config.AAF_LOCATOR_PROTOCOL,defProtocol));
     					List<String> ls = locate.getSubprotocol();
     					for(String sp : Split.splitTrim(',', access.getProperty(Config.AAF_LOCATOR_SUBPROTOCOL,""))) {
     						ls.add(sp);	
@@ -80,7 +82,23 @@ public class RegistrationCreator {
     				}
     				
     				locate.setName(ph.getEntryName(entry,dot_le));
-    				locate.setHostname(ph.getEntryFQDN(entry,dot_le));
+    				/* Cover the situation where there is a Container, and multiple locator Entries,
+    				 * the first of which is the only real private FQDN
+    				 * example: oauth
+    				 *      aaf_locator_entries=oauth,token,introspect
+    				 *      
+    				 *      Entries for token and introspect, but they point to oauth service.
+    				 */
+    				String locateHostname;
+    				if(le.isEmpty()) {    			
+    					locateHostname=ph.getEntryFQDN(entry, dot_le);
+    				} else if(firstPrivateHostname==null) {
+    					firstPrivateHostname=locateHostname=ph.getEntryFQDN(entry, dot_le);
+    				} else {
+    					locateHostname=firstPrivateHostname;
+    				}
+    				
+    				locate.setHostname(locateHostname);
     				locate.setPort(ph.getEntryPort(dot_le));
     				
     				String specificVersion = access.getProperty(Config.AAF_LOCATOR_VERSION + dot_le,null);
@@ -89,24 +107,36 @@ public class RegistrationCreator {
     				}
     				if(specificVersion!=null) {
     					String split[] = Split.splitTrim('.', specificVersion);
-    					locate.setPkg(split.length>3?Integer.parseInt(split[3]):0);
-    					locate.setPatch(split.length>2?Integer.parseInt(split[2]):0);
-    					locate.setMinor(split.length>1?Integer.parseInt(split[1]):0);
-    					locate.setMajor(split.length>0?Integer.parseInt(split[0]):0);
+    					String deply[]= Split.splitTrim('.', access.getProperty(Config.AAF_DEPLOYED_VERSION, ""));
+    					locate.setMajor(best(split,deply,0));
+    					locate.setMinor(best(split,deply,1));
+    					locate.setPatch(best(split,deply,2));
+    					locate.setPkg(best(split,deply,3));
     				}
 
-    				String protocol = access.getProperty(Config.AAF_LOCATOR_PROTOCOL + dot_le, null);
+    				String protocol = access.getProperty(Config.AAF_LOCATOR_PROTOCOL + dot_le, defProtocol);
     				if (protocol!=null) {
     					locate.setProtocol(protocol);
-    					String subprotocols = access.getProperty(Config.AAF_LOCATOR_SUBPROTOCOL + dot_le, null);
-    					if(subprotocols!=null) {
-    						List<String> ls = locate.getSubprotocol();
-    						for (String s : Split.split(',', subprotocols)) {
-    							ls.add(s);
-    						}
-    					}
+						List<String> ls = locate.getSubprotocol();
+						// ls cannot be null, per generated getSubprotocol code
+						if(ls.isEmpty()) {
+	    					String subprotocols = access.getProperty(Config.AAF_LOCATOR_SUBPROTOCOL + dot_le, null);
+	    					if(subprotocols==null) {
+	    						subprotocols = access.getProperty(Config.CADI_PROTOCOLS, null);
+	    					}
+	    					if(subprotocols!=null) {
+	    						for (String s : Split.split(',', subprotocols)) {
+	    							ls.add(s);
+	    						}
+	    					} else {
+	    						access.printf(Level.ERROR, "%s is required for Locator Registration of %s",
+	    								Config.AAF_LOCATOR_SUBPROTOCOL,Config.AAF_LOCATOR_PROTOCOL);
+	    					}
+						}
+        				lme.add(locate);
+    				} else {
+    					access.printf(Level.ERROR, "%s is required for Locator Registration",Config.AAF_LOCATOR_PROTOCOL);
     				}
-    				lme.add(locate);
     			}
     		}
     	} catch (NumberFormatException | UnknownHostException e) {
@@ -119,7 +149,39 @@ public class RegistrationCreator {
     	return me;
     }
 	
-    private StringBuilder print(StringBuilder sb, List<MgmtEndpoint> lme) {
+    /*
+     * Find the best version between Actual Interface and Deployed version
+     */
+    private int best(String[] split, String[] deploy, int i) {
+    	StringBuilder sb = new StringBuilder();
+    	char c;
+		String s;
+    	if(split.length>i) {
+    		s=split[i];
+			for(int j=0;j<s.length();++j) {
+				if(Character.isDigit(c=s.charAt(j))) {
+					sb.append(c);
+				} else {
+					break;
+				}
+			}
+    	}	
+		
+		if(sb.length()==0 && deploy.length>i) {
+			s=deploy[i];
+			for(int j=0;j<s.length();++j) {
+				if(Character.isDigit(c=s.charAt(j))) {
+					sb.append(c);
+				} else {
+					break;
+				}
+			}
+		}
+		
+		return sb.length()==0?0:Integer.parseInt(sb.toString());
+    }
+
+	private StringBuilder print(StringBuilder sb, List<MgmtEndpoint> lme) {
     	int cnt = 0;
 		for(MgmtEndpoint m : lme) {
 			print(sb,cnt++,m);
@@ -143,9 +205,9 @@ public class RegistrationCreator {
 		out.append('.');
 		out.append(mep.getMinor());
 		out.append('.');
-		out.append(mep.getPkg());
-		out.append('.');
 		out.append(mep.getPatch());
+		out.append('.');
+		out.append(mep.getPkg());
 		out.append("\n\tPort:       ");
 		out.append(mep.getPort());
 		out.append("\n\tProtocol:   ");
@@ -189,8 +251,8 @@ public class RegistrationCreator {
 		out.setLongitude(mep.getLongitude());
 		out.setMajor(mep.getMajor());
 		out.setMinor(mep.getMinor());
-		out.setPkg(mep.getPkg());
 		out.setPatch(mep.getPatch());
+		out.setPkg(mep.getPkg());
 		out.setPort(mep.getPort());
 		out.setProtocol(mep.getProtocol());
 		out.getSpecialPorts().addAll(mep.getSpecialPorts());