diff options
author | Vijay Venkatesh Kumar <vv770d@att.com> | 2020-08-28 00:40:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-08-28 00:40:49 +0000 |
commit | 5a0e4f27bc4c813f17015e39c8b3f4168ffbfc7a (patch) | |
tree | c7153ba078b4812af4a26a71a828e3444de729d9 /datafile-app-server/src/test/resources | |
parent | 08721f247a647b7f5c24eb0db4b74f64939c9c39 (diff) | |
parent | 3b6c2739505c097f3ea32475ebd3db41bbaae7ef (diff) |
Merge "Update dcae SDK from 1.1.6 to 1.4.2"1.4.3
Diffstat (limited to 'datafile-app-server/src/test/resources')
-rwxr-xr-x | datafile-app-server/src/test/resources/cert.jks | bin | 0 -> 4888 bytes | |||
-rw-r--r-- | datafile-app-server/src/test/resources/datafile_endpoints_test.json | 13 | ||||
-rw-r--r-- | datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json | 13 | ||||
-rwxr-xr-x | datafile-app-server/src/test/resources/jks.pass | 1 | ||||
-rwxr-xr-x | datafile-app-server/src/test/resources/trust.jks | bin | 0 -> 1413 bytes | |||
-rwxr-xr-x | datafile-app-server/src/test/resources/trust.pass | 1 |
6 files changed, 18 insertions, 10 deletions
diff --git a/datafile-app-server/src/test/resources/cert.jks b/datafile-app-server/src/test/resources/cert.jks Binary files differnew file mode 100755 index 00000000..ff0e95ce --- /dev/null +++ b/datafile-app-server/src/test/resources/cert.jks diff --git a/datafile-app-server/src/test/resources/datafile_endpoints_test.json b/datafile-app-server/src/test/resources/datafile_endpoints_test.json index 62119e61..8e51b807 100644 --- a/datafile-app-server/src/test/resources/datafile_endpoints_test.json +++ b/datafile-app-server/src/test/resources/datafile_endpoints_test.json @@ -5,11 +5,14 @@ "dmaap.ftpesConfig.keyPasswordPath": "/src/test/resources/dfc.jks.pass", "dmaap.ftpesConfig.trustedCa": "/src/test/resources/ftp.jks", "dmaap.ftpesConfig.trustedCaPasswordPath": "/src/test/resources/ftp.jks.pass", - "dmaap.security.trustStorePath": "trustStorePath", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "keyStorePasswordPath", + "dmaap.security.trustStorePath": "src/test/resources/trust.jks", + "dmaap.security.trustStorePasswordPath": "src/test/resources/trust.pass", + "dmaap.security.keyStorePath": "src/test/resources/cert.jks", + "dmaap.security.keyStorePasswordPath": "src/test/resources/jks.pass", "dmaap.security.enableDmaapCertAuth": "true", + "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12", + "dmaap.dmaapConsumerConfiguration.consumerId": "C12", + "dmaap.dmaapConsumerConfiguration.timeoutMs": 1000, "sftp.security.strictHostKeyChecking": "false", "streams_publishes": { "PM_MEAS_FILES": { @@ -27,7 +30,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://dradmin:dradmin@localhost:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://localhost:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT" }, "type": "message_router" } diff --git a/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json b/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json index 480a6f79..e1327462 100644 --- a/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json +++ b/datafile-app-server/src/test/resources/datafile_endpoints_test_2producers.json @@ -5,12 +5,15 @@ "dmaap.ftpesConfig.keyPasswordPath": "/src/test/resources/dfc.jks.pass", "dmaap.ftpesConfig.trustedCa": "/src/test/resources/ftp.jks", "dmaap.ftpesConfig.trustedCaPasswordPath": "/src/test/resources/ftp.jks.pass", - "dmaap.security.trustStorePath": "trustStorePath", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "keyStorePasswordPath", + "dmaap.security.trustStorePath": "src/test/resources/trust.jks", + "dmaap.security.trustStorePasswordPath": "src/test/resources/trust.pass", + "dmaap.security.keyStorePath": "src/test/resources/cert.jks", + "dmaap.security.keyStorePasswordPath": "src/test/resources/jks.pass", "dmaap.security.enableDmaapCertAuth": "true", "sftp.security.strictHostKeyChecking": "false", + "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12", + "dmaap.dmaapConsumerConfiguration.consumerId": "C12", + "dmaap.dmaapConsumerConfiguration.timeoutMs": 1000, "streams_publishes": { "PM_MEAS_FILES": { "type": "data_router", @@ -49,7 +52,7 @@ "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url": "http://admin:admin@message-router.onap.svc.cluster.local:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url": "http://message-router.onap.svc.cluster.local:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" }, "type": "message_router" } diff --git a/datafile-app-server/src/test/resources/jks.pass b/datafile-app-server/src/test/resources/jks.pass new file mode 100755 index 00000000..b2c3df47 --- /dev/null +++ b/datafile-app-server/src/test/resources/jks.pass @@ -0,0 +1 @@ +hD:!w:CxF]lGvM6Mz9l^j[7U
\ No newline at end of file diff --git a/datafile-app-server/src/test/resources/trust.jks b/datafile-app-server/src/test/resources/trust.jks Binary files differnew file mode 100755 index 00000000..fc62ad2f --- /dev/null +++ b/datafile-app-server/src/test/resources/trust.jks diff --git a/datafile-app-server/src/test/resources/trust.pass b/datafile-app-server/src/test/resources/trust.pass new file mode 100755 index 00000000..047a411a --- /dev/null +++ b/datafile-app-server/src/test/resources/trust.pass @@ -0,0 +1 @@ +jeQ2l]iyB62D{WbSHL]dN*8R
\ No newline at end of file |