diff options
| author |   ecaiyanlinux <martin.c.yan@est.tech> | 2019-08-21 12:10:33 +0000 |
|---|---|---|
| committer |   Daniel Rose <dr695h@att.com> | 2019-08-29 17:35:36 +0000 |
| commit | 796e8fe4255036b5785a2071ddd6a0240464556a (patch) | |
| tree | b5d9ee29c9c07d91ea4848dafb12c5ae9cd7336d /test/mocks/datafilecollector-testharness/auto-test | |
| parent | 190a2f42b5c0af56b8c8da7e05a90ad3999598d3 (diff) | |
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 <martin.c.yan@est.tech>
Diffstat (limited to 'test/mocks/datafilecollector-testharness/auto-test')
3 files changed, 21 insertions, 21 deletions
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh index fe6d45349..88f63c378 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh @@ -29,13 +29,13 @@ log_sim_settings start_simulators -consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" +consul_config_app 0 "../simulator-group/consul/c12_feed2_PM_secureMR.json" consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" -mr_equal ctr_requests 0 60 +mr_secure_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 -mr_print tc_info +mr_secure_print tc_info dr_print tc_info drr_print tc_info @@ -47,11 +47,11 @@ sleep_wait 30 dr_equal ctr_published_files 1 -mr_greater ctr_requests 1 +mr_secure_greater ctr_requests 1 -mr_equal ctr_events 1 -mr_equal ctr_unique_files 1 -mr_equal ctr_unique_PNFs 1 +mr_secure_equal ctr_events 1 +mr_secure_equal ctr_unique_files 1 +mr_secure_equal ctr_unique_PNFs 1 dr_equal ctr_publish_query 1 dr_equal ctr_publish_query_bad_file_prefix 0 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh index e46c0f287..6311bcf12 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh @@ -29,13 +29,13 @@ log_sim_settings start_simulators -consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" +consul_config_app 0 "../simulator-group/consul/c12_feed2_PM_secureMR.json" consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" -mr_equal ctr_requests 0 60 +mr_secure_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 -mr_print tc_info +mr_secure_print tc_info dr_print tc_info drr_print tc_info @@ -47,11 +47,11 @@ sleep_wait 30 dr_equal ctr_published_files 1 -mr_greater ctr_requests 1 +mr_secure_greater ctr_requests 1 -mr_equal ctr_events 1 -mr_equal ctr_unique_files 1 -mr_equal ctr_unique_PNFs 1 +mr_secure_equal ctr_events 1 +mr_secure_equal ctr_unique_files 1 +mr_secure_equal ctr_unique_PNFs 1 dr_equal ctr_publish_query 1 dr_equal ctr_publish_query_bad_file_prefix 0 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh index 06baaefe4..1f7a8e9a1 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh @@ -29,13 +29,13 @@ log_sim_settings start_simulators -consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" +consul_config_app 0 "../simulator-group/consul/c12_feed2_PM_secureMR.json" consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" -mr_equal ctr_requests 0 60 +mr_secure_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 -mr_print tc_info +mr_secure_print tc_info dr_print tc_info drr_print tc_info @@ -47,11 +47,11 @@ sleep_wait 30 dr_equal ctr_published_files 1 -mr_greater ctr_requests 1 +mr_secure_greater ctr_requests 1 -mr_equal ctr_events 1 -mr_equal ctr_unique_files 1 -mr_equal ctr_unique_PNFs 1 +mr_secure_equal ctr_events 1 +mr_secure_equal ctr_unique_files 1 +mr_secure_equal ctr_unique_PNFs 1 dr_equal ctr_publish_query 1 dr_equal ctr_publish_query_bad_file_prefix 0 |