/**\r
- * Copyright 2017 ZTE Corporation.\r
- *\r
+ * Copyright 2017-2020 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
* You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
+ * <p>\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ * <p>\r
* Unless required by applicable law or agreed to in writing, software\r
* distributed under the License is distributed on an "AS IS" BASIS,\r
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
*/\r
package org.onap.holmes.common.config;\r
\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
-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.constant.AlarmConst;\r
+import java.util.regex.Pattern;\r
\r
-@Slf4j\r
public class MicroServiceConfig {\r
\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 POD_IP = "POD_IP";\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 AAI_HOSTNAME = "aai.onap";\r
+\r
+ final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);\r
\r
- private static String getEnv(String name) {\r
+ public static String getEnv(String name) {\r
String value = System.getenv(name);\r
if (value == null) {\r
value = System.getProperty(name);\r
}\r
\r
public static String getConsulAddrInfo() {\r
- return getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;\r
+ return "http://" + getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF;\r
}\r
\r
- public static String getConfigBindingServiceAddrInfo() {\r
+ public static String getServiceAddrInfoFromDcaeConsulByHostName(String hostname) {\r
String ret = null;\r
- String queryString = getConsulAddrInfo() + CONFIG_BINDING_SERVICE;\r
+ String queryString = getConsulAddrInfo() + hostname;\r
+ log.info("Query the " + hostname + " address using the URL: " + queryString);\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
+ JsonObject addrJson = JsonParser.parseString(execQuery(queryString))\r
+ .getAsJsonArray()\r
+ .get(0)\r
+ .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
} catch (Exception e) {\r
log.warn(e.getMessage(), e);\r
}\r
+ log.info("The " + hostname + " address is " + ret);\r
return ret;\r
}\r
\r
private static String execQuery(String queryString) {\r
- Client client = ClientBuilder.newClient(new ClientConfig());\r
+ Client client = ClientBuilder.newBuilder().build();\r
Response response = client.target(queryString).request().get();\r
return response.readEntity(String.class);\r
}\r
\r
- public static String getServiceAddrInfoFromCBS(String serviceName) {\r
+ public static String getServiceConfigInfoFromCBS(String hostname) {\r
String ret = null;\r
- String url = getConfigBindingServiceAddrInfo() + "/service_component/" +serviceName;\r
+ String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname;\r
try {\r
- JSONObject jsonObject = JSONObject.fromObject(execQuery(url));\r
- if (jsonObject.has(serviceName)) {\r
- ret = (String) jsonObject.getJSONArray(serviceName).get(0);\r
- }\r
+ ret = execQuery(url);\r
} catch (Exception e) {\r
log.warn(e.getMessage(), e);\r
}\r
+ log.info("The query url is: " + url + ". The corresponding configurations are " + ret);\r
return ret;\r
}\r
\r
- public static String getMsbServerAddr() {\r
- String[] addrInfo = getMsbAddrInfo();\r
+ public static String getMsbServerAddrWithHttpPrefix() {\r
+ String[] addrInfo = getMsbIpAndPort();\r
String ret = addrInfo[0] + ":" + addrInfo[1];\r
- if (!ret.startsWith(AlarmConst.HTTP) || !ret.startsWith(AlarmConst.HTTPS)){\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[] 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
+ public static String getAaiAddr() {\r
+ return AlarmConst.HTTPS + AAI_HOSTNAME + ":8443";\r
+ }\r
\r
- return msbServerInfo;\r
+ public static String[] getMsbIpAndPort() {\r
+ return split(getEnv(MSB_ADDR));\r
}\r
\r
- public static String[] getServiceAddrInfo() {\r
+ public static String[] getMicroServiceIpAndPort() {\r
String[] serviceAddrInfo = null;\r
- String info = getServiceAddrInfoFromCBS(getEnv(HOSTNAME));\r
- if (info != null){\r
+ String info = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(HOSTNAME));\r
+ log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from Consul. The response is " + info + ".");\r
+\r
+ if (info != null && !info.isEmpty()) {\r
+ if (!isIpAddress(info)) {\r
+ info = getEnv(POD_IP);\r
+ }\r
serviceAddrInfo = split(info);\r
} else {\r
serviceAddrInfo = split(getEnv(HOSTNAME));\r
return serviceAddrInfo;\r
}\r
\r
+ private static boolean isIpAddress(String info) {\r
+ return IP_REG.matcher(info).matches();\r
+ }\r
+\r
private static String[] split(String addr) {\r
String ip;\r
String port = "80";\r
- if (addr.lastIndexOf(":") == -1){\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
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
+ return new String[]{ip, port};\r
}\r
\r
}\r
Code Review / holmes / common.git / blobdiff