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/FTC33.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh
index a45ce10..1b1ae45 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-TC_ONELINE_DESCR="DFC file retention (files with SFTP and then same files overSFTP). 1MB, 5MB and 50MB using first SFTP and thenSFTP with restart of MR between each file."
+TC_ONELINE_DESCR="DFC file retention (files with SFTP and then same files over FTPS). 1MB, 5MB and 50MB using first SFTP and thenSFTP with restart of MR between each file."
. ../common/testcase_common.sh $1 $2
@@ -8,28 +8,39 @@
clean_containers
-export DR_TC="--tc normal"
-export DR_REDIR_TC="--tc normal"
export MR_TC="--tc100"
-export BC_TC=""
+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 NUM_FTPFILES="1"
export NUM_PNFS="1"
export FILE_SIZE="ALL"
export FTP_TYPE="ALL"
+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
-start_dfc
+start_dfc 0
-mr_equal ctr_events 1 60
-mr_contain_str tc_info "TC#100"
-dr_equal ctr_published_files 1 30
+mr_equal ctr_events 1 60
+mr_contain_str tc_info "TC#100"
+dr_equal ctr_published_files 1 30
kill_mr
@@ -38,9 +49,9 @@
start_simulators
mr_print tc_info
-mr_equal ctr_events 1 60
-mr_contain_str tc_info "TC#101"
-dr_equal ctr_published_files 2 30
+mr_equal ctr_events 1 60
+mr_contain_str tc_info "TC#101"
+dr_equal ctr_published_files 2 30
kill_mr
export MR_TC="--tc102"
@@ -48,9 +59,9 @@
start_simulators
mr_print tc_info
-mr_equal ctr_events 1 60
-mr_contain_str tc_info "TC#102"
-dr_equal ctr_published_files 3 30
+mr_equal ctr_events 1 60
+mr_contain_str tc_info "TC#102"
+dr_equal ctr_published_files 3 30
kill_mr
export MR_TC="--tc200"
@@ -58,9 +69,9 @@
start_simulators
mr_print tc_info
-mr_equal ctr_events 1 60
-mr_contain_str tc_info "TC#200"
-dr_equal ctr_published_files 3 30
+mr_equal ctr_events 1 60
+mr_contain_str tc_info "TC#200"
+dr_equal ctr_published_files 3 30
kill_mr
export MR_TC="--tc201"
@@ -68,9 +79,9 @@
mr_print tc_info
-mr_equal ctr_events 1 60
-mr_contain_str tc_info "TC#201"
-dr_equal ctr_published_files 3 30
+mr_equal ctr_events 1 60
+mr_contain_str tc_info "TC#201"
+dr_equal ctr_published_files 3 30
kill_mr
export MR_TC="--tc202"
@@ -78,26 +89,29 @@
mr_print tc_info
-mr_equal ctr_events 1 60
-mr_contain_str tc_info "TC#202"
-dr_equal ctr_published_files 3 30
+mr_equal ctr_events 1 60
+mr_contain_str tc_info "TC#202"
+dr_equal ctr_published_files 3 30
-dr_equal ctr_publish_query 3
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 3
-dr_equal ctr_publish_req 3
-dr_equal ctr_publish_req_redirect 3
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 3
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 3
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 3
+dr_equal ctr_publish_req 3
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 3
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 3
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 3
-drr_equal ctr_publish_responses 3
+drr_equal ctr_publish_requests 3
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 3
-drr_equal dwl_volume 56000000
+drr_equal dwl_volume 56000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####