From 13b842ccd307ed4a2860b0044cf00d326f3866b9 Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Tue, 25 Aug 2020 14:36:16 +0200 Subject: Update tests for Datafile Collector (DCAE SDK update) Adjust DFC consul configs Make message router sim return array of strings instead of array of json objects as response (as in live environment) Issue-ID: DCAEGEN2-2267 Signed-off-by: Remigiusz Janeczek Change-Id: I792c9abcb1c49d73a790ca9c2e8f46a0e1dfd099 --- .../simulator-group/consul/c12_feed1_PM.json | 5 ++++- .../simulator-group/consul/c12_feed1_PM_feed2_CTR.json | 5 ++++- .../simulator-group/consul/c12_feed2_CTR.json | 5 ++++- .../simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json | 5 ++++- .../simulator-group/consul/c12_feed2_PM.json | 5 ++++- .../simulator-group/consul/c12_feed2_PM_MEAS.json | 5 ++++- .../consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json | 5 ++++- .../simulator-group/consul/c12_feed2_PM_secureMR.json | 5 ++++- .../simulator-group/consul/c12_feed3_PM_CTR.json | 5 ++++- .../simulator-group/consul/c13_feed2_CTR.json | 5 ++++- .../simulator-group/consul/c14_feed3_LOG.json | 5 ++++- .../simulator-group/consul/c15_feed1_PM_feed4_TEST.json | 5 ++++- .../simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json | 5 ++++- 13 files changed, 52 insertions(+), 13 deletions(-) (limited to 'test/mocks/datafilecollector-testharness/simulator-group/consul') diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json index 2defeb0c0..f839e79be 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json @@ -8,6 +8,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": { @@ -25,7 +28,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json index dea4e2e39..89a49070e 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json @@ -8,6 +8,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": { @@ -36,7 +39,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json index 2cdb656e7..dbd41652b 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json @@ -8,11 +8,14 @@ "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_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json index 8d76b43ea..fee8a0f79 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json @@ -8,6 +8,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": { "CTR_MEAS_FILES": { @@ -47,7 +50,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json index 8243dddb9..5a297d279 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json @@ -8,6 +8,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": { @@ -25,7 +28,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@dfc_mr-sim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json index d041852d1..5a297d279 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json @@ -8,6 +8,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": { @@ -25,7 +28,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json index 2b0defbf3..8ab143879 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json @@ -8,6 +8,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": "false", "streams_publishes": { "PM_MEAS_FILES": { @@ -25,7 +28,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json index ace7cbbc3..5a297d279 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json @@ -8,6 +8,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": { @@ -25,7 +28,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "https://dradmin:dradmin@mrsim:2223/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json index 2fe61ee0e..4e6b1fd25 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json @@ -8,6 +8,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": { @@ -36,7 +39,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json index 27d3eb87e..599ad74e6 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json @@ -8,6 +8,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-c13", + "dmaap.dmaapConsumerConfiguration.consumerId": "C13", + "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "sftp.security.strictHostKeyChecking": "true", "streams_publishes": { "CTR_MEAS_FILES": { @@ -25,7 +28,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c13/C13" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json index 0bbd15901..8e96210bb 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json @@ -8,6 +8,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-c14", + "dmaap.dmaapConsumerConfiguration.consumerId": "C14", + "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "sftp.security.strictHostKeyChecking": "true", "streams_publishes": { "LOG_FILES": { @@ -25,7 +28,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c14/C14" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json index 6fac2c236..4b538987e 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json @@ -8,6 +8,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-c15", + "dmaap.dmaapConsumerConfiguration.consumerId": "C15", + "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "sftp.security.strictHostKeyChecking": "true", "streams_publishes": { "PM_MEAS_FILES": { @@ -36,7 +39,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c15/C15" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json index 7d0d9e0d6..f0fc2cba9 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json @@ -8,6 +8,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-c15", + "dmaap.dmaapConsumerConfiguration.consumerId": "C15", + "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "sftp.security.strictHostKeyChecking": "true", "streams_publishes": { "TEST_FILES": { @@ -36,7 +39,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c15/C15" + "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } -- cgit 1.2.3-korg