diff options
Diffstat (limited to 'test/mocks/datafilecollector-testharness/auto-test')
39 files changed, 61 insertions, 307 deletions
diff --git a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh index 76afc8c7c..dd1daea54 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh @@ -31,7 +31,6 @@ start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh index 2722182d9..15852057f 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh @@ -31,7 +31,6 @@ start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh b/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh index 462a7dd37..7c7d3543f 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh @@ -32,19 +32,14 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed1_PM_feed2_CTR.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json" consul_config_app 1 "../simulator-group/consul/c13_feed2_CTR.json" -consul_config_dmaap 1 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json" consul_config_app 2 "../simulator-group/consul/c14_feed3_LOG.json" -consul_config_dmaap 2 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json" consul_config_app 3 "../simulator-group/consul/c15_feed1_PM_feed4_TEST.json" -consul_config_dmaap 3 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json" consul_config_app 2 "../simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json" -consul_config_dmaap 4 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json" mr_print "" @@ -432,31 +427,34 @@ start_dfc 2 start_dfc 3 start_dfc 4 -dr_equal ctr_published_files 1 60 +dr_greater ctr_published_files 1 60 sleep_wait 30 -dr_equal ctr_published_files 1 - mr_greater ctr_requests 1 -mr_equal ctr_events 1 -mr_equal ctr_unique_files 1 -mr_equal ctr_unique_PNFs 1 +mr_greater ctr_events 1 +mr_greater ctr_unique_files 1 +mr_greater ctr_unique_PNFs 1 -dr_equal ctr_publish_query 1 +dr_greater ctr_publish_query 1 dr_equal ctr_publish_query_published 0 -dr_equal ctr_publish_query_not_published 1 -dr_equal ctr_publish_req 1 -dr_equal ctr_publish_req_redirect 1 +dr_greater ctr_publish_query_not_published 1 +dr_greater ctr_publish_req 1 +dr_greater ctr_publish_req_redirect 1 dr_equal ctr_publish_req_published 0 -dr_equal ctr_published_files 1 +dr_greater ctr_published_files 1 dr_equal ctr_double_publish 0 -drr_equal ctr_publish_requests 1 -drr_equal ctr_publish_responses 1 +drr_greater ctr_publish_requests 1 +drr_greater ctr_publish_responses 1 + +drr_greater dwl_volume 1000000 + + +####There is a risk of double publishing when running multiple DFCs. +####The related counters ctr_publish_query_published and ctr_double_publish may be non-zero. -drr_equal dwl_volume 1000000 check_dfc_logs diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh index 88f63c378..f1d6f093c 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh @@ -29,13 +29,12 @@ log_sim_settings start_simulators -consul_config_app 0 "../simulator-group/consul/c12_feed2_PM_secureMR.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" +consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -mr_secure_equal ctr_requests 0 60 +mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 -mr_secure_print tc_info +mr_print tc_info dr_print tc_info drr_print tc_info @@ -47,11 +46,11 @@ sleep_wait 30 dr_equal ctr_published_files 1 -mr_secure_greater ctr_requests 1 +mr_greater ctr_requests 1 -mr_secure_equal ctr_events 1 -mr_secure_equal ctr_unique_files 1 -mr_secure_equal ctr_unique_PNFs 1 +mr_equal ctr_events 1 +mr_equal ctr_unique_files 1 +mr_equal ctr_unique_PNFs 1 dr_equal ctr_publish_query 1 dr_equal ctr_publish_query_bad_file_prefix 0 @@ -76,4 +75,4 @@ check_dfc_logs store_logs END -print_result
\ No newline at end of file +print_result diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh index 918906fa7..c162a2a16 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh index 77477a82a..9d9665bb2 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh @@ -1,6 +1,6 @@ #!/bin/bash -TC_ONELINE_DESCR="100 event with 1 1MB file in each evewnt from one PNF in one event using SFTP with feed reconfigure" +TC_ONELINE_DESCR="100 events with 1 1MB file in each event from one PNF using SFTP with feed reconfigure" . ../common/testcase_common.sh $1 $2 @@ -13,10 +13,10 @@ export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES" export MR_FILE_PREFIX_MAPPING="PM_MEAS_FILES:A" export DR_TC="--tc normal" -export DR_FEEDS="2:A" +export DR_FEEDS="1:A,2:A" export DR_REDIR_TC="--tc normal" -export DR_REDIR_FEEDS="2:A" +export DR_REDIR_FEEDS="1:A,2:A" export NUM_FTPFILES="200" export NUM_PNFS="1" @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 @@ -44,26 +43,11 @@ drr_contain_str feeds "2:A" start_dfc 0 -dr_equal ctr_published_files 50 900 - - -export DR_TC="--tc normal" -export DR_FEEDS="1:A" - -export DR_REDIR_TC="--tc normal" -export DR_REDIR_FEEDS="1:A" +dr_equal ctr_published_files 5 900 consul_config_app 0 "../simulator-group/consul/c12_feed1_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.json" - -kill_dr -kill_drr - -log_sim_settings - -start_simulators -mr_equal ctr_events 100 900 +mr_equal ctr_events 100 1800 mr_equal ctr_unique_files 100 mr_equal ctr_unique_PNFs 1 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh index d6560a3c5..18db3b288 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh index adafb2fed..a33f37c22 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh index 12e9ddc88..93e348e12 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh index 27d51f659..99646b369 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh index 060f3c364..44238c31d 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh index e498f42ef..cb2f71a25 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh @@ -29,13 +29,12 @@ log_sim_settings start_simulators -consul_config_app 0 "../simulator-group/consul/c12_feed2_PM_secureMR.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" +consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -mr_secure_equal ctr_requests 0 60 +mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 -mr_secure_print tc_info +mr_print tc_info dr_print tc_info drr_print tc_info @@ -47,11 +46,11 @@ sleep_wait 30 dr_equal ctr_published_files 1 -mr_secure_greater ctr_requests 1 +mr_greater ctr_requests 1 -mr_secure_equal ctr_events 1 -mr_secure_equal ctr_unique_files 1 -mr_secure_equal ctr_unique_PNFs 1 +mr_equal ctr_events 1 +mr_equal ctr_unique_files 1 +mr_equal ctr_unique_PNFs 1 dr_equal ctr_publish_query 1 dr_equal ctr_publish_query_bad_file_prefix 0 @@ -76,4 +75,4 @@ check_dfc_logs store_logs END -print_result
\ No newline at end of file +print_result diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh index a61b1a429..9eef5ae95 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh index 8060ddfc2..0b1828966 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh @@ -31,7 +31,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh index fb18d7644..df9b57d3f 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh index 46fff9d5a..5291b6815 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh index 08222d2ec..2eb9abc97 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 30 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh index 1f7a8e9a1..84db1d8c8 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh @@ -29,13 +29,12 @@ log_sim_settings start_simulators -consul_config_app 0 "../simulator-group/consul/c12_feed2_PM_secureMR.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" +consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -mr_secure_equal ctr_requests 0 60 +mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 -mr_secure_print tc_info +mr_print tc_info dr_print tc_info drr_print tc_info @@ -47,11 +46,11 @@ sleep_wait 30 dr_equal ctr_published_files 1 -mr_secure_greater ctr_requests 1 +mr_greater ctr_requests 1 -mr_secure_equal ctr_events 1 -mr_secure_equal ctr_unique_files 1 -mr_secure_equal ctr_unique_PNFs 1 +mr_equal ctr_events 1 +mr_equal ctr_unique_files 1 +mr_equal ctr_unique_PNFs 1 dr_equal ctr_publish_query 1 dr_equal ctr_publish_query_bad_file_prefix 0 @@ -77,4 +76,4 @@ check_dfc_logs store_logs END -print_result
\ No newline at end of file +print_result diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh index e29d948bf..380d3ed0f 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh index ad71d3043..2776399c3 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh index 3d608351a..b1ab48224 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh index 1b1ae452c..338a20da0 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh index bb3d2ba70..93dd69c0c 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed1_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh index 25e68e725..f7b67d51b 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh index f5996213b..3de577eee 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed1_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh index 7e6288b84..6efa32244 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh index 10de5c7fe..fd3977348 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed1_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh index 8be18cbcd..cc3839bec 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh index 861e03532..f16c442f2 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh index 0c21b3e01..0a5b3f1d4 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh index c69958d72..add145492 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh index 134c87c73..960ea9679 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1_2_3_4.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh index 442bdce88..9734d9714 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed3_PM_CTR.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed3.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh index 780fbf724..50da063a4 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh @@ -30,9 +30,7 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed1_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.json" consul_config_app 1 "../simulator-group/consul/c13_feed2_CTR.json" -consul_config_dmaap 1 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh index 4c3fca0d7..08d4d9ea2 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh index feae9d5ae..1bc88ef95 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 diff --git a/test/mocks/datafilecollector-testharness/auto-test/README.md b/test/mocks/datafilecollector-testharness/auto-test/README.md index a94076f58..b73067dee 100644 --- a/test/mocks/datafilecollector-testharness/auto-test/README.md +++ b/test/mocks/datafilecollector-testharness/auto-test/README.md @@ -1,6 +1,8 @@ ## Running automated test case and test suites Test cases run a single test case and test suites run one or more test cases in a sequence. +The test cases and test suites are possible to run on both Ubuntu and Mac-OS. + ##Overall structure and setup Test cases and test suites are written as bash scripts which call predefined functions in two other bash scripts located in ../common dir. @@ -69,201 +71,8 @@ print_result ``` ----------------------------------------------------------- -The ../common/testcase_common.sh contains all functions needed for the test case file. - -The following is a list of the available functions in a test case file. Please see some of the defined test case for examples. - -**log_sim_settings**</br> -Print the env variables needed for the simulators and their setup - -**clean_containers**</br> -Stop and remove all containers including dfc apps and simulators - -**start_simulators**</br> -Start all simulators in the simulator group - -**start_dfc <dfc-instance-id>**</br> -Start the dfc application. The arg shall be an integer from 0 to 5 reprenting the dfc instance to start. DFC app will get a name like 'dfc_app0' to 'dfc_app4'. - -**kill_dfc <dfc-instance-id> **</br> -Stop and remove the dfc app container with the instance id. - -**consul_config_app <dfc-instance-id> <json-file-path>**</br> -Configure consul with json file with app config for a dfc instance using the dfc instance id and the json file. - -**consul_config_dmaap <dfc-instance-id> <json-file-path>**</br> -Configure consul with json file with dmaap config for a dfc instance using the dfc instance id and the json file. +The ../common/testcase_common.sh contains all functions needed for the test case file. See the README.md file in the ../common dir for a description of all available functions. -**kill_dr**</br> -Stop and remove the DR simulator container - -**kill_drr**</br> -Stop and remove the DR redir simulator container - -**kill_mr**</br> -Stop and remove the MR simulator container - -**kill_sftp <sftp-instance-id>**</br> -Stop and remove a SFTP container with the supplied instance id (0-5). - -**stop_sftp <sftp-instance-id>**</br> -Stop a SFTP container with the supplied instance id (0-5). - -**start_sftp <sftp-instance-id>**</br> -Start a previously stopped SFTP container with the supplied instance id (0-5). - -**kill_ftps <ftps-instance-id>**</br> -Stop and remove a FTPS container with the supplied instance id (0-5). - -**stop_ftps <ftps-instance-id>**</br> -Stop a FTPS container with the supplied instance id (0-5). - -**start_ftps <ftps-instance-id>**</br> -Start a previously stopped FTPS container with the supplied instance id (0-5). - -**mr_print <vaiable-name>**</br> -Print a variable value from the MR simulator. - -**dr_print <vaiable-name>**</br> -Print a varialle value from the DR simulator. - -**drr_print <vaiable-name>**</br> -Print a variable value from the DR redir simulator. - -**dfc_print <dfc-instance-id> <vaiable-name>**</br> -Print a variable value from an dfc instance with the supplied instance id (0-5). - -**mr_read <vaiable-name>**</br> -Read a variable value from MR sim and send to stdout - -**dr_read <vaiable-name>**</br> -Read a variable value from DR sim and send to stdout - -**drr_read <vaiable-name>**</br> -Read a variable value from DR redir sim and send to stdout - -**sleep_wait <sleep-time-in-sec>**</br> -Sleep for a number of seconds - -**sleep_heartbeat <sleep-time-in-sec>**</br> -Sleep for a number of seconds and prints dfc heartbeat output every 30 sec - -**mr_equal <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the MR simulator is equal to a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -equal to the targer or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value becomes equal to the target -value or not. - -**mr_greater <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the MR simulator is greater than a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -greater the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value is greater than the target -value or not. - -**mr_less <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the MR simulator is less than a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -less than the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value is less than the target -value or not. - -**mr_contain_str <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the MR simulator contains a substring target and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable contains -the target substring or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value contains the target -substring or not. - -**dr_equal <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR simulator is equal to a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -equal to the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value becomes equal to the target -value or not. - -**dr_greater <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR simulator is greater than a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -greater the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value is greater than the target -value or not. - -**dr_less <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR simulator is less than a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -less than the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value is less than the target -value or not. - -**dr_contain_str <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR simulator contains a substring target and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable contains -the target substring or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value contains the target -substring or not. - -**drr_equal <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR Redir simulator is equal to a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -equal to the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value becomes equal to the target -value or not. - -**drr_greater <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR Redir simulator is greater than a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -greater the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value is greater than the target -value or not. - -**drr_less <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR Redir simulator is less than a target value and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is -less than the target or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value is less than the target -value or not. - -**drr_contain_str <variable-name> <target-value> [<timeout-in-sec>]**</br> -Tests if a variable value in the DR Redir simulator contains a substring target and and optional timeout. -</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable contains -the target substring or not. -</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds -before setting pass or fail depending on if the variable value contains the target -substring or not. - -**dfc_contain_str <variable-name> <substring-in-quotes>**</br> -Test is a variable in the DFC contains a substring. - -**store_logs <log-prefix>**</br> -Store all dfc app and simulators log to the test case log dir. All logs gets a prefix to -separate logs stored at different steps in the test script. -If logs need to be stored in several locations, use different prefix to easily identify the location -when the logs where taken. - -**check_dfc_log**</br> -Check the dfc application log for WARN and ERR messages and print the count. - -**print_result**</br> -Print the test result. Only once at the very end of the script. - -**print_all**</br> -Print all variables from the simulators and the dfc heartbeat. - -In addition, comment in the file can be added using the normal comment sign in bash '#'. -Comments that shall be visible on the screen as well as in the test case log, use ``echo "<msg>"``. ##Test suite files## A test suite file contains one or more test cases to run in sequence. @@ -297,15 +106,15 @@ suite_complete ``` ----------------------------------------------------------- -The ../common/testsuite_common.sh contains all functions needed for a test suite file. - -The following is a list of the available functions in a test case file. Please see a existing test suite for examples. - -**suite_setup**</br> -Sets up the test suite and print out a heading. +The ../common/testsuite_common.sh contains all functions needed for a test suite file. See the README.md file in the ../common dir for a description of all available functions. -**run_tc <tc-script> <$1 from test suite script> <$2 from test suite script>**</br> -Execute a test case with arg from test suite script +##Known limitations## +When DFC has polled a new event from the MR simulator, DFC starts to check each file whether it has been already published or not. This check is done per file towards the DR simulator. +If the event contains a large amount of files, there is a risk that DFC will flood the DR simulator with requests for these checks. The timeout in DFC for the response is currently 4 sec and the DR simulator may not be able to answer all request within the timeout. +DR simulator is single threaded. This seem to be a problem only for the first polled event. For subsequent events these requests seem to be spread out in time by DFC so the DR simulator can respond in time. +The problem is visible in the DR simulator counters `ctr_publish_query` and`ctr_publish_query_not_published` in the auto-test scripts. They will have a count slightly less (1 to 5) than the actual number of files in the event. The application log in DFC also prints a timeout error for each failed request. +A number of the test script will report failure due to this limitation in the DR simulator. -**suite_complete**</br> -Print out the overall result of the executed test cases.
\ No newline at end of file +The FTP servers may deny connection when too many file download requests are made in a short time from DFC. +This is visible in the DFC application log as WARNINGs for failed downloads. However, DFC always retry the failed download a number of times to +minimize the risk of giving up download completely for these files.
\ No newline at end of file diff --git a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh index f221ac5f5..6e3368518 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 @@ -62,7 +61,7 @@ TARGET_EVENTS=$((TARGET_FILES-70000+700)) #First event from a PNF is 100 new fi TARGET_VOLUME=$((TARGET_FILES*1000000)) #Maximum number of configured FTP files, if DFC reach this then the NUM_FTPSFILES need to be increased. -MAX_FILES=$((NUM_FTPFILE*NUM_PNFS)) +MAX_FILES=$((NUM_FTPFILES*NUM_PNFS)) #Wait remaining time upto 15 min for DFC to download all consumed events sleep_wait 870 diff --git a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh index bc0b2efb5..baafc906d 100755 --- a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh +++ b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh @@ -30,7 +30,6 @@ log_sim_settings start_simulators consul_config_app 0 "../simulator-group/consul/c12_feed2_PM.json" -consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed2.json" mr_equal ctr_requests 0 60 dr_equal ctr_published_files 0 60 @@ -62,7 +61,7 @@ TARGET_EVENTS=$((TARGET_FILES-70000+700)) #First event from a PNF is 100 new TARGET_VOLUME=$((TARGET_FILES*1000000)) #Maximum number of configured FTP files, if DFC reach this then the NUM_FTPSFILES need to be increased. -MAX_FILES=$((NUM_FTPFILE*NUM_PNFS)) +MAX_FILES=$((NUM_FTPFILES*NUM_PNFS)) #Wait remaining time upto 15 min for DFC to download all consumed events sleep_wait 870 |