* 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 - * + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
* 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.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.onap.holmes.common.constant.AlarmConst; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + 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"; + + final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class); - private static String getEnv(String name) { + public static String getEnv(String name) { String value = System.getenv(name); if (value == null) { value = System.getProperty(name); @@ -43,77 +49,74 @@ public class MicroServiceConfig { } public static String getConsulAddrInfo() { - return getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF; + return "http://" + getEnv(CONSUL_HOST) + CONSUL_ADDR_SUF; } - public static String getConfigBindingServiceAddrInfo() { + public static String getServiceAddrInfoFromDcaeConsulByHostName(String hostname) { String ret = null; - String queryString = getConsulAddrInfo() + CONFIG_BINDING_SERVICE; - log.info("Query the CBS address using the URL: " + queryString); + 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 = addrJson.getString("ServiceAddress") + ":" + addrJson.getString("ServicePort"); + JsonObject addrJson = JsonParser.parseString(execQuery(queryString)) + .getAsJsonArray() + .get(0) + .getAsJsonObject(); + if (addrJson != null && addrJson.get("ServiceAddress") != null + && addrJson.get("ServicePort") != null) { + ret = "http://" + addrJson.get("ServiceAddress").getAsString() + ":" + addrJson + .get("ServicePort").getAsString(); } } catch (Exception e) { log.warn(e.getMessage(), e); } - log.info("The CBS address is " + ret); + log.info("The " + hostname + " address is " + ret); return ret; } 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); } - public static String getServiceAddrInfoFromCBS(String serviceName) { + public static String getServiceConfigInfoFromCBS(String hostname) { String ret = null; - String url = getConfigBindingServiceAddrInfo() + "/service_component/" +serviceName; + String url = getServiceAddrInfoFromDcaeConsulByHostName(getEnv(CONFIG_BINDING_SERVICE)) + "/service_component/" + hostname; try { - JSONObject jsonObject = JSONObject.fromObject(execQuery(url)); - log.info("The origin configurations (" + url + ") returned by DCAE is: " + jsonObject.toString()); - if (jsonObject.has(serviceName)) { - ret = (String) jsonObject.getJSONArray(serviceName).get(0); - } + ret = execQuery(url); } catch (Exception e) { log.warn(e.getMessage(), e); } + log.info("The query url is: " + url + ". The corresponding configurations are " + ret); return ret; } - public static String getMsbServerAddr() { - String[] addrInfo = getMsbAddrInfo(); + 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[] getMsbAddrInfo() { - String[] msbServerInfo = null; - - //String info = getServiceAddrInfoFromCBS(MSB_ADDR); - String info = getServiceAddrInfoFromCBS(getEnv(HOSTNAME)); - log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from CBS. The response is " + info + "."); - JSONObject infoObj = JSONObject.fromObject(info); - info = infoObj.has("msb.hostname") ? infoObj.getString("msb.hostname") : null; - if (info != null){ - msbServerInfo = split(info); - } else { - msbServerInfo = split(getEnv(MSB_ADDR)); - } + public static String getAaiAddr() { + return AlarmConst.HTTPS + AAI_HOSTNAME + ":8443"; + } - return msbServerInfo; + public static String[] getMsbIpAndPort() { + return split(getEnv(MSB_ADDR)); } - public static String[] getServiceAddrInfo() { + public static String[] getMicroServiceIpAndPort() { String[] serviceAddrInfo = null; - String info = getServiceAddrInfoFromCBS(getEnv(HOSTNAME)); - log.info("Got the service information of \"" + getEnv(HOSTNAME) + "\" from CBS. The response is " + info + "."); - if (info != 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)); @@ -121,10 +124,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 @@ -132,7 +139,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}; } }