diff options
author | Dan Timoney <dtimoney@att.com> | 2021-02-17 15:25:45 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2021-02-18 16:05:55 -0500 |
commit | 69e393da4cce52a0491fffff2dc81fbe59aeca08 (patch) | |
tree | 404cc750fa69ba2a89c7a2fce921da34db5edda4 /northbound/dmaap-listener/src/test/resources/dmaap-consumer-generic-vnf.properties | |
parent | 56c27daf1656fd6436f8c818c771cf803079e1ea (diff) |
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
Diffstat (limited to 'northbound/dmaap-listener/src/test/resources/dmaap-consumer-generic-vnf.properties')
-rw-r--r-- | northbound/dmaap-listener/src/test/resources/dmaap-consumer-generic-vnf.properties | 12 |
1 files changed, 6 insertions, 6 deletions
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 |