Removed MSB Invocation During AAI Calling

[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 191d897..df3a7df 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
@@ -18,6 +18,7 @@ package org.onap.holmes.common.config;
 import com.google.gson.JsonArray;\r
 import com.google.gson.JsonObject;\r
 import com.google.gson.JsonParser;\r
+import org.apache.commons.lang3.StringUtils;\r
 import org.onap.holmes.common.constant.AlarmConst;\r
 import org.onap.holmes.common.utils.JerseyClient;\r
 import org.slf4j.Logger;\r
@@ -35,8 +36,14 @@ public class MicroServiceConfig {
     final static public String MSB_ADDR = "MSB_ADDR";\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
-    final static public String AAI_HOSTNAME = "aai.onap";\r
+    final static public String BASE_URL = "BASE_URL";\r
+    final static public String PRE_ADDR = "PRE_ADDR";\r
+    final static public String POST_ADDR = "POST_ADDR";\r
+    final static public String AAI_ADDR = "AAI_BASEADDR";\r
+    final static public String PROTOCOL_HTTP = "http";\r
+    final static public String PROTOCOL_HTTPS = "https";\r
+    final static public int PLAIN_PORT = 80;\r
+    final static public int TLS_PORT = 443;\r
 \r
     final static public Logger log = LoggerFactory.getLogger(MicroServiceConfig.class);\r
 \r
@@ -88,7 +95,15 @@ public class MicroServiceConfig {
     }\r
 \r
     public static String getAaiAddr() {\r
-        return AlarmConst.HTTPS + AAI_HOSTNAME + ":8443";\r
+        boolean tlsEnabled = Boolean.valueOf(getEnv("ENABLE_ENCRYPT"));\r
+\r
+        return String.format("%s://%s%s%s.%s:%d",\r
+                tlsEnabled ? PROTOCOL_HTTPS : PROTOCOL_HTTP,\r
+                nullToEmptyString(getEnv(PRE_ADDR)),\r
+                nullToEmptyString(getEnv(AAI_ADDR)),\r
+                nullToEmptyString(getEnv(POST_ADDR)),\r
+                nullToEmptyString(getEnv(BASE_URL)),\r
+                tlsEnabled ? TLS_PORT : PLAIN_PORT);\r
     }\r
 \r
     public static String[] getMsbIpAndPort() {\r
@@ -118,4 +133,8 @@ public class MicroServiceConfig {
         return new String[]{ip, port};\r
     }\r
 \r
+    private static String nullToEmptyString(String input) {\r
+        return input == null ? StringUtils.EMPTY : input;\r
+    }\r
+\r
 }\r