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=76e5d677724b13160bb3360b734239192b7be20e;hp=2be8824ebb8e1fd634f581a5cb49840c615c91d0;hpb=1be6bdd6b55219294a9ce6f708433fef3737cc13;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 2be8824..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
@@ -1,12 +1,12 @@
 /**
  * Copyright  2017 ZTE Corporation.
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,26 +15,32 @@
  */
 package org.onap.holmes.common.config;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
+
 import lombok.extern.slf4j.Slf4j;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.glassfish.jersey.client.ClientConfig;
 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";
 
-    private static String getEnv(String name) {
+    public static String getEnv(String name) {
         String value = System.getenv(name);
         if (value == null) {
             value = System.getProperty(name);
@@ -51,9 +57,11 @@ public class MicroServiceConfig {
         String queryString = getConsulAddrInfo() + hostname;
         log.info("Query the " + hostname + " address using the URL: " + queryString);
         try {
-            JSONObject addrJson = (JSONObject) JSONArray.fromObject(execQuery(queryString)).get(0);
-            if (addrJson.has("ServiceAddress") && addrJson.has("ServicePort")) {
-                ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson.getString("ServicePort");
+            JSONObject addrJson = (JSONObject) JSON.parseArray(execQuery(queryString)).get(0);
+            if (addrJson != null && addrJson.get("ServiceAddress") != null
+                    && addrJson.get("ServicePort") != null) {
+                ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson
+                        .getString("ServicePort");
             }
         } catch (Exception e) {
             log.warn(e.getMessage(), e);
@@ -63,7 +71,7 @@ public class MicroServiceConfig {
     }
 
     private static String execQuery(String queryString) {
-        Client client = ClientBuilder.newClient(new ClientConfig());
+        Client client = ClientBuilder.newBuilder().build();
         Response response = client.target(queryString).request().get();
         return response.readEntity(String.class);
     }
@@ -83,12 +91,16 @@ public class MicroServiceConfig {
     public static String getMsbServerAddrWithHttpPrefix() {
         String[] addrInfo = getMsbIpAndPort();
         String ret = addrInfo[0] + ":" + addrInfo[1];
-        if (!ret.startsWith(AlarmConst.HTTP) || !ret.startsWith(AlarmConst.HTTPS)){
+        if (!ret.startsWith(AlarmConst.HTTP) || !ret.startsWith(AlarmConst.HTTPS)) {
             ret = AlarmConst.HTTP + ret;
         }
         return ret;
     }
 
+    public static String getAaiAddr() {
+        return AlarmConst.HTTPS + AAI_HOSTNAME + ":8443";
+    }
+
     public static String[] getMsbIpAndPort() {
         return split(getEnv(MSB_ADDR));
     }
@@ -97,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 (info != null && !info.isEmpty()) {
+            if (!isIpAddress(info)) {
+                info = getEnv(POD_IP);
+            }
             serviceAddrInfo = split(info);
         } else {
             serviceAddrInfo = split(getEnv(HOSTNAME));
@@ -105,10 +121,14 @@ 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";
-        if (addr.lastIndexOf(":") == -1){
+        if (addr.lastIndexOf(":") == -1) {
             ip = addr;
         } else if (addr.lastIndexOf(":") < 5 && addr.indexOf("://") != -1) {
             ip = addr.substring(addr.indexOf("//") + 2);    //remove the http(s):// prefix
@@ -116,7 +136,7 @@ public class MicroServiceConfig {
             ip = addr.substring(addr.indexOf("://") != -1 ? addr.indexOf("//") + 2 : 0, addr.lastIndexOf(":"));
             port = addr.substring(addr.lastIndexOf(":") + 1);
         }
-        return new String[] {ip, port};
+        return new String[]{ip, port};
     }
 
 }