Get the MSB info from DCAE Consul

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / config / MicroServiceConfig.java

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 8f9c9e8..bb78288 100644 (file)
--- 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
@@ -15,11 +15,27 @@
  */\r
 package org.onap.holmes.common.config;\r
 \r
+import javax.ws.rs.client.Client;\r
+import javax.ws.rs.client.ClientBuilder;\r
+import javax.ws.rs.core.Response;\r
+import lombok.extern.slf4j.Slf4j;\r
+import net.sf.json.JSONArray;\r
+import net.sf.json.JSONObject;\r
+import org.glassfish.jersey.client.ClientConfig;\r
+import org.onap.holmes.common.api.stat.Alarm;\r
 import org.onap.holmes.common.constant.AlarmConst;\r
 \r
+@Slf4j\r
 public class MicroServiceConfig {\r
 \r
-    private static String getProperty(String name) {\r
+    final static public String CONSUL_ADDR_SUF = ":8500/v1/catalog/service/";\r
+    final static public String CONSUL_HOST = "CONSUL_HOST";\r
+    final static public String HOSTNAME = "HOSTNAME";\r
+    final static public String CONFIG_BINDING_SERVICE = "CONFIG_BINDING_SERVICE";\r
+    final static public String DOCKER_HOST = "DOCKER_HOST";\r
+    final static public String MSB_ADDR = "MSB_ADDR";\r
+\r
+    private static String getEnv(String name) {\r
         String value = System.getenv(name);\r
         if (value == null) {\r
             value = System.getProperty(name);\r
@@ -27,24 +43,89 @@ public class MicroServiceConfig {
         return value;\r
     }\r
 \r
-    public static String getMsbServerAddr() {\r
-        return AlarmConst.HTTP + getProperty("MSB_ADDR");\r
+    public static String getConsulAddrInfo() {\r
+        return getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;\r
+    }\r
+\r
+    public static String getConfigBindingServiceAddrInfo() {\r
+        String ret = null;\r
+        String queryString = getConsulAddrInfo() + CONFIG_BINDING_SERVICE;\r
+        try {\r
+            JSONObject addrJson = (JSONObject) JSONArray.fromObject(execQuery(queryString)).get(0);\r
+            if (addrJson.has("ServiceAddress") && addrJson.has("ServicePort")) {\r
+                ret = addrJson.getString("ServiceAddress") + ":" + addrJson.getString("ServicePort");\r
+            }\r
+        } catch (Exception e) {\r
+            log.warn(e.getMessage(), e);\r
+        }\r
+        return ret;\r
     }\r
 \r
-    public static String getMsbServerIp() {\r
-        return getProperty("MSB_ADDR");\r
+    private static String execQuery(String queryString) {\r
+        Client client = ClientBuilder.newClient(new ClientConfig());\r
+        Response response = client.target(queryString).request().get();\r
+        return response.readEntity(String.class);\r
     }\r
 \r
-    public static int getMsbServerPort() {\r
+    public static String getServiceAddrInfoFromCBS(String serviceName) {\r
+        String ret = null;\r
+        String url = getConfigBindingServiceAddrInfo() + "/service_component/" +serviceName;\r
         try {\r
-            return Integer.valueOf(getProperty("MSB_PORT"));\r
-        } catch (NumberFormatException e) {\r
-            return 80;\r
+            JSONObject jsonObject = JSONObject.fromObject(execQuery(url));\r
+            if (jsonObject.has(serviceName)) {\r
+                ret = (String) jsonObject.getJSONArray(serviceName).get(0);\r
+            }\r
+        } catch (Exception e) {\r
+            log.warn(e.getMessage(), e);\r
+        }\r
+        return ret;\r
+    }\r
+\r
+    public static String getMsbServerAddr() {\r
+        String[] addrInfo = getMsbAddrInfo();\r
+        String ret = addrInfo[0] + ":" + addrInfo[1];\r
+        if (!ret.startsWith(AlarmConst.HTTP) || !ret.startsWith(AlarmConst.HTTPS)){\r
+            ret = AlarmConst.HTTP + ret;\r
         }\r
+        return ret;\r
     }\r
 \r
-    public static String getServiceIp() {\r
-        return getProperty("SERVICE_IP");\r
+    public static String[] getMsbAddrInfo() {\r
+        String[] msbServerInfo = null;\r
+\r
+        String info = getServiceAddrInfoFromCBS(MSB_ADDR);\r
+        if (info != null){\r
+            msbServerInfo = split(info);\r
+        } else {\r
+            msbServerInfo = split(getEnv(MSB_ADDR));\r
+        }\r
+\r
+        return msbServerInfo;\r
+    }\r
+\r
+    public static String[] getServiceAddrInfo() {\r
+        String[] serviceAddrInfo = null;\r
+        String info = getServiceAddrInfoFromCBS(getEnv(HOSTNAME));\r
+        if (info != null){\r
+            serviceAddrInfo = split(info);\r
+        } else {\r
+            serviceAddrInfo = split(getEnv(HOSTNAME));\r
+        }\r
+        return serviceAddrInfo;\r
+    }\r
+\r
+    private static String[] split(String addr) {\r
+        String ip;\r
+        String port = "80";\r
+        if (addr.lastIndexOf(":") == -1){\r
+            ip = addr;\r
+        } else if (addr.lastIndexOf(":") < 5 && addr.indexOf("://") != -1) {\r
+            ip = addr.substring(addr.indexOf("//") + 2);    //remove the http(s):// prefix\r
+        } else {\r
+            ip = addr.substring(addr.indexOf("://") != -1 ? addr.indexOf("//") + 2 : 0, addr.lastIndexOf(":"));\r
+            port = addr.substring(addr.lastIndexOf(":") + 1);\r
+        }\r
+        return new String[] {ip, port};\r
     }\r
 \r
 }\r