1 files changed, 22 insertions, 5 deletions
diff --git a/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java b/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java
index 23bcbda8..5f7a2fbd 100644
--- a/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java
+++ b/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java
@@ -20,15 +20,15 @@
  */
 package org.onap.dcae.controller;
 
-import static io.vavr.API.List;
-import static io.vavr.API.Try;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
-
 import io.vavr.collection.Map;
 import io.vavr.control.Option;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static io.vavr.API.List;
+import static io.vavr.API.Try;
+import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+
 final class EnvPropertiesReader {
 
     private final static Logger log = LoggerFactory.getLogger(EnvPropertiesReader.class);
@@ -36,11 +36,13 @@ final class EnvPropertiesReader {
     static Option<EnvProps> readEnvProps(Map<String, String> environmentVariables) {
         log.info("Loading necessary environment variables for dynamic configuration update");
         int consulPort = getConsulPort(environmentVariables);
+        String consulProtocol = getConsulProtocol(environmentVariables);
+        String cbsProtocol = getCbsProtocol(environmentVariables);
         Option<String> consulHost = getConsulHost(environmentVariables);
         Option<String> cbsServiceName = getCBSName(environmentVariables);
         Option<String> vesCollectorAppName = getAppName(environmentVariables);
         return Option.sequence(List(consulHost, cbsServiceName, vesCollectorAppName))
-            .map(e -> new EnvProps(e.get(0), consulPort, e.get(1), e.get(2)))
+            .map(e -> new EnvProps(consulProtocol, e.get(0), consulPort, cbsProtocol, e.get(1), e.get(2)))
             .onEmpty(() -> log.warn("Some required environment variables are missing"))
             .peek(props -> log.info(f("Discovered following environment variables: '%s'", props)));
     }
@@ -74,4 +76,19 @@ final class EnvPropertiesReader {
                 + "is missing from environment variables."));
     }
 
+    private static String getConsulProtocol(Map<String, String> environmentVariables) {
+        return getProtocolFrom("CONSUL_PROTOCOL", environmentVariables);
+    }
+
+    private static String getCbsProtocol(Map<String, String> environmentVariables) {
+        return getProtocolFrom("CBS_PROTOCOL", environmentVariables);
+    }
+
+    private static String getProtocolFrom(String variableName, Map<String, String> environmentVariables) {
+        return environmentVariables.get(variableName)
+            .onEmpty(() -> log.warn("Consul protocol (env var: '" + variableName + "') is missing "
+                + "from environment variables."))
+            .getOrElse("http");
+    }
+
 }