X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fconfig%2FMicroServiceConfig.java;h=3d94325c7e15c1173f7537ec4192384d25b705c7;hb=refs%2Fchanges%2F95%2F78795%2F2;hp=c179280a00f83840d7904e41e1a1402e07c69676;hpb=c7fd788a1cfc030e54047701b1c1f27e42a91d1c;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
index c179280..3d94325 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java
@@ -25,15 +25,20 @@ import javax.ws.rs.core.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.onap.holmes.common.constant.AlarmConst;
 
+import java.util.regex.Pattern;
+
 @Slf4j
 public class MicroServiceConfig {
 
     final static public String CONSUL_ADDR_SUF = ":8500/v1/catalog/service/";
     final static public String CONSUL_HOST = "CONSUL_HOST";
     final static public String HOSTNAME = "HOSTNAME";
+    final static public String POD_IP = "POD_IP";
     final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";
     final static public String DOCKER_HOST = "DOCKER_HOST";
     final static public String MSB_ADDR = "MSB_ADDR";
+    final static public Pattern IP_REG = Pattern.compile("(http(s)?://)?(\\d+\\.\\d+\\.\\d+\\.\\d+)(:(\\d+))?");
+    final static public String AAI_HOSTNAME = "aai.onap";
 
     public static String getEnv(String name) {
         String value = System.getenv(name);
@@ -92,6 +97,10 @@ public class MicroServiceConfig {
         return ret;
     }
 
+    public static String getAaiAddr() {
+        return AlarmConst.HTTPS + AAI_HOSTNAME + ":8443";
+    }
+
     public static String[] getMsbIpAndPort() {
         return split(getEnv(MSB_ADDR));
     }
@@ -100,7 +109,11 @@ public class MicroServiceConfig {
         String[] serviceAddrInfo = null;
         String info = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(HOSTNAME));
         log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from Consul. The response is " + info + ".");
+
         if (info != null && !info.isEmpty()) {
+            if (!isIpAddress(info)) {
+                info = getEnv(POD_IP);
+            }
             serviceAddrInfo = split(info);
         } else {
             serviceAddrInfo = split(getEnv(HOSTNAME));
@@ -108,6 +121,10 @@ public class MicroServiceConfig {
         return serviceAddrInfo;
     }
 
+    private static boolean isIpAddress(String info) {
+        return IP_REG.matcher(info).matches();
+    }
+
     private static String[] split(String addr) {
         String ip;
         String port = "80";