/**\r
- * Copyright 2017 ZTE Corporation.\r
+ * Copyright 2017-2021 ZTE Corporation.\r
* <p>\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
*/\r
package org.onap.holmes.common.config;\r
\r
-import com.alibaba.fastjson.JSON;\r
-import com.alibaba.fastjson.JSONObject;\r
+import com.google.gson.JsonArray;\r
+import com.google.gson.JsonObject;\r
+import com.google.gson.JsonParser;\r
+import org.onap.holmes.common.constant.AlarmConst;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
\r
import javax.ws.rs.client.Client;\r
import javax.ws.rs.client.ClientBuilder;\r
import javax.ws.rs.core.Response;\r
-\r
-import lombok.extern.slf4j.Slf4j;\r
-import org.onap.holmes.common.constant.AlarmConst;\r
-\r
import java.util.regex.Pattern;\r
\r
-@Slf4j\r
+import static org.onap.holmes.common.utils.CommonUtils.getEnv;\r
+import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;\r
+\r
public class MicroServiceConfig {\r
\r
final static public String CONSUL_ADDR_SUF = ":8500/v1/catalog/service/";\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
- final static public Pattern IP_REG = Pattern.compile("(http(s)?://)?(\\d+\\.\\d+\\.\\d+\\.\\d+)(:(\\d+))?");\r
+ final static public String MSB_IAG_SERVICE_HOST = "MSB_IAG_SERVICE_HOST";\r
+ final static public String MSB_IAG_SERVICE_PORT = "MSB_IAG_SERVICE_PORT";\r
\r
- public static String getEnv(String name) {\r
- String value = System.getenv(name);\r
- if (value == null) {\r
- value = System.getProperty(name);\r
- }\r
- return value;\r
- }\r
+ final static public String AAI_HOSTNAME = "aai.onap";\r
+\r
+ final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);\r
\r
public static String getConsulAddrInfo() {\r
return "http://" + getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;\r
String queryString = getConsulAddrInfo() + hostname;\r
log.info("Query the " + hostname + " address using the URL: " + queryString);\r
try {\r
- JSONObject addrJson = (JSONObject) JSON.parseArray(execQuery(queryString)).get(0);\r
- if (addrJson != null && addrJson.get("ServiceAddress") != null\r
- && addrJson.get("ServicePort") != null) {\r
- ret = "http://" + addrJson.getString("ServiceAddress") + ":" + addrJson\r
- .getString("ServicePort");\r
+ JsonArray addrArray = JsonParser.parseString(execQuery(queryString)).getAsJsonArray();\r
+ if (addrArray.size() > 0) {\r
+ JsonObject addrJson = addrArray.get(0).getAsJsonObject();\r
+ if (addrJson != null && addrJson.get("ServiceAddress") != null\r
+ && addrJson.get("ServicePort") != null) {\r
+ ret = "http://" + addrJson.get("ServiceAddress").getAsString() + ":" + addrJson\r
+ .get("ServicePort").getAsString();\r
+ }\r
+ } else {\r
+ log.info("No service info is returned from DCAE Consul. Hostname: {}", hostname);\r
}\r
} catch (Exception e) {\r
log.warn(e.getMessage(), e);\r
return ret;\r
}\r
\r
+ public static String getAaiAddr() {\r
+ return AlarmConst.HTTPS + AAI_HOSTNAME + ":8443";\r
+ }\r
+\r
public static String[] getMsbIpAndPort() {\r
- return split(getEnv(MSB_ADDR));\r
+ return new String[]{getEnv(MSB_IAG_SERVICE_HOST), getEnv(MSB_IAG_SERVICE_PORT)};\r
}\r
\r
public static String[] getMicroServiceIpAndPort() {\r
return serviceAddrInfo;\r
}\r
\r
- private static boolean isIpAddress(String info) {\r
- return IP_REG.matcher(info).matches();\r
- }\r
+\r
\r
private static String[] split(String addr) {\r
String ip;\r