diff options
Diffstat (limited to 'test/mocks/datafilecollector-testharness/simulator-group')
37 files changed, 454 insertions, 678 deletions
diff --git a/test/mocks/datafilecollector-testharness/simulator-group/README.md b/test/mocks/datafilecollector-testharness/simulator-group/README.md index 545776a24..e13389373 100644..100755 --- a/test/mocks/datafilecollector-testharness/simulator-group/README.md +++ b/test/mocks/datafilecollector-testharness/simulator-group/README.md @@ -9,10 +9,9 @@ In general these steps are needed to run the simulator group and dfc 1. Build the simulator images 2. Edit simulator env variables (to adapt the behavior of simulators) -3. Configure consul -4. Start the simulator monitor (to view the simulator stats) -5. Start the simulators -6. Start dfc +3. Start the simulator monitor (to view the simulator stats) +4. Start the simulators +5. Start dfc # Overview of the simulators. @@ -44,7 +43,6 @@ Run the script `prepare-images.sh` to build the docker images for MR, DR and FTP ## Summary of scripts and files -- `consul_config.sh` - Convert a json config file to work with dfc when manually started as java-app or container and then add that json to Consul. - `dfc-internal-stats.sh` - Periodically extract jvm data and dfc internal data and print to console/file. - `docker-compose-setup.sh` - Sets environment variables for the simulators and start the simulators with that settings. - `docker-compose-template.yml` - A docker compose template with environment variables setting. Used for producing a docker-compose file to defined the simulator containers. @@ -112,7 +110,7 @@ Kill all the containers with `simulators-kill.se` `setup-ftp-files.for-image.sh` and `setup-http-files-for-image.sh` is for CSIT and executed when the ftp/http servers are started from the docker-compose-setup.sh\`. To make DFC to be able to connect to the simulator containers, DFC need to run in host mode. -Start DFC by the following cmd: ` docker run -d --network="host" --name dfc_app <dfc-image> ` +Start DFC by the following cmd: `docker run -d --network="host" --name dfc_app <dfc-image> ` `<dfc-image>` could be either the locally built image `onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server` or the one in nexus `nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server`. 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 deleted file mode 100644 index 76d6822a2..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/1", - "publish_url": "https://drsim:3907/publish/1", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index ddf0bbb36..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "username": "user", - "log_url": "https://drsim:3907/feedlog/1", - "publish_url": "https://drsim:3907/publish/1", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - }, - "CTR_MEAS_FILES": { - "type": "data_router", - "dmaap_info": { - "feed02": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index 43dc6a9c5..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" - }, - "type": "message_router" - } - }, - "streams_publishes": { - "CTR_MEAS_FILES": { - "type": "data_router", - "dmaap_info": { - "feed02": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - } - } -} 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 deleted file mode 100644 index bc9c9b1f6..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - }, - "LOG_FILES": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/3", - "publish_url": "https://drsim:3907/publish/3", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - }, - "TEMP_FILES": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/3", - "publish_url": "https://drsim:3907/publish/3", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index c5a5f843f..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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_HTTPS.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_HTTPS.json deleted file mode 100644 index 6d1f0c02e..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_HTTPS.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.p12", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/p12.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.certificateConfig.httpsHostnameVerify": false, - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index c5a5f843f..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index 9f370391b..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index c5a5f843f..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index bf65e85a8..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/3", - "publish_url": "https://drsim:3907/publish/3", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - }, - "CTR_MEAS_FILES": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/3", - "publish_url": "https://drsim:3907/publish/3", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index 486d5ee44..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/2", - "publish_url": "https://drsim:3907/publish/2", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index 6509bcfdf..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/3", - "publish_url": "https://drsim:3907/publish/3", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index 620d172e6..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/1", - "publish_url": "https://drsim:3907/publish/1", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - }, - "TEST_FILES": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/4", - "publish_url": "https://drsim:3907/publish/4", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "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 deleted file mode 100644 index dfbecaa1e..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "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": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/4", - "publish_url": "https://drsim:3907/publish/4", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - }, - "TEMP_FILES": { - "type": "data_router", - "dmaap_info": { - "username": "user", - "log_url": "https://drsim:3907/feedlog/5", - "publish_url": "https://drsim:3907/publish/4", - "location": "loc00", - "password": "password", - "publisher_id": "972.360gm" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "dmaap_info": { - "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" - }, - "type": "message_router" - } - } -} diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_config.hcl b/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_config.hcl deleted file mode 100644 index f5409755a..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_config.hcl +++ /dev/null @@ -1,13 +0,0 @@ -#server = true -#bootstrap = true -#client_addr = "0.0.0.0" - -service { - # Name for CBS in consul, env var CONFIG_BINDING_SERVICE - # should be passed to dfc app with this value - Name = "config-binding-service" - # Host name where CBS is running - Address = "config-binding-service" - # Port number where CBS is running - Port = 10000 -} diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_localhost_config.hcl b/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_localhost_config.hcl deleted file mode 100644 index c2d9839ee..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_localhost_config.hcl +++ /dev/null @@ -1,11 +0,0 @@ -service { - # Name for CBS in consul, env var CONFIG_BINDING_SERVICE - # should be passed to dfc app with this value - # This is only to be used when contacting cbs via local host - # (typicall when dfc is executed as an application without a container) - Name = "config-binding-service-localhost" - # Host name where CBS is running - Address = "localhost" - # Port number where CBS is running - Port = 10000 -}
\ No newline at end of file diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul_config.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/consul_config.json deleted file mode 100644 index e69de29bb..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul_config.json +++ /dev/null diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul_config.sh b/test/mocks/datafilecollector-testharness/simulator-group/consul_config.sh deleted file mode 100755 index 5e8f7e2d4..000000000 --- a/test/mocks/datafilecollector-testharness/simulator-group/consul_config.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -bash -x - -# Script to configure consul with json configuration files with 'localhost' urls. This -# is needed when running the simulator as as a stand-alone app or via a dfc container in 'host' network mode. -# Assuming the input json files hostnames for MR and DR simulators are given as 'mrsim'/'drsim' -# See available consul files in the consul dir -# The script stores a json config for 'dfc_app'<dfc-instance-id>' if arg 'app' is given. -# And for 'dfc_app'<dfc-instance-id>':dmaap' if arg 'dmaap' is given. -# Instance id shall be and integer in the range 0..5 - -. ../common/test_env.sh - -if [ $# != 3 ]; then - echo "Script needs three args, app|dmaap <dfc-instance-id> <json-file-path>" - exit 1 -fi - -if [ $2 -lt 0 ] || [ $2 -gt $DFC_MAX_IDX ]; then - __print_err "dfc-instance-id should be 0.."$DFC_MAX_IDX - exit 1 -fi -if ! [ -f $3 ]; then - __print_err "json file does not extis: "$3 - exit 1 -fi - -echo "Configuring consul for " $appname " from " $3 -curl -s http://127.0.0.1:${CONSUL_PORT}/v1/kv/${appname}?dc=dc1 -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data-binary "@"$3 - -echo "Reading back from consul:" -curl "http://127.0.0.1:${CONSUL_PORT}/v1/kv/${appname}?dc=dc1&raw=0" - -echo "done"
\ No newline at end of file diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM.yaml new file mode 100644 index 000000000..89b1f7f4b --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM.yaml @@ -0,0 +1,28 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/1 + publish_url: https://drsim:3907/publish/1 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM_feed2_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM_feed2_CTR.yaml new file mode 100644 index 000000000..cbc79f5bc --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM_feed2_CTR.yaml @@ -0,0 +1,37 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + username: user + log_url: https://drsim:3907/feedlog/1 + publish_url: https://drsim:3907/publish/1 + location: loc00 + password: password + publisher_id: 972.360gm + CTR_MEAS_FILES: + type: data_router + dmaap_info: + feed02: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR.yaml new file mode 100644 index 000000000..7e5e3dffa --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR.yaml @@ -0,0 +1,29 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router +streams_publishes: + CTR_MEAS_FILES: + type: data_router + dmaap_info: + feed02: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR_feed3_LOG_TEMP.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR_feed3_LOG_TEMP.yaml new file mode 100644 index 000000000..dbd7641b6 --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR_feed3_LOG_TEMP.yaml @@ -0,0 +1,46 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm + LOG_FILES: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/3 + publish_url: https://drsim:3907/publish/3 + location: loc00 + password: password + publisher_id: 972.360gm + TEMP_FILES: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/3 + publish_url: https://drsim:3907/publish/3 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM.yaml new file mode 100644 index 000000000..ce3e3a6e9 --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM.yaml @@ -0,0 +1,28 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml new file mode 100644 index 000000000..50a41be9b --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml @@ -0,0 +1,29 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.p12 +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/p12.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.certificateConfig.httpsHostnameVerify: false +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS.yaml new file mode 100644 index 000000000..ce3e3a6e9 --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS.yaml @@ -0,0 +1,28 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS_no_strict_host_key_checking.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS_no_strict_host_key_checking.yaml new file mode 100644 index 000000000..f249f76fd --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS_no_strict_host_key_checking.yaml @@ -0,0 +1,28 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_secureMR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_secureMR.yaml new file mode 100644 index 000000000..ce3e3a6e9 --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_secureMR.yaml @@ -0,0 +1,28 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed3_PM_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed3_PM_CTR.yaml new file mode 100644 index 000000000..e578430b9 --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed3_PM_CTR.yaml @@ -0,0 +1,37 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/3 + publish_url: https://drsim:3907/publish/3 + location: loc00 + password: password + publisher_id: 972.360gm + CTR_MEAS_FILES: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/3 + publish_url: https://drsim:3907/publish/3 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c13_feed2_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c13_feed2_CTR.yaml new file mode 100644 index 000000000..8ec155f8f --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c13_feed2_CTR.yaml @@ -0,0 +1,28 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/2 + publish_url: https://drsim:3907/publish/2 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c14_feed3_LOG.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c14_feed3_LOG.yaml new file mode 100644 index 000000000..274fdfb8b --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c14_feed3_LOG.yaml @@ -0,0 +1,28 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/3 + publish_url: https://drsim:3907/publish/3 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c15_feed1_PM_feed4_TEST.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c15_feed1_PM_feed4_TEST.yaml new file mode 100644 index 000000000..d72ff44ba --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c15_feed1_PM_feed4_TEST.yaml @@ -0,0 +1,37 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/1 + publish_url: https://drsim:3907/publish/1 + location: loc00 + password: password + publisher_id: 972.360gm + TEST_FILES: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/4 + publish_url: https://drsim:3907/publish/4 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c16_feed4_TEST_feed5_TEMP.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c16_feed4_TEST_feed5_TEMP.yaml new file mode 100644 index 000000000..e4cc8cf1a --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c16_feed4_TEST_feed5_TEMP.yaml @@ -0,0 +1,37 @@ +dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks +dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass +dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks +dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass +dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks +dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass +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: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/4 + publish_url: https://drsim:3907/publish/4 + location: loc00 + password: password + publisher_id: 972.360gm + TEMP_FILES: + type: data_router + dmaap_info: + username: user + log_url: https://drsim:3907/feedlog/5 + publish_url: https://drsim:3907/publish/4 + location: loc00 + password: password + publisher_id: 972.360gm +streams_subscribes: + dmaap_subscriber: + dmaap_info: + topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT + type: message_router diff --git a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh index 9f531f447..e145d2606 100755 --- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh +++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh @@ -10,7 +10,6 @@ # # Script for manually starting all simulators with test setting below -# Matching json config is needed in CBS/Consul as well. Use consul_config.sh to add config to consul export MR_TC="--tc710" # Test behaviour for MR sim export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES" # Comma-separated list of <consumer-group>:<change-identifier> diff --git a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml index 01113e396..6c3688451 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml +++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml @@ -7,33 +7,6 @@ networks: services: - consul-server: - networks: - - dfcnet - container_name: dfc_consul - image: nexus3.onap.org:10001/onap/oom/consul:2.1.0 - ports: - - "8500:8500" - entrypoint: /usr/local/bin/docker-entrypoint.sh agent -dev -client 0.0.0.0 - volumes: - - ./consul/consul/:/consul/config - - config-binding-service: - networks: - - dfcnet - container_name: dfc_cbs - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.5.3 - ports: - - "10000:10000" - command: sh -c " - unset PROD_LOGGING; - /usr/local/bin/run.py; - " - environment: - - CONSUL_HOST=consul-server - depends_on: - - consul-server - tls-init-container: container_name: dfc_tls-init-container image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.4 diff --git a/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh b/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh index 4384439c2..634450b6d 100755 --- a/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh +++ b/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh @@ -30,8 +30,6 @@ docker kill dfc_http-https-server1 docker kill dfc_http-https-server2 docker kill dfc_http-https-server3 docker kill dfc_http-https-server4 -docker kill dfc_cbs -docker kill dfc_consul echo "Removing simulator containers" docker rm dfc_dr-sim @@ -56,7 +54,5 @@ if [ "$HTTP_TYPE" = "HTTPS" ] then docker rm -f oom-certservice-post-processor fi -docker rm dfc_cbs -docker rm dfc_consul echo "done" diff --git a/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh b/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh index 71767ffa9..36dd2606d 100755 --- a/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh +++ b/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh @@ -119,8 +119,7 @@ docker-compose -f docker-compose-template.yml config > docker-compose.yml docker-compose up -d -sudo chown $(id -u):$(id -g) consul -sudo chown $(id -u):$(id -g) consul/consul/ +sudo chown $(id -u):$(id -g) dfc_configs declare -a SFTP_SIM declare -a FTPES_SIM @@ -144,8 +143,6 @@ HTTP_SIM[1]="$(docker ps -q --filter='name=dfc_http-https-server1')" HTTP_SIM[2]="$(docker ps -q --filter='name=dfc_http-https-server2')" HTTP_SIM[3]="$(docker ps -q --filter='name=dfc_http-https-server3')" HTTP_SIM[4]="$(docker ps -q --filter='name=dfc_http-https-server4')" -CBS_SIM="$(docker ps -q --filter='name=dfc_cbs')" -CONSUL_SIM="$(docker ps -q --filter='name=dfc_consul')" #Wait for initialization of docker containers for all simulators for i in {1..10}; do @@ -166,9 +163,7 @@ if [ $(docker inspect --format '{{ .State.Running }}' $DR_SIM) ] && \ [ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[1]}) ] && \ [ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[2]}) ] && \ [ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[3]}) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[4]}) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' $CBS_SIM) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' $CONSUL_SIM) ] +[ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[4]}) ] then echo "All simulators Started" break @@ -188,8 +183,6 @@ if [ -z "$BASIC_AUTH_PASSWORD" ] BASIC_AUTH_PASSWORD=demo123456! fi -server_check "cbs " 10000 "/healthcheck" -server_check "consul " 8500 "/v1/catalog/service/agent" server_check "DR sim " 3906 "/" server_check "DR redir sim " 3908 "/" server_check "MR sim " 2222 "/" |