1 files changed, 4 insertions, 0 deletions

diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java
index 875e20ed..42f53616 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java
@@ -37,6 +37,7 @@ public class CbsClientConfigMap implements CbsClient {
     private static final Logger LOGGER = LoggerFactory.getLogger(CbsClientConfigMap.class);
     private final String configMapFilePath;
 
+
     public CbsClientConfigMap (String configMapFilePath) {
         this.configMapFilePath = configMapFilePath;
     }
@@ -44,6 +45,7 @@ public class CbsClientConfigMap implements CbsClient {
     @Override
     public @NotNull Mono<JsonObject> get(CbsRequest request) {
         return Mono.just(this.loadConfigMapFile())
+                .map(CbsClientEnvironmentParsing::processEnvironmentVariables)
                 .doOnNext(this::logConfigMapOutput);
     }
 
@@ -67,6 +69,8 @@ public class CbsClientConfigMap implements CbsClient {
         return new Yaml().load(new FileReader(configMapFilePath).getContent());
     }
 
+
+
     private void logConfigMapOutput(JsonObject jsonObject) {
         LOGGER.info("Got successful output from ConfigMap file");
         LOGGER.debug("ConfigMap output: {}", jsonObject);