diff options
author | 2018-10-18 14:44:52 +0800 | |
---|---|---|
committer | 2018-10-18 14:44:52 +0800 | |
commit | f0ae1a9f8d1464782a041c2361400dddbf1e890a (patch) | |
tree | ec3a2344a3d6f9c4805038cab1ffadc126ada7d9 /holmes-actions/src/main/java/org/onap | |
parent | 746543151309d116aac2ba78093574138cf26095 (diff) |
Geted Holmes IP from Env Var1.2.2
Change-Id: Idf803dd37a33cf325af71dbf43fca3fe2dacaefe
Issue-ID: HOLMES-175
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'holmes-actions/src/main/java/org/onap')
-rw-r--r-- | holmes-actions/src/main/java/org/onap/holmes/common/config/MicroServiceConfig.java | 12 |
1 files changed, 12 insertions, 0 deletions
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 c179280..66daebf 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 @@ -25,15 +25,19 @@ import javax.ws.rs.core.Response; import lombok.extern.slf4j.Slf4j;
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+))?");
public static String getEnv(String name) {
String value = System.getenv(name);
@@ -100,7 +104,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 (!isIpAddress(info)) {
+ info = getEnv(POD_IP);
+ }
serviceAddrInfo = split(info);
} else {
serviceAddrInfo = split(getEnv(HOSTNAME));
@@ -108,6 +116,10 @@ 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";
|