Added support for Consul/CBS and multiple DFCs

Issue-ID: INT-1155
Change-Id: I3c1ed2f6072655c4396e406ddfd490d3786fe4d6
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>

1 files changed, 47 insertions, 33 deletions

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh
index f7e9bf5d8..46fff9d5a 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh
@@ -8,71 +8,85 @@ TC_ONELINE_DESCR="DFC start and stop during poll, download and publish."
 
 clean_containers
 
+export MR_TC="--tc1300"
+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="--tc113"
-export BC_TC=""
-export NUM_FTPFILES="199"
-export NUM_PNFS="1"
+export DR_REDIR_FEEDS="2:A"
+
+export NUM_FTPFILES="200"
+export NUM_PNFS="700"
 export FILE_SIZE="1MB"
 export FTP_TYPE="SFTP"
+export FTP_FILE_PREFIXES="A"
+export NUM_FTP_SERVERS=5
 
 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
 
-mr_greater          ctr_events                      0 120
-dr_print            ctr_published_files
+mr_equal            ctr_events                           35 120
 
+dfc_contain_str     0                                    heartbeat    "I'm living!"
+dfc_contain_str     0                                    stopDatafile "Datafile Service has already been stopped!"
 
-dfc_contain_str     heartbeat                       "I'm living!"
-dfc_contain_str     stopDatafile                    "Datafile Service has already been stopped!"
+dr_equal            ctr_published_files                  3500 900
 
 sleep_wait          120
 
-dfc_contain_str     start                           "Datafile Service has been started!"
+dfc_contain_str     0                                    start        "Datafile Service has been started!"
+
+mr_equal            ctr_events                           70 120
 
-dr_greater          ctr_published_files             100 60
-dr_less             ctr_published_files             199
-dr_print            ctr_published_files
+dfc_contain_str     0                                    heartbeat    "I'm living!"
+dfc_contain_str     0                                    stopDatafile "Datafile Service has already been stopped!"
 
-dfc_contain_str     heartbeat                       "I'm living!"
-dfc_contain_str     stopDatafile                    "Datafile Service has already been stopped!"
+dr_equal            ctr_published_files                  7000 900
 
 sleep_wait          120
 
-dfc_contain_str     start                           "Datafile Service has been started!"
+dfc_contain_str     0                                    start        "Datafile Service has been started!"
 
-dr_equal            ctr_published_files             199 60
+dr_equal            ctr_published_files                  7000
 
 
-mr_equal            ctr_events                      100
-mr_equal            ctr_unique_files                199
-mr_equal            ctr_unique_PNFs                 1
+mr_equal            ctr_events                           70
+mr_equal            ctr_unique_files                     7000
+mr_equal            ctr_unique_PNFs                      70
 
-dr_equal            ctr_publish_query               199
-dr_equal            ctr_publish_query_published     0
-dr_equal            ctr_publish_query_not_published 199
-dr_equal            ctr_publish_req                 199
-dr_equal            ctr_publish_req_redirect        199
-dr_equal            ctr_publish_req_published       0
-dr_equal            ctr_published_files             199
+dr_equal            ctr_publish_query                    7000
+dr_equal            ctr_publish_query_bad_file_prefix    0
+dr_equal            ctr_publish_query_published          0
+dr_equal            ctr_publish_query_not_published      7000
+dr_equal            ctr_publish_req                      7000
+dr_equal            ctr_publish_req_bad_file_prefix      0
+dr_equal            ctr_publish_req_redirect             7000
+dr_equal            ctr_publish_req_published            0
+dr_equal            ctr_published_files                  7000
 
-drr_equal           ctr_publish_requests            199
-drr_equal           ctr_publish_responses           199
+drr_equal           ctr_publish_requests                 7000
+drr_equal           ctr_publish_requests_bad_file_prefix 0
+drr_equal           ctr_publish_responses                7000
 
-drr_equal           dwl_volume                      199000000
+drr_equal           dwl_volume                           7000000000
 
-check_dfc_log
+check_dfc_logs
 
 #### TEST COMPLETE ####