diff options
Diffstat (limited to 'test/mocks/datafilecollector-testharness')
16 files changed, 56 insertions, 16 deletions
diff --git a/test/mocks/datafilecollector-testharness/common/test_env.sh b/test/mocks/datafilecollector-testharness/common/test_env.sh index 63c0f2ecf..cc96ce8b9 100644 --- a/test/mocks/datafilecollector-testharness/common/test_env.sh +++ b/test/mocks/datafilecollector-testharness/common/test_env.sh @@ -25,6 +25,7 @@ DOCKER_SIM_NWNAME="dfcnet" #Name of docker private network CONSUL_HOST="consul-server" #Host name of consul CONSUL_PORT=8500 #Port number of consul CONFIG_BINDING_SERVICE="config-binding-service" #Host name of CBS +CONFIG_BINDING_SERVICE_SERVICE_PORT=10000 #CBS port MR_PORT=2222 #MR simulator port number http DR_PORT=3906 #DR simulator port number http DR_PORT_SECURE=3907 #DR simulator port number for https diff --git a/test/mocks/datafilecollector-testharness/common/testcase_common.sh b/test/mocks/datafilecollector-testharness/common/testcase_common.sh index d2072c141..61f3c5d43 100755 --- a/test/mocks/datafilecollector-testharness/common/testcase_common.sh +++ b/test/mocks/datafilecollector-testharness/common/testcase_common.sh @@ -375,7 +375,7 @@ __start_dfc_image() { docker network ls| grep $DOCKER_SIM_NWNAME > /dev/null || docker network create $DOCKER_SIM_NWNAME echo "Starting DFC: " $appname " with ports mapped to " $localport " and " $localport_secure " in docker network "$DOCKER_SIM_NWNAME - docker run -d --volume $(pwd)/../simulator-group/tls/:/opt/app/datafile/etc/cert/ -p $localport":8100" -p $localport_secure":8433" --network=$DOCKER_SIM_NWNAME -e CONSUL_HOST=$CONSUL_HOST -e CONSUL_PORT=$CONSUL_PORT -e CONFIG_BINDING_SERVICE=$CONFIG_BINDING_SERVICE -e HOSTNAME=$appname --name $appname $DFC_IMAGE + docker run -d --volume $(pwd)/../simulator-group/tls/:/opt/app/datafile/etc/cert/ -p $localport":8100" -p $localport_secure":8433" --network=$DOCKER_SIM_NWNAME -e CONSUL_HOST=$CONSUL_HOST -e CONSUL_PORT=$CONSUL_PORT -e CONFIG_BINDING_SERVICE=$CONFIG_BINDING_SERVICE -e CONFIG_BINDING_SERVICE_SERVICE_PORT=$CONFIG_BINDING_SERVICE_SERVICE_PORT -e HOSTNAME=$appname --name $appname $DFC_IMAGE sleep 3 set +x dfc_started=false diff --git a/test/mocks/datafilecollector-testharness/mr-sim/mr-sim.py b/test/mocks/datafilecollector-testharness/mr-sim/mr-sim.py index f2b781bd9..982f4b8b3 100644 --- a/test/mocks/datafilecollector-testharness/mr-sim/mr-sim.py +++ b/test/mocks/datafilecollector-testharness/mr-sim/mr-sim.py @@ -1147,7 +1147,7 @@ def getEventHead(groupIndex, changeId, nodename): global pnfMap pnfMap[groupIndex].add(nodename) headStr = """ - { + '{ "event": { "commonEventHeader": { "startEpochMicrosec": 8745745764578, @@ -1203,7 +1203,7 @@ def getEventEnd(): ] } } - } + }' """ return endStr 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" } |