From 796e8fe4255036b5785a2071ddd6a0240464556a Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Wed, 21 Aug 2019 12:10:33 +0000 Subject: Add tls-init-container to simulator 1.replace dr-sim/dr-redir-sim cert/key 2.update mr-sim, make it support https 3.update ftpes cert/key Change-Id: I7bbde98f352d1e7d7c8775acf3d8af89a6ef7bdc Issue-ID: DCAEGEN2-1702 Signed-off-by: ecaiyanlinux --- .../simulator-group/consul/c12_feed1_PM.json | 4 +-- .../consul/c12_feed1_PM_feed2_CTR.json | 8 +++--- .../simulator-group/consul/c12_feed2_CTR.json | 8 +++--- .../consul/c12_feed2_CTR_feed3_LOG_TEMP.json | 8 +++--- .../simulator-group/consul/c12_feed2_PM.json | 12 ++++---- .../consul/c12_feed2_PM_secureMR.json | 32 ++++++++++++++++++++++ .../simulator-group/consul/c12_feed3_PM_CTR.json | 8 +++--- .../simulator-group/consul/c13_feed2_CTR.json | 8 +++--- .../simulator-group/consul/c14_feed3_LOG.json | 8 +++--- .../consul/c15_feed1_PM_feed4_TEST.json | 8 +++--- .../consul/c16_feed4_TEST_feed5_TEMP.json | 8 +++--- 11 files changed, 72 insertions(+), 40 deletions(-) create mode 100644 test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json (limited to 'test/mocks/datafilecollector-testharness/simulator-group/consul') diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json index 29acb16ce..ff3783d40 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,8 +1,8 @@ { "dmaap.ftpesConfig.keyCert":"config/dfc.jks", - "dmaap.ftpesConfig.keyPassword":"secret", + "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", "dmaap.ftpesConfig.trustedCa":"config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword":"secret", + "dmaap.ftpesConfig.trustedCaPassword":"ee%v.7Y3nf*We2T2Z$}}c%S?", "dmaap.security.trustStorePath":"change it", "dmaap.security.trustStorePasswordPath":"trustStorePasswordPath", "dmaap.security.keyStorePath":"keyStorePath", 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 a37c3be4d..d26dd8d76 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", 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 31d3a4b67..96521498d 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", 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 b7b63cc27..6508749be 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", 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 8b87a5c3a..2ccfb1829 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":"secret", + "dmaap.ftpesConfig.keyPassword":"hD:!w:CxF]lGvM6Mz9l^j[7U", "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.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":"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 new file mode 100644 index 000000000..b11339a82 --- /dev/null +++ b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json @@ -0,0 +1,32 @@ +{ + "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", + "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":"https://dradmin:dradmin@mrsim:2223/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + }, + "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 617126863..b7063feee 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", 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 ade30aa89..6e8925f3f 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", 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 b98a46f73..2212765ab 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", 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 7ee78f5cd..178552c46 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", 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 7c68d7ac6..42fddd0b9 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,8 +1,8 @@ { - "dmaap.ftpesConfig.keyCert": "config/dfc.jks", - "dmaap.ftpesConfig.keyPassword": "secret", - "dmaap.ftpesConfig.trustedCa": "config/ftp.jks", - "dmaap.ftpesConfig.trustedCaPassword": "secret", + "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", -- cgit 1.2.3-korg