diff options
author | Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com> | 2021-05-06 10:27:19 +0200 |
---|---|---|
committer | Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com> | 2021-05-18 09:23:13 +0200 |
commit | 9779ca13ed180fc69cdad5336b30a26edfd7d0fa (patch) | |
tree | 76bde46fd31315a1728d91670743552d3121e332 /rest-services/cbs-client/src/test/resources | |
parent | 100e06241c0bce987b53ebe03b103eb19d282a81 (diff) |
Add to Java CBS-Client ability to resolve evns in app-config.yaml loaded from ConfigMap
Change-Id: Ic85c1511133594500bdf31b9d491cc70d34ff5d5
Issue-ID: DCAEGEN2-2716
Signed-off-by: Tomasz Pietruszkiewicz <tomasz.pietruszkiewicz@nokia.com>
Diffstat (limited to 'rest-services/cbs-client/src/test/resources')
3 files changed, 101 insertions, 4 deletions
diff --git a/rest-services/cbs-client/src/test/resources/application_config.yaml b/rest-services/cbs-client/src/test/resources/application_config.yaml index c43b9733..a2466802 100644 --- a/rest-services/cbs-client/src/test/resources/application_config.yaml +++ b/rest-services/cbs-client/src/test/resources/application_config.yaml @@ -1,10 +1,38 @@ --- +keystore.path: "/var/run/security/keystore.p12" streams_publishes: perf3gpp: + testArray: + - testPrimitiveArray: + - "${AAF_USER}" + - "${AAF_PASSWORD}" + - nestedArray: + - "${AAF_USER}" + testPrimitive: "${AAF_USER}" + aaf_credentials: + username: "${AAF_USER}" + password: "${AAF_PASSWORD}" type: kafka + kafka_info: + bootstrap_servers: dmaap-mr-kafka:6060 + topic_name: HVVES_PERF3GPP + pnf_ready: + aaf_credentials: + username: "${AAF_USER}" + password: "${AAF_PASSWORD}" + type: message_router + dmaap_info: + topic_url: http://message-router:3904/events/VES_PNF_READY + call_trace: aaf_credentials: - username: admin - password: admin_secret + username: "${AAF_USER}" + password: "${AAF_PASSWORD}" + type: kafka kafka_info: - bootstrap_servers: message-router-kafka-0:9093 - topic_name: HV_VES_PERF3GPP + bootstrap_servers: dmaap-mr-kafka:6060 + topic_name: HVVES_TRACE +streams_subscribes: + measurements: + type: message_router + dmaap_info: + topic_url: http://message-router:3904/events/VES_MEASUREMENT diff --git a/rest-services/cbs-client/src/test/resources/sample_expected_service_config.json b/rest-services/cbs-client/src/test/resources/sample_expected_service_config.json new file mode 100644 index 00000000..2ceda99a --- /dev/null +++ b/rest-services/cbs-client/src/test/resources/sample_expected_service_config.json @@ -0,0 +1,53 @@ +{ + "keystore.path": "/var/run/security/keystore.p12", + "streams_publishes": { + "perf3gpp": { + "testArray": [{ + "testPrimitiveArray": ["admin", "admin_secret", { + "nestedArray": ["admin"] + } + ], + "testPrimitive": "admin", + "aaf_credentials": { + "username": "admin", + "password": "admin_secret" + } + } + ], + "type": "kafka", + "kafka_info": { + "bootstrap_servers": "dmaap-mr-kafka:6060", + "topic_name": "HVVES_PERF3GPP" + } + }, + "pnf_ready": { + "aaf_credentials": { + "username": "admin", + "password": "admin_secret" + }, + "type": "message_router", + "dmaap_info": { + "topic_url": "http://message-router:3904/events/VES_PNF_READY" + } + }, + "call_trace": { + "aaf_credentials": { + "username": "admin", + "password": "admin_secret" + }, + "type": "kafka", + "kafka_info": { + "bootstrap_servers": "dmaap-mr-kafka:6060", + "topic_name": "HVVES_TRACE" + } + } + }, + "streams_subscribes": { + "measurements": { + "type": "message_router", + "dmaap_info": { + "topic_url": "http://message-router:3904/events/VES_MEASUREMENT" + } + } + } +} diff --git a/rest-services/cbs-client/src/test/resources/sample_service_config.json b/rest-services/cbs-client/src/test/resources/sample_service_config.json index 266326f4..e5798597 100644 --- a/rest-services/cbs-client/src/test/resources/sample_service_config.json +++ b/rest-services/cbs-client/src/test/resources/sample_service_config.json @@ -2,6 +2,14 @@ "keystore.path": "/var/run/security/keystore.p12", "streams_publishes": { "perf3gpp": { + "testArray": [{ + "testPrimitiveArray": ["${AAF_USER}", "${AAF_PASSWORD}", {"nestedArray": ["${AAF_USER}"]}], + "testPrimitive": "${AAF_USER}", + "aaf_credentials": { + "username": "${AAF_USER}", + "password": "${AAF_PASSWORD}" + } + }], "type": "kafka", "kafka_info": { "bootstrap_servers": "dmaap-mr-kafka:6060", @@ -9,12 +17,20 @@ } }, "pnf_ready": { + "aaf_credentials": { + "username": "${AAF_USER}", + "password": "${AAF_PASSWORD}" + }, "type": "message_router", "dmaap_info": { "topic_url": "http://message-router:3904/events/VES_PNF_READY" } }, "call_trace": { + "aaf_credentials": { + "username": "${AAF_USER}", + "password": "${AAF_PASSWORD}" + }, "type": "kafka", "kafka_info": { "bootstrap_servers": "dmaap-mr-kafka:6060", |