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, 40 insertions, 25 deletions

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 cf4dbdc71..4c3fca0d7 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh
@@ -8,30 +8,41 @@ TC_ONELINE_DESCR="Maximum number of 1MB FTPS files during 24h, 700 PNFs. 100 new
 
 clean_containers
 
+export MR_TC="--tc2200"
+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="--tc2200"
-export BC_TC=""
-export NUM_FTPFILES="3500"
+export DR_REDIR_FEEDS="2:A"
+
+export NUM_FTPFILES="4000"
 export NUM_PNFS="700"
 export FILE_SIZE="1MB"
 export FTP_TYPE="FTPS"
+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
 
 # 24h MR sim execution time since first poll, should be reached withing 24h +1h margin
-mr_contain_str      exe_time_first_poll             1440: $((60*60*24+3600))
+mr_contain_str      exe_time_first_poll                  1440: $((60*60*24+3600))
 # stop event delivery
 mr_print            stop
 # wait for MR sim values to stabilize
@@ -46,43 +57,47 @@ TARGET_FILES=$(mr_read ctr_unique_files)
 TARGET_EVENTS=$((TARGET_FILES/100))
 TARGET_VOLUME=$((TARGET_FILES*1000000))
 
-#Maximum number of configured FTP files, if DFC download more than this then the NUM_FTPSFILES need to be increased.
-MAX_FILES=$((NUM_FTPFILE*NUM_PNFS))
+#Maximum number of configured FTP files, if DFC reach this then the NUM_FTPSFILES need to be increased.
+MAX_FILES=$((NUM_FTPFILES*NUM_PNFS))
 
 #Wait remaining time upto 15 min for DFC to download all consumed events
 sleep_wait          870
 
 #At least the requiment number of file shall be published
-dr_greater          ctr_published_files             $TARGET_REQUIRMENT_FILES
+dr_greater          ctr_published_files                  $TARGET_REQUIRMENT_FILES
 
 #If greater then MAX_FILES then more FTP files need to be configured
-mr_less             ctr_ctr_unique_files            MAX_FILES
+mr_less             ctr_unique_files                     $MAX_FILES
 
 
 #Test that all files from polled events has been downloaded etc
 
-dr_equal            ctr_published_files             $TARGET_FILES
+dr_equal            ctr_published_files                  $TARGET_FILES
 
-mr_equal            ctr_events                      $TARGET_EVENTS
+mr_equal            ctr_events                           $TARGET_EVENTS
 
-mr_equal            ctr_unique_PNFs                 700
+mr_equal            ctr_unique_PNFs                      700
 
-dr_equal            ctr_publish_query               $TARGET_FILES
-dr_equal            ctr_publish_query_published     0
-dr_equal            ctr_publish_query_not_published $TARGET_FILES
-dr_equal            ctr_publish_req                 $TARGET_FILES
-dr_equal            ctr_publish_req_redirect        $TARGET_FILES
-dr_equal            ctr_publish_req_published       0
-dr_equal            ctr_published_files             $TARGET_FILES
+dr_equal            ctr_publish_query                    $TARGET_FILES
+dr_equal            ctr_publish_query_bad_file_prefix    0
+dr_equal            ctr_publish_query_published          0
+dr_equal            ctr_publish_query_not_published      $TARGET_FILES
+dr_equal            ctr_publish_req                      $TARGET_FILES
+dr_equal            ctr_publish_req_bad_file_prefix      0
+dr_equal            ctr_publish_req_redirect             $TARGET_FILES
+dr_equal            ctr_publish_req_published            0
+dr_equal            ctr_published_files                  $TARGET_FILES
+dr_equal            ctr_double_publish                   0
 
-drr_equal           ctr_publish_requests            $TARGET_FILES
-drr_equal           ctr_publish_responses           $TARGET_FILES
+drr_equal           ctr_publish_requests                 $TARGET_FILES
+drr_equal           ctr_publish_requests_bad_file_prefix 0
+drr_equal           ctr_publish_responses                $TARGET_FILES
 
-drr_equal           dwl_volume                      $TARGET_VOLUME
+drr_equal           dwl_volume                           $TARGET_VOLUME
 
 print_all
 
-check_dfc_log
+check_dfc_logs
 
 #### TEST COMPLETE ####