Add new EnvProperties class

Added new class EnvProperties, which extends java.util.Properties
and supports property values containing embedded environment
variable references.  Updated code to use this class to load
svclogic.properties, and updated dmaap listener to use
that class to load dmaap listener configuration.

Issue-ID: SDNC-1482
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I7538b719631d8c10c27d059aeb4f70ce92760ebd

18 files changed, 97 insertions, 52 deletions

diff --git a/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java b/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java
index 7ee2a91d7..3d32c7d74 100755
--- a/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java
+++ b/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupProvider.java
@@ -48,6 +48,7 @@ import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 import javax.annotation.Nonnull;
 import org.eclipse.jdt.annotation.NonNull;
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
@@ -112,7 +113,7 @@ public class DaeximOffsiteBackupProvider implements AutoCloseable, DaeximOffsite
     private void loadProperties() {
         LOG.info("Loading properties from " + PROPERTIES_FILE);
         if(properties == null)
-            properties = new Properties();
+            properties = new EnvProperties();
         File propertiesFile = new File(PROPERTIES_FILE);
         if(!propertiesFile.exists()) {
             LOG.warn("Properties file (" + PROPERTIES_FILE + ") not found. Using default properties.");
diff --git a/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupUtil.java b/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupUtil.java
index 7adb2fa1b..d53d2fcae 100755
--- a/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupUtil.java
+++ b/northbound/daexim-offsite-backup/provider/src/main/java/org/onap/ccsdk/sli/northbound/daeximoffsitebackup/DaeximOffsiteBackupUtil.java
@@ -33,7 +33,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsiteb
 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.daeximoffsitebackup.rev180926.RetrieveDataOutputBuilder;
 
 import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
-
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,7 +43,7 @@ public class DaeximOffsiteBackupUtil extends MdsalHelper {
 
     public static void loadProperties() {
         File file = new File(PROPERTIES_FILE);
-        Properties properties = new Properties();
+        Properties properties = new EnvProperties();
         InputStream input = null;
         if(file.isFile() && file.canRead()) {
             try {
diff --git a/northbound/daexim-offsite-backup/provider/src/main/resources/daexim-offsite-backup.properties b/northbound/daexim-offsite-backup/provider/src/main/resources/daexim-offsite-backup.properties
index 51efc1f1e..3a0ce3591 100755
--- a/northbound/daexim-offsite-backup/provider/src/main/resources/daexim-offsite-backup.properties
+++ b/northbound/daexim-offsite-backup/provider/src/main/resources/daexim-offsite-backup.properties
@@ -20,9 +20,9 @@
 # Example properties file
 
 daeximDirectory=/opt/opendaylight/current/daexim/
-credentials=admin:enc:YWRtaW4xMjM=
+credentials=${ODL_USER}:${ODL_PASSWORD}
 nexusUrl=http://localhost:8081/nexus/content/repositories/
 podName=UNKNOWN_ODL
 file.operational=odl_backup_operational.json
 file.models=odl_backup_models.json
-file.config=odl_backup_config.json
\ No newline at end of file
+file.config=odl_backup_config.json
diff --git a/northbound/daexim-offsite-backup/provider/src/test/resources/daexim-offsite-backup.properties b/northbound/daexim-offsite-backup/provider/src/test/resources/daexim-offsite-backup.properties
index b69027906..bb1f28a0c 100755
--- a/northbound/daexim-offsite-backup/provider/src/test/resources/daexim-offsite-backup.properties
+++ b/northbound/daexim-offsite-backup/provider/src/test/resources/daexim-offsite-backup.properties
@@ -18,9 +18,9 @@
 # ============LICENSE_END=========================================================
 
 daeximDirectory=/opt/opendaylight/current/daexim/
-credentials=admin:admin123
+credentials=${ODL_USER}:${ODL_PASSWORD}
 nexusUrl=http://localhost:8081/nexus/content/repositories/
 podName=UNKNOWN_ODL
 file.operational=odl_backup_operational.json
 file.models=odl_backup_models.json
-file.config=odl_backup_config.json
\ No newline at end of file
+file.config=odl_backup_config.json
diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml
index 702ad369e..0d245a341 100755
--- a/northbound/dmaap-listener/pom.xml
+++ b/northbound/dmaap-listener/pom.xml
@@ -142,7 +142,19 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <environmentVariables>
+                        <DMAAP_USER>test</DMAAP_USER>
+                        <DMAAP_PASSWORD>test</DMAAP_PASSWORD>
+                        <DMAAP_AUTHKEY>ABC123</DMAAP_AUTHKEY>
+                        <ODL_USER>admin</ODL_USER>
+                        <ODL_PASSWORD>admin</ODL_PASSWORD>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java
index 18c00d563..1c10b68e7 100755
--- a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java
+++ b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/DmaapListener.java
@@ -26,6 +26,8 @@ import java.io.FileInputStream;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
+
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +40,7 @@ public class DmaapListener {
 
     public static void main(String[] args) {
 
-        Properties properties = new Properties();
+        Properties properties = new EnvProperties(); // Use EnvProperties to resolve env variables in values
         String propFileName = DMAAP_LISTENER_PROPERTIES;
         String propPath = null;
         String propDir = System.getProperty(SDNC_CONFIG_DIR);
diff --git a/northbound/dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestDmaapListener.java b/northbound/dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestDmaapListener.java
index 943ef0204..48eaa699d 100644
--- a/northbound/dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestDmaapListener.java
+++ b/northbound/dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestDmaapListener.java
@@ -8,6 +8,7 @@ import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +25,7 @@ public class TestDmaapListener {
 
 	@Test
 	public void test() {
-		Properties properties = new Properties();
+		Properties properties = new EnvProperties();
 		String propFileName = DMAAP_LISTENER_PROPERTIES;
 		String propPath = null;
 		String propDir = DMAAP_LISTENER_PROPERTIES_DIR;
diff --git a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-1.properties b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-1.properties
index ae83ef8c2..5ec838f31 100755
--- a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-1.properties
+++ b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-1.properties
@@ -8,10 +8,10 @@ Partner =
 SubContextPath =/
 Protocol =http
 MethodType =GET
-username =test
-password =test
+username =${DMAAP_USER}
+password =${DMAAP_PASSWORD}
 contenttype =application/json
-authKey=ABC123
+authKey=${DMAAP_AUTHKEY}
 authDate=2016-05-10T13:13:50-0700
 host=localhost:3904
 topic=ccsdk-topic
@@ -29,7 +29,7 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
 AFT_DME2_EP_READ_TIMEOUT_MS=50000
 sessionstickinessrequired=NO
 DME2preferredRouterFilePath=src/test/resources/dmaap-listener.preferredRoute.txt
-sdnc.odl.user=admin
-sdnc.odl.password=admin
+sdnc.odl.user=${ODL_USER}
+sdnc.odl.password=${ODL_PASSWORD}
 sdnc.odl.url-base=http://localhost:8282/restconf/operations
 
diff --git a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-a1Adapter-policy-1.properties b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-a1Adapter-policy-1.properties
index edb7c453e..63bc4426d 100644
--- a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-a1Adapter-policy-1.properties
+++ b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-a1Adapter-policy-1.properties
@@ -9,10 +9,10 @@ routeOffer=MR1
 SubContextPath =/
 Protocol =http
 MethodType =GET
-username =admin
-password =admin
+username =${DMAAP_USER}
+password =${DMAAP_PASSWORD}
 contenttype =application/json
-authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs=
+authKey=${DMAAP_AUTHKEY}
 authDate=2019-04-09T04:28:40-05:00
 host=message-router.onap:3904
 topic=A1-P
@@ -30,6 +30,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
 AFT_DME2_EP_READ_TIMEOUT_MS=50000
 sessionstickinessrequired=NO
 DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt
-sdnc.odl.user=admin
-sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+sdnc.odl.user=${ODL_USER}
+sdnc.odl.password=${ODL_PASSWORD}
 sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations
diff --git a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-cMNotify-1.properties b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-cMNotify-1.properties
index aae34a26f..b399d27f1 100644
--- a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-cMNotify-1.properties
+++ b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-cMNotify-1.properties
@@ -9,10 +9,10 @@ routeOffer=MR1
 SubContextPath =/
 Protocol =http
 MethodType =GET
-username =admin
-password =admin
+username =${DMAAP_USER}
+password =${DMAAP_PASSWORD}
 contenttype =application/json
-authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs=
+authKey=${DMAAP_AUTHKEY}
 authDate=2019-04-09T04:28:40-05:00
 host=message-router.onap:3904
 topic=CM-NOTIFICATION
@@ -30,6 +30,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
 AFT_DME2_EP_READ_TIMEOUT_MS=50000
 sessionstickinessrequired=NO
 DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt
-sdnc.odl.user=admin
-sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+sdnc.odl.user=${ODL_USER}
+sdnc.odl.password=${ODL_PASSWORD}
 sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations
diff --git a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-esrsysteminfo.properties b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-esrsysteminfo.properties
index 9f5cfe71f..785d636bb 100644
--- a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-esrsysteminfo.properties
+++ b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-esrsysteminfo.properties
@@ -8,10 +8,10 @@ Partner =
 SubContextPath =/
 Protocol =https
 MethodType =GET
-username =test
-password =test
+username =${DMAAP_USER}
+password =${DMAAP_PASSWORD}
 contenttype =application/json
-authKey=ABC123
+authKey=${DMAAP_AUTHKEY}
 authDate=2016-05-10T13:13:50-0700
 host=localhost:3904
 topic=AAI-EVENT
@@ -29,6 +29,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
 AFT_DME2_EP_READ_TIMEOUT_MS=50000
 sessionstickinessrequired=NO
 DME2preferredRouterFilePath=src/test/resources/dmaap-listener.preferredRoute.txt
-sdnc.odl.user=admin
-sdnc.odl.password=admin
+sdnc.odl.user=${ODL_USER}
+sdnc.odl.password=${ODL_PASSWORD}
 sdnc.odl.url-base=http://localhost:8181/restconf/operations
\ No newline at end of file
diff --git a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-generic-vnf.properties b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-generic-vnf.properties
index 710a7c7c9..d0e187d08 100644
--- a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-generic-vnf.properties
+++ b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-generic-vnf.properties
@@ -8,10 +8,10 @@ Partner =
 SubContextPath =/
 Protocol =https
 MethodType =GET
-username =test
-password =test
+username =${DMAAP_USER}
+password =${DMAAP_PASSWORD}
 contenttype =application/json
-authKey=ABC123
+authKey=${DMAAP_AUTHKEY}
 authDate=2016-05-10T13:13:50-0700
 host=localhost:3904
 topic=AAI-EVENT
@@ -29,6 +29,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
 AFT_DME2_EP_READ_TIMEOUT_MS=50000
 sessionstickinessrequired=NO
 DME2preferredRouterFilePath=src/test/resources/dmaap-listener.preferredRoute.txt
-sdnc.odl.user=admin
-sdnc.odl.password=admin
-sdnc.odl.url-base=http://localhost:8181/restconf/operations
\ No newline at end of file
+sdnc.odl.user=${ODL_USER}
+sdnc.odl.password=${ODL_PASSWORD}
+sdnc.odl.url-base=http://localhost:8181/restconf/operations
diff --git a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-pserver.properties b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-pserver.properties
index 9f5cfe71f..2fb525e89 100644
--- a/northbound/dmaap-listener/src/test/resources/dmaap-consumer-pserver.properties
+++ b/northbound/dmaap-listener/src/test/resources/dmaap-consumer-pserver.properties
@@ -8,10 +8,10 @@ Partner =
 SubContextPath =/
 Protocol =https
 MethodType =GET
-username =test
-password =test
+username =${DMAAP_USER}
+password =${DMAAP_PASSWORD}
 contenttype =application/json
-authKey=ABC123
+authKey=${DMAAP_AUTHKEY}
 authDate=2016-05-10T13:13:50-0700
 host=localhost:3904
 topic=AAI-EVENT
@@ -29,6 +29,6 @@ AFT_DME2_ROUNDTRIP_TIMEOUT_MS=240000
 AFT_DME2_EP_READ_TIMEOUT_MS=50000
 sessionstickinessrequired=NO
 DME2preferredRouterFilePath=src/test/resources/dmaap-listener.preferredRoute.txt
-sdnc.odl.user=admin
-sdnc.odl.password=admin
-sdnc.odl.url-base=http://localhost:8181/restconf/operations
\ No newline at end of file
+sdnc.odl.user=${ODL_USER}
+sdnc.odl.password=${ODL_PASSWORD}
+sdnc.odl.url-base=http://localhost:8181/restconf/operations
diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml
index bd6f762d0..57c75fe7c 100755
--- a/northbound/lcm/provider/pom.xml
+++ b/northbound/lcm/provider/pom.xml
@@ -89,4 +89,31 @@
 			<scope>test</scope>
 		</dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<environmentVariables>
+						<MYSQL_USER>dummyUser</MYSQL_USER>
+						<MYSQL_PASSWORD>dummyPassword</MYSQL_PASSWORD>
+						<MYSQL_DATABASE>dummyDatabase</MYSQL_DATABASE>
+					</environmentVariables>
+				</configuration>
+			</plugin>
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <environmentVariables>
+                        <MYSQL_USER>dummyUser</MYSQL_USER>
+                        <MYSQL_PASSWORD>dummyPassword</MYSQL_PASSWORD>
+                        <MYSQL_DATABASE>dummyDatabase</MYSQL_DATABASE>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/northbound/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java b/northbound/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java
index 85325cb56..09cf97cc4 100644
--- a/northbound/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java
+++ b/northbound/lcm/provider/src/test/java/org/onap/ccsdk/sli/northbound/TestLcmProvider.java
@@ -20,6 +20,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicClassResolver;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicPropertiesProviderImpl;
 import org.onap.ccsdk.sli.core.sli.provider.SvcLogicServiceImpl;
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
@@ -134,7 +135,7 @@ public class TestLcmProvider {
 
         // Load svclogic.properties and get a SvcLogicStore
         InputStream propStr = TestLcmProvider.class.getResourceAsStream("/svclogic.properties");
-        Properties svcprops = new Properties();
+        Properties svcprops = new EnvProperties();
         svcprops.load(propStr);
 
         SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(svcprops);
diff --git a/northbound/lcm/provider/src/test/resources/svclogic.properties b/northbound/lcm/provider/src/test/resources/svclogic.properties
index 426960f76..85818d7b6 100644
--- a/northbound/lcm/provider/src/test/resources/svclogic.properties
+++ b/northbound/lcm/provider/src/test/resources/svclogic.properties
@@ -20,8 +20,8 @@
 ###
 
 org.onap.ccsdk.sli.dbtype = jdbc
-org.onap.ccsdk.sli.jdbc.url=jdbc:derby:memory:sdnctl;create=true
+org.onap.ccsdk.sli.jdbc.url=jdbc:derby:memory:${MYSQL_DATABASE};create=true
 org.onap.ccsdk.sli.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-org.onap.ccsdk.sli.jdbc.database = sdnctl
-org.onap.ccsdk.sli.jdbc.user = test
-org.onap.ccsdk.sli.jdbc.password = test
+org.onap.ccsdk.sli.jdbc.database = ${MYSQL_DATABASE}
+org.onap.ccsdk.sli.jdbc.user = ${MYSQL_USER}
+org.onap.ccsdk.sli.jdbc.password = ${MYSQL_PASSWORD}
diff --git a/northbound/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java b/northbound/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
index 0088a14a8..4efc29b77 100644
--- a/northbound/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
+++ b/northbound/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebConfiguration.java
@@ -30,6 +30,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.onap.sdc.api.consumer.IConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -119,7 +120,7 @@ public class SdncUebConfiguration implements IConfiguration{
 							+ propFile);
 		}
 
-		Properties props = new Properties();
+		Properties props = new EnvProperties();
 		props.load(new FileInputStream(propFile));
 
 		asdcAddress = props.getProperty("org.onap.ccsdk.sli.northbound.uebclient.asdc-address");
diff --git a/northbound/ueb-listener/src/test/resources/ueb-listener.properties b/northbound/ueb-listener/src/test/resources/ueb-listener.properties
index c017cbd7b..9cce1a7ba 100755
--- a/northbound/ueb-listener/src/test/resources/ueb-listener.properties
+++ b/northbound/ueb-listener/src/test/resources/ueb-listener.properties
@@ -2,10 +2,10 @@ org.onap.ccsdk.sli.northbound.uebclient.asdc-address=localhost:1234
 org.onap.ccsdk.sli.northbound.uebclient.consumer-group=ccsdk1
 org.onap.ccsdk.sli.northbound.uebclient.consumer-id=localhost_ccsdk1
 org.onap.ccsdk.sli.northbound.uebclient.environment-name=UNITTEST
-org.onap.ccsdk.sli.northbound.uebclient.password=123456
-org.onap.ccsdk.sli.northbound.uebclient.user=test
-org.onap.ccsdk.sli.northbound.uebclient.sdnc-user=test
-org.onap.ccsdk.sli.northbound.uebclient.sdnc-passwd=test
+org.onap.ccsdk.sli.northbound.uebclient.password=${ASDC_PASSWORD}
+org.onap.ccsdk.sli.northbound.uebclient.user=${ASDC_USER}
+org.onap.ccsdk.sli.northbound.uebclient.sdnc-user=${ODL_USER}
+org.onap.ccsdk.sli.northbound.uebclient.sdnc-passwd=${ODL_PASSWORD}
 org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url=http://localhost:8282/restconf/operations/
 org.onap.ccsdk.sli.northbound.uebclient.asdc-api-namespace=org:onap:ccsdk
 org.onap.ccsdk.sli.northbound.uebclient.spool.incoming=src/test/resources/incoming