From ec8c60c7c969f9fc2cdc98cdfd5c5f0ea85f5f6f Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Fri, 30 Aug 2019 13:39:30 +0000 Subject: Integrating DfC to use TLS sidecar container Change-Id: I111bc5596346db70923645dcfe79af3e639c978c Issue-ID: DCAEGEN2-1702 Signed-off-by: ecaiyanlinux --- .../simulator-group/.gitignore | 3 ++- .../simulator-group/consul/c12_feed1_PM.json | 16 ++++++++-------- .../simulator-group/consul/c12_feed1_PM_feed2_CTR.json | 16 ++++++++-------- .../simulator-group/consul/c12_feed2_CTR.json | 16 ++++++++-------- .../consul/c12_feed2_CTR_feed3_LOG_TEMP.json | 16 ++++++++-------- .../simulator-group/consul/c12_feed2_PM.json | 16 ++++++++-------- .../simulator-group/consul/c12_feed2_PM_MEAS.json | 16 ++++++++-------- .../simulator-group/consul/c12_feed2_PM_secureMR.json | 18 +++++++++--------- .../simulator-group/consul/c12_feed3_PM_CTR.json | 16 ++++++++-------- .../simulator-group/consul/c13_feed2_CTR.json | 16 ++++++++-------- .../simulator-group/consul/c14_feed3_LOG.json | 16 ++++++++-------- .../consul/c15_feed1_PM_feed4_TEST.json | 16 ++++++++-------- .../consul/c16_feed4_TEST_feed5_TEMP.json | 16 ++++++++-------- 13 files changed, 99 insertions(+), 98 deletions(-) (limited to 'test/mocks/datafilecollector-testharness/simulator-group') diff --git a/test/mocks/datafilecollector-testharness/simulator-group/.gitignore b/test/mocks/datafilecollector-testharness/simulator-group/.gitignore index fada972ec..74f16e75d 100644 --- a/test/mocks/datafilecollector-testharness/simulator-group/.gitignore +++ b/test/mocks/datafilecollector-testharness/simulator-group/.gitignore @@ -2,4 +2,5 @@ docker-compose.yml node_modules package.json package-lock.json -.tmp* \ No newline at end of file +.tmp* +/tls \ No newline at end of file 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 ff3783d40..eac26a9ab 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath":"change it", - "dmaap.security.trustStorePasswordPath":"trustStorePasswordPath", - "dmaap.security.keyStorePath":"keyStorePath", - "dmaap.security.keyStorePasswordPath":"change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes":{ "PM_MEAS_FILES":{ 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 d26dd8d76..75637ce79 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes": { "PM_MEAS_FILES": { 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 96521498d..c7e5fc904 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_subscribes": { "dmaap_subscriber": { 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 6508749be..3a5280c27 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes": { "CTR_MEAS_FILES": { 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 2ccfb1829..a78849890 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath":"config/ftp.jks", - "dmaap.security.trustStorePasswordPath":"config/ftp.pass", - "dmaap.security.keyStorePath":"config/dfc.jks", - "dmaap.security.keyStorePasswordPath":"config/dfc.pass", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes":{ "PM_MEAS_FILES":{ 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 9974c187f..dbcf08ab5 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"secret", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"secret", - "dmaap.security.trustStorePath":"change it", - "dmaap.security.trustStorePasswordPath":"trustStorePasswordPath", - "dmaap.security.keyStorePath":"keyStorePath", - "dmaap.security.keyStorePasswordPath":"change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes":{ "PM_MEAS_FILES":{ 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 b11339a82..d8189bd8d 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 @@ -1,13 +1,13 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath":"config/ftp.jks", - "dmaap.security.trustStorePasswordPath":"config/ftp.pass", - "dmaap.security.keyStorePath":"config/dfc.jks", - "dmaap.security.keyStorePasswordPath":"config/dfc.pass", - "dmaap.security.enableDmaapCertAuth":"true", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes":{ "PM_MEAS_FILES":{ "type":"data_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 b7063feee..2f5287bbc 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes":{ "PM_MEAS_FILES":{ 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 6e8925f3f..a98752b65 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes": { "CTR_MEAS_FILES": { 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 2212765ab..07d3f3e78 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes": { "LOG_FILES": { 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 178552c46..55ffa1ba0 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes": { "PM_MEAS_FILES": { 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 42fddd0b9..5ab297466 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 @@ -1,12 +1,12 @@ { - "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", - "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", - "dmaap.security.trustStorePath": "change it", - "dmaap.security.trustStorePasswordPath": "trustStorePasswordPath", - "dmaap.security.keyStorePath": "keyStorePath", - "dmaap.security.keyStorePasswordPath": "change it", + "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks", + "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass", + "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", + "dmaap.ftpesConfig.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", "streams_publishes": { "TEST_FILES": { -- cgit 1.2.3-korg