Added support for Consul/CBS and multiple DFCs
Issue-ID: INT-1155
Change-Id: I3c1ed2f6072655c4396e406ddfd490d3786fe4d6
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
index 7cb07de..8060ddf 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
@@ -8,86 +8,101 @@
clean_containers
-export DR_TC="--tc normal"
-export DR_REDIR_TC="--tc normal"
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 DR_REDIR_FEEDS="2:A"
+
export BC_TC=""
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
-dfc_contain_str heartbeat "I'm living!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str heartbeat "I'm living"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str start "Datafile Service is still running!"
-dfc_contain_str heartbeat "I'm living"
+dfc_contain_str 0 heartbeat "I'm living!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 heartbeat "I'm living"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 start "Datafile Service is still running!"
+dfc_contain_str 0 heartbeat "I'm living"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
-dfc_contain_str start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 start "Datafile Service has been started!"
sleep_wait 30
-dr_equal ctr_published_files 1
+dr_equal ctr_published_files 1
-mr_greater ctr_requests 1
+mr_greater ctr_requests 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_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
-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
#### TEST COMPLETE ####