From 69e393da4cce52a0491fffff2dc81fbe59aeca08 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 17 Feb 2021 15:25:45 -0500 Subject: 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 Change-Id: I7538b719631d8c10c27d059aeb4f70ce92760ebd --- .../resources/dmaap-consumer-a1Adapter-policy-1.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'northbound/dmaap-listener/src/test/resources/dmaap-consumer-a1Adapter-policy-1.properties') 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 -- cgit 1.2.3-korg