diff options
| author |   Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com> | 2020-08-28 09:29:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-28 09:29:14 +0000 |
| commit | a28f21ec8bd7c22aac03e59a933db7958b212fab (patch) | |
| tree | 597c538a070ef78455e86cd85e5b0d3c3e1218b1 | |
| parent | 0a97966e7ca9d378835fc7cb4a03939c8d6b3a7a (diff) | |
| parent | 4e536c38bf060868e90aae50f3a299315b8b24cb (diff) | |
Merge "Update DFC csits"
3 files changed, 7 insertions, 1 deletions
diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json index bd13327b..8aaca058 100644 --- a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json @@ -10,6 +10,9 @@ "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks", "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass", "dmaap.security.enableDmaapCertAuth": "false", + "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12", + "dmaap.dmaapConsumerConfiguration.consumerId": "C12", + "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "sftp.security.strictHostKeyChecking": "true", "streams_publishes": { "PM_MEAS_FILES": { @@ -27,7 +30,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url":"http://dradmin:dradmin@dmaap-message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url":"http://dmaap-message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml index dff4824c..46fab55c 100644 --- a/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -112,6 +112,7 @@ services: - dcaegen2-datafile-collector environment: KNOWN_HOSTS_FILE_PATH: "/home/datafile/.ssh/known_hosts" + CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000 cbs-sim: container_name: config-binding-service-sim diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml index f92d19f6..2ea2882b 100644 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml @@ -21,5 +21,7 @@ services: CONSUL_HOST: "consul-server" CONSUL_PORT: 8500 CONFIG_BINDING_SERVICE: "config-binding-service" + CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000 HOSTNAME: "dfc_app0" KNOWN_HOSTS_FILE_PATH: "/home/datafile/.ssh/known_hosts" + |