aboutsummaryrefslogtreecommitdiffstats
path: root/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
diff options
context:
space:
mode:
authorBjornMagnussonXA <bjorn.magnusson@est.tech>2019-07-17 08:26:50 +0000
committerBjornMagnussonXA <bjorn.magnusson@est.tech>2019-07-17 08:26:50 +0000
commita79a043b5a99fa05e9f73559ff1c3b2e36bd70c0 (patch)
tree68467182b78b7ac58f183483ecd97749ef4e824a /test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
parentc98471c6541573d73edc677272f23e06c6c28dbc (diff)
Added support for Consul/CBS and multiple DFCs
Issue-ID: INT-1155 Change-Id: I3c1ed2f6072655c4396e406ddfd490d3786fe4d6 Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Diffstat (limited to 'test/mocks/datafilecollector-testharness/auto-test/FTC31.sh')
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC31.sh64
1 files changed, 39 insertions, 25 deletions
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
index 34cf8aecf..ad71d3043 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
@@ -8,66 +8,80 @@ TC_ONELINE_DESCR="DFC file retention using DR. Publish 1 file, retstart MR sim
clean_containers
+export MR_TC="--tc100"
+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_REDIR_TC="--tc normal"
-export MR_TC="--tc100"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="1"
export NUM_PNFS="1"
export FILE_SIZE="1MB"
export FTP_TYPE="SFTP"
+export FTP_FILE_PREFIXES="A"
+export NUM_FTP_SERVERS=1
log_sim_settings
start_simulators
-mr_equal ctr_requests 0 60
-dr_equal ctr_published_files 0 60
+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
mr_print tc_info
dr_print tc_info
drr_print tc_info
-start_dfc
+start_dfc 0
-dr_equal ctr_published_files 1 60
+dr_equal ctr_published_files 1 60
sleep_wait 30
-dr_equal ctr_published_files 1
+dr_equal ctr_published_files 1
-mr_equal ctr_events 1
-mr_equal ctr_unique_files 1
-mr_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_published 0
-dr_equal ctr_publish_query_not_published 1
-dr_equal ctr_publish_req 1
-dr_equal ctr_publish_req_redirect 1
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 1
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 1
+dr_equal ctr_publish_query_bad_file_prefix 0
+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_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 1
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 1
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 1
-drr_equal ctr_publish_responses 1
+drr_equal ctr_publish_requests 1
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 1
-drr_equal dwl_volume 1000000
+drr_equal dwl_volume 1000000
-check_dfc_log
+check_dfc_logs
store_logs PART1
kill_mr
-kill_dfc
+kill_dfc 0
start_simulators
mr_equal ctr_events 0 60
mr_equal ctr_unique_files 0
mr_equal ctr_unique_PNFs 0
-start_dfc
+start_dfc 0
sleep_wait 30
@@ -89,7 +103,7 @@ drr_equal ctr_publish_responses 1
drr_equal dwl_volume 1000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####