Update DFC tests to use file based conifg

[integration.git] / test / mocks / datafilecollector-testharness / auto-test / FTC70.sh

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
index e464d88..4de28e3 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
@@ -8,58 +8,71 @@ TC_ONELINE_DESCR="199 file publish attempt where 10% of calls to DR sim and DR r
 
 clean_containers
 
+export MR_TC="--tc113"
+export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES"
+export MR_FILE_PREFIX_MAPPING="PM_MEAS_FILES:A"
+
 export DR_TC="--tc 10p_error_response"
+export DR_FEEDS="2:A"
+
 export DR_REDIR_TC="--tc 10p_error_response"
-export MR_TC="--tc113"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
 export NUM_FTPFILES="199"
 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
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
+
+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             199 300
+dr_equal            ctr_published_files                  199 300
 
 sleep_wait          30
 
-dr_equal            ctr_published_files             199
+dr_equal            ctr_published_files                  199
 
-mr_greater          ctr_requests                    1
+mr_greater          ctr_requests                         1
 
-mr_equal            ctr_events                      100
-mr_equal            ctr_unique_files                199
-mr_equal            ctr_unique_PNFs                 1
+mr_equal            ctr_events                           100
+mr_equal            ctr_unique_files                     199
+mr_equal            ctr_unique_PNFs                      1
 
-dr_equal            ctr_publish_query               199
-dr_equal            ctr_publish_query_published     0
-dr_less             ctr_publish_query_not_published 199
-dr_greater          ctr_publish_req                 199
-dr_greater          ctr_publish_req_redirect        199
-dr_equal            ctr_publish_req_published       0
-dr_equal            ctr_published_files             199
-dr_equal            ctr_double_publish              0
+dr_equal            ctr_publish_query                    199
+dr_equal            ctr_publish_query_bad_file_prefix    0
+dr_equal            ctr_publish_query_published          0
+dr_less             ctr_publish_query_not_published      199
+dr_greater          ctr_publish_req                      199
+dr_equal            ctr_publish_req_bad_file_prefix      0
+dr_greater          ctr_publish_req_redirect             199
+dr_equal            ctr_publish_req_published            0
+dr_equal            ctr_published_files                  199
+dr_equal            ctr_double_publish                   0
 
-drr_greater         ctr_publish_requests            199
-drr_equal           ctr_publish_responses           199
+drr_greater         ctr_publish_requests                 199
+drr_equal           ctr_publish_requests_bad_file_prefix 0
+drr_greater         ctr_publish_responses                199
 
-drr_equal           dwl_volume                      199000000
+drr_equal           dwl_volume                           199000000
 
-check_dfc_log
+check_dfc_logs
 
 #### TEST COMPLETE ####
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result