aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2020-08-26 07:58:49 +0200
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2020-08-26 07:58:49 +0200
commit4e536c38bf060868e90aae50f3a299315b8b24cb (patch)
treeb9fa11b4ac89182355d60ffe764ee4382a2ad93e
parentdb056530134edcfd603bc4a0dee004cc4a291287 (diff)
Update DFC csits
Tests with DFC require adjustments after updating DFC with the latest DCAE SDK Issue-ID: DCAEGEN2-2267 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: Icccefebc4b5bdc122220c3473aa0ffcc8e33784c
-rw-r--r--plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json5
-rw-r--r--plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml1
-rw-r--r--scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml2
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"
+