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

8 files changed, 37 insertions, 34 deletions

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