aboutsummaryrefslogtreecommitdiffstats
path: root/test/mocks/datafilecollector-testharness/auto-test
diff options
context:
space:
mode:
authorBjornMagnussonXA <bjorn.magnusson@est.tech>2019-07-17 08:26:50 +0000
committerBjornMagnussonXA <bjorn.magnusson@est.tech>2019-07-17 08:26:50 +0000
commita79a043b5a99fa05e9f73559ff1c3b2e36bd70c0 (patch)
tree68467182b78b7ac58f183483ecd97749ef4e824a /test/mocks/datafilecollector-testharness/auto-test
parentc98471c6541573d73edc677272f23e06c6c28dbc (diff)
Added support for Consul/CBS and multiple DFCs
Issue-ID: INT-1155 Change-Id: I3c1ed2f6072655c4396e406ddfd490d3786fe4d6 Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Diffstat (limited to 'test/mocks/datafilecollector-testharness/auto-test')
-rw-r--r--test/mocks/datafilecollector-testharness/auto-test/.gitignore2
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh65
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh65
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/AllTestCasesSuite.sh59
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh467
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/DFC_FileRetentionSuite.sh1
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC1.sh62
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC10.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC100.sh81
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC11.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC12.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC13.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC14.sh79
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC15.sh79
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC2.sh62
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC20.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC200.sh119
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC21.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC210.sh80
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC220.sh62
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC3.sh62
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC30.sh93
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC31.sh64
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC32.sh58
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC33.sh86
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC4.sh62
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC40.sh84
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC5.sh62
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC50.sh56
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC6.sh62
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC60.sh68
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC61.sh70
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC70.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC71.sh60
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC80.sh100
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC81.sh88
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/FTC90.sh100
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh65
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh64
-rw-r--r--test/mocks/datafilecollector-testharness/auto-test/README.md76
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh79
-rwxr-xr-xtest/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh79
42 files changed, 2442 insertions, 799 deletions
diff --git a/test/mocks/datafilecollector-testharness/auto-test/.gitignore b/test/mocks/datafilecollector-testharness/auto-test/.gitignore
index 2a21cc0a3..83c64decb 100644
--- a/test/mocks/datafilecollector-testharness/auto-test/.gitignore
+++ b/test/mocks/datafilecollector-testharness/auto-test/.gitignore
@@ -1,2 +1,2 @@
logs
-.tmp_tcsuite_*
+.tmp_*
diff --git a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh
new file mode 100755
index 000000000..76afc8c7c
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="Simulating a 25h backlog of events for 700 PNF with decreasing number of missing files, then continues with 15 min events from all PNFs using FTPS."
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc1500"
+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="300"
+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
+
+
+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 0
+
+mr_equal ctr_unique_files 70000 18000
+
+mr_print stop
+
+dr_equal ctr_published_files 70000 900
+
+sleep_wait 30
+
+dr_equal ctr_published_files 70000
+
+mr_equal ctr_events 70700
+mr_equal ctr_unique_files 70000
+mr_equal ctr_unique_PNFs 700
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh
new file mode 100755
index 000000000..2722182d9
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="Simulating a 25h backlog of events for 700 PNF with decreasing number of missing files, then continues with 15 min events from all PNFs using SFTP"
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc1500"
+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="300"
+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
+
+
+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 0
+
+mr_equal ctr_unique_files 70000 18000
+
+mr_print stop
+
+dr_equal ctr_published_files 70000 900
+
+sleep_wait 30
+
+dr_equal ctr_published_files 70000
+
+mr_equal ctr_events 70700
+mr_equal ctr_unique_files 70000
+mr_equal ctr_unique_PNFs 700
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/AllTestCasesSuite.sh b/test/mocks/datafilecollector-testharness/auto-test/AllTestCasesSuite.sh
new file mode 100755
index 000000000..512e5e4a6
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/AllTestCasesSuite.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+TS_ONELINE_DESCR="All test cases suite (excluding 24 h max test and 72 stab test)"
+
+. ../common/testsuite_common.sh
+
+suite_setup
+
+############# TEST CASES #################
+
+run_tc FTC1.sh $1 $2
+run_tc FTC2.sh $1 $2
+run_tc FTC3.sh $1 $2
+run_tc FTC4.sh $1 $2
+run_tc FTC5.sh $1 $2
+run_tc FTC6.sh $1 $2
+
+run_tc FTC10.sh $1 $2
+run_tc FTC11.sh $1 $2
+run_tc FTC12.sh $1 $2
+run_tc FTC13.sh $1 $2
+run_tc FTC14.sh $1 $2
+run_tc FTC15.sh $1 $2
+
+run_tc FTC20.sh $1 $2
+run_tc FTC21.sh $1 $2
+
+run_tc FTC30.sh $1 $2
+run_tc FTC31.sh $1 $2
+run_tc FTC32.sh $1 $2
+run_tc FTC33.sh $1 $2
+
+run_tc FTC40.sh $1 $2
+
+run_tc FTC50.sh $1 $2
+
+run_tc FTC60.sh $1 $2
+run_tc FTC61.sh $1 $2
+
+run_tc FTC70.sh $1 $2
+run_tc FTC71.sh $1 $2
+
+run_tc FTC80.sh $1 $2
+run_tc FTC81.sh $1 $2
+
+run_tc FTC90.sh $1 $2
+
+run_tc FTC100.sh $1 $2
+
+run_tc FTC200.sh $1 $2
+run_tc FTC210.sh $1 $2
+run_tc FTC220.sh $1 $2
+
+
+
+
+##########################################
+
+suite_complete
diff --git a/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh b/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh
new file mode 100755
index 000000000..462a7dd37
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh
@@ -0,0 +1,467 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="Test script for auto test and simulator control"
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc1000"
+export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES:CTR_MEAS_FILES,OpenDcae-c13:CTR_MEAS_FILES,OpenDcae-c14:LOG_FILES,OpenDcae-c15:PM_MEAS_FILES:TEST_FILES,OpenDcae-c16:TEST_FILES:TEMP_FILES"
+export MR_FILE_PREFIX_MAPPING="PM_MEAS_FILES:A,CTR_MEAS_FILES:B,LOG_FILES:C,TEST_FILES:D,TEMP_FILES:E"
+
+export DR_TC="--tc normal"
+export DR_FEEDS="1:A,2:B,3:C,4:D,5:E"
+
+export DR_REDIR_TC="--tc normal"
+export DR_REDIR_FEEDS="1:A,2:B,3:C,4:D,5:E"
+
+export NUM_FTPFILES="300"
+export NUM_PNFS="5"
+export FILE_SIZE="1MB"
+export FTP_TYPE="SFTP"
+export FTP_FILE_PREFIXES="A,B,C,D,E"
+export NUM_FTP_SERVERS=5
+
+
+
+log_sim_settings
+
+start_simulators
+
+consul_config_app 0 "../simulator-group/consul/c12_feed1_PM_feed2_CTR.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json"
+
+consul_config_app 1 "../simulator-group/consul/c13_feed2_CTR.json"
+consul_config_dmaap 1 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json"
+
+consul_config_app 2 "../simulator-group/consul/c14_feed3_LOG.json"
+consul_config_dmaap 2 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json"
+
+consul_config_app 3 "../simulator-group/consul/c15_feed1_PM_feed4_TEST.json"
+consul_config_dmaap 3 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json"
+
+consul_config_app 2 "../simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json"
+consul_config_dmaap 4 "../simulator-group/consul/dmaap_feed1_2_3_4_5.json"
+
+
+mr_print ""
+mr_print groups
+mr_print changeids
+mr_print fileprefixes
+mr_print tc_info
+mr_print status
+mr_print stop
+mr_print start
+
+mr_print ctr_requests
+mr_print groups/ctr_requests
+mr_print ctr_requests/OpenDcae-c12
+mr_print ctr_requests/OpenDcae-c13
+mr_print ctr_requests/OpenDcae-c14
+mr_print ctr_requests/OpenDcae-c15
+mr_print ctr_requests/OpenDcae-c16
+
+mr_print ctr_responses
+mr_print groups/ctr_responses
+mr_print ctr_responses/OpenDcae-c12
+mr_print ctr_responses/OpenDcae-c13
+mr_print ctr_responses/OpenDcae-c14
+mr_print ctr_responses/OpenDcae-c15
+mr_print ctr_responses/OpenDcae-c16
+
+mr_print ctr_files
+mr_print groups/ctr_files
+mr_print ctr_files/OpenDcae-c12
+mr_print ctr_files/OpenDcae-c13
+mr_print ctr_files/OpenDcae-c14
+mr_print ctr_files/OpenDcae-c15
+mr_print ctr_files/OpenDcae-c16
+
+mr_print ctr_unique_files
+mr_print groups/ctr_unique_files
+mr_print ctr_unique_files/OpenDcae-c12
+mr_print ctr_unique_files/OpenDcae-c13
+mr_print ctr_unique_files/OpenDcae-c14
+mr_print ctr_unique_files/OpenDcae-c15
+mr_print ctr_unique_files/OpenDcae-c16
+
+mr_print ctr_events
+mr_print groups/ctr_events
+mr_print ctr_events/OpenDcae-c12
+mr_print ctr_events/OpenDcae-c13
+mr_print ctr_events/OpenDcae-c14
+mr_print ctr_events/OpenDcae-c15
+mr_print ctr_events/OpenDcae-c16
+
+mr_contain_str groups "OpenDcae-c12,OpenDcae-c13,OpenDcae-c14,OpenDcae-c15,OpenDcae-c16"
+mr_contain_str changeids "PM_MEAS_FILES:CTR_MEAS_FILES,CTR_MEAS_FILES,LOG_FILES,PM_MEAS_FILES:TEST_FILES,TEST_FILES:TEMP_FILES"
+mr_contain_str fileprefixes $MR_FILE_PREFIX_MAPPING
+mr_contain_str tc_info "TC#1000"
+mr_contain_str status "Started"
+mr_contain_str stop "Stopped"
+mr_contain_str start "Started"
+
+mr_equal ctr_requests 0
+mr_contain_str groups/ctr_requests "0,0,0,0,0"
+mr_equal ctr_requests/OpenDcae-c12 0
+mr_equal ctr_requests/OpenDcae-c13 0
+mr_equal ctr_requests/OpenDcae-c14 0
+mr_equal ctr_requests/OpenDcae-c15 0
+mr_equal ctr_requests/OpenDcae-c16 0
+
+mr_equal ctr_responses 0
+mr_contain_str groups/ctr_responses "0,0,0,0,0"
+mr_equal ctr_responses/OpenDcae-c12 0
+mr_equal ctr_responses/OpenDcae-c13 0
+mr_equal ctr_responses/OpenDcae-c14 0
+mr_equal ctr_responses/OpenDcae-c15 0
+mr_equal ctr_responses/OpenDcae-c16 0
+
+mr_equal ctr_files 0
+mr_contain_str groups/ctr_files "0,0,0,0,0"
+mr_equal ctr_files/OpenDcae-c12 0
+mr_equal ctr_files/OpenDcae-c13 0
+mr_equal ctr_files/OpenDcae-c14 0
+mr_equal ctr_files/OpenDcae-c15 0
+mr_equal ctr_files/OpenDcae-c16 0
+
+mr_equal ctr_unique_files 0
+mr_contain_str groups/ctr_unique_files "0,0,0,0,0"
+mr_equal ctr_unique_files/OpenDcae-c12 0
+mr_equal ctr_unique_files/OpenDcae-c13 0
+mr_equal ctr_unique_files/OpenDcae-c14 0
+mr_equal ctr_unique_files/OpenDcae-c15 0
+mr_equal ctr_unique_files/OpenDcae-c16 0
+
+mr_equal ctr_events 0
+mr_contain_str groups/ctr_events "0,0,0,0,0"
+mr_equal ctr_events/OpenDcae-c12 0
+mr_equal ctr_events/OpenDcae-c13 0
+mr_equal ctr_events/OpenDcae-c14 0
+mr_equal ctr_events/OpenDcae-c15 0
+mr_equal ctr_events/OpenDcae-c16 0
+
+
+dr_print ""
+dr_print tc_info
+dr_print execution_time
+dr_print feeds
+
+dr_print ctr_publish_query
+dr_print feeds/ctr_publish_query
+dr_print ctr_publish_query/1
+dr_print ctr_publish_query/2
+dr_print ctr_publish_query/3
+dr_print ctr_publish_query/4
+dr_print ctr_publish_query/5
+
+dr_print ctr_publish_query_published
+dr_print feeds/ctr_publish_query_published
+dr_print ctr_publish_query_published/1
+dr_print ctr_publish_query_published/2
+dr_print ctr_publish_query_published/3
+dr_print ctr_publish_query_published/4
+dr_print ctr_publish_query_published/5
+
+dr_print ctr_publish_query_not_published
+dr_print feeds/ctr_publish_query_not_published
+dr_print ctr_publish_query_not_published/1
+dr_print ctr_publish_query_not_published/2
+dr_print ctr_publish_query_not_published/3
+dr_print ctr_publish_query_not_published/4
+dr_print ctr_publish_query_not_published/5
+
+dr_print ctr_publish_req
+dr_print feeds/ctr_publish_req
+dr_print ctr_publish_req/1
+dr_print ctr_publish_req/2
+dr_print ctr_publish_req/3
+dr_print ctr_publish_req/4
+dr_print ctr_publish_req/5
+
+dr_print ctr_publish_req_redirect
+dr_print feeds/ctr_publish_req_redirect
+dr_print ctr_publish_req_redirect/1
+dr_print ctr_publish_req_redirect/2
+dr_print ctr_publish_req_redirect/3
+dr_print ctr_publish_req_redirect/4
+dr_print ctr_publish_req_redirect/5
+
+dr_print ctr_publish_req_published
+dr_print feeds/ctr_publish_req_published
+dr_print ctr_publish_req_published/1
+dr_print ctr_publish_req_published/2
+dr_print ctr_publish_req_published/3
+dr_print ctr_publish_req_published/4
+dr_print ctr_publish_req_published/5
+
+dr_print ctr_published_files
+dr_print feeds/ctr_published_files
+dr_print ctr_published_files/1
+dr_print ctr_published_files/2
+dr_print ctr_published_files/3
+dr_print ctr_published_files/4
+dr_print ctr_published_files/5
+
+dr_print ctr_double_publish
+dr_print feeds/ctr_double_publish
+dr_print ctr_double_publish/1
+dr_print ctr_double_publish/2
+dr_print ctr_double_publish/3
+dr_print ctr_double_publish/4
+dr_print ctr_double_publish/5
+
+dr_print ctr_publish_query_bad_file_prefix
+dr_print feeds/ctr_publish_query_bad_file_prefix
+dr_print ctr_publish_query_bad_file_prefix/1
+dr_print ctr_publish_query_bad_file_prefix/2
+dr_print ctr_publish_query_bad_file_prefix/3
+dr_print ctr_publish_query_bad_file_prefix/4
+dr_print ctr_publish_query_bad_file_prefix/5
+
+dr_print ctr_publish_req_bad_file_prefix
+dr_print feeds/ctr_publish_req_bad_file_prefix
+dr_print ctr_publish_req_bad_file_prefix/1
+dr_print ctr_publish_req_bad_file_prefix/2
+dr_print ctr_publish_req_bad_file_prefix/3
+dr_print ctr_publish_req_bad_file_prefix/4
+dr_print ctr_publish_req_bad_file_prefix/5
+
+
+
+
+
+
+dr_contain_str tc_info "normal"
+dr_contain_str execution_time "0:"
+dr_contain_str feeds "1:A,2:B,3:C,4:D,5:E"
+
+dr_equal ctr_publish_query 0
+dr_contain_str feeds/ctr_publish_query "0,0,0,0,0"
+dr_equal ctr_publish_query/1 0
+dr_equal ctr_publish_query/2 0
+dr_equal ctr_publish_query/3 0
+dr_equal ctr_publish_query/4 0
+dr_equal ctr_publish_query/5 0
+
+dr_equal ctr_publish_query_published 0
+dr_contain_str feeds/ctr_publish_query_published "0,0,0,0,0"
+dr_equal ctr_publish_query_published/1 0
+dr_equal ctr_publish_query_published/2 0
+dr_equal ctr_publish_query_published/3 0
+dr_equal ctr_publish_query_published/4 0
+dr_equal ctr_publish_query_published/5 0
+
+dr_equal ctr_publish_query_not_published 0
+dr_contain_str feeds/ctr_publish_query_not_published "0,0,0,0,0"
+dr_equal ctr_publish_query_not_published/1 0
+dr_equal ctr_publish_query_not_published/2 0
+dr_equal ctr_publish_query_not_published/3 0
+dr_equal ctr_publish_query_not_published/4 0
+dr_equal ctr_publish_query_not_published/5 0
+
+dr_equal ctr_publish_req 0
+dr_contain_str feeds/ctr_publish_req "0,0,0,0,0"
+dr_equal ctr_publish_req/1 0
+dr_equal ctr_publish_req/2 0
+dr_equal ctr_publish_req/3 0
+dr_equal ctr_publish_req/4 0
+dr_equal ctr_publish_req/5 0
+
+dr_equal ctr_publish_req_redirect 0
+dr_contain_str feeds/ctr_publish_req_redirect "0,0,0,0,0"
+dr_equal ctr_publish_req_redirect/1 0
+dr_equal ctr_publish_req_redirect/2 0
+dr_equal ctr_publish_req_redirect/3 0
+dr_equal ctr_publish_req_redirect/4 0
+dr_equal ctr_publish_req_redirect/5 0
+
+dr_equal ctr_publish_req_published 0
+dr_contain_str feeds/ctr_publish_req_published "0,0,0,0,0"
+dr_equal ctr_publish_req_published/1 0
+dr_equal ctr_publish_req_published/2 0
+dr_equal ctr_publish_req_published/3 0
+dr_equal ctr_publish_req_published/4 0
+dr_equal ctr_publish_req_published/5 0
+
+dr_equal ctr_published_files 0
+dr_contain_str feeds/ctr_published_files "0,0,0,0,0"
+dr_equal ctr_published_files/1 0
+dr_equal ctr_published_files/2 0
+dr_equal ctr_published_files/3 0
+dr_equal ctr_published_files/4 0
+dr_equal ctr_published_files/5 0
+
+dr_equal ctr_double_publish 0
+dr_contain_str feeds/ctr_double_publish "0,0,0,0,0"
+dr_equal ctr_double_publish/1 0
+dr_equal ctr_double_publish/2 0
+dr_equal ctr_double_publish/3 0
+dr_equal ctr_double_publish/4 0
+dr_equal ctr_double_publish/5 0
+
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_contain_str feeds/ctr_publish_query_bad_file_prefix "0,0,0,0,0"
+dr_equal ctr_publish_query_bad_file_prefix/1 0
+dr_equal ctr_publish_query_bad_file_prefix/2 0
+dr_equal ctr_publish_query_bad_file_prefix/3 0
+dr_equal ctr_publish_query_bad_file_prefix/4 0
+dr_equal ctr_publish_query_bad_file_prefix/5 0
+
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_contain_str feeds/ctr_publish_req_bad_file_prefix "0,0,0,0,0"
+dr_equal ctr_publish_req_bad_file_prefix/1 0
+dr_equal ctr_publish_req_bad_file_prefix/2 0
+dr_equal ctr_publish_req_bad_file_prefix/3 0
+dr_equal ctr_publish_req_bad_file_prefix/4 0
+dr_equal ctr_publish_req_bad_file_prefix/5 0
+
+drr_print ""
+drr_print tc_info
+drr_print execution_time
+drr_print feeds
+drr_print speed
+
+drr_print ctr_publish_requests
+drr_print feeds/ctr_publish_requests
+drr_print ctr_publish_requests/1
+drr_print ctr_publish_requests/2
+drr_print ctr_publish_requests/3
+drr_print ctr_publish_requests/4
+drr_print ctr_publish_requests/5
+
+drr_print ctr_publish_requests_bad_file_prefix
+drr_print feeds/ctr_publish_requests_bad_file_prefix
+drr_print ctr_publish_requests_bad_file_prefix/1
+drr_print ctr_publish_requests_bad_file_prefix/2
+drr_print ctr_publish_requests_bad_file_prefix/3
+drr_print ctr_publish_requests_bad_file_prefix/4
+drr_print ctr_publish_requests_bad_file_prefix/5
+
+drr_print ctr_publish_responses
+drr_print feeds/ctr_publish_responses
+drr_print ctr_publish_responses/1
+drr_print ctr_publish_responses/2
+drr_print ctr_publish_responses/3
+drr_print ctr_publish_responses/4
+drr_print ctr_publish_responses/5
+
+drr_print time_lastpublish
+drr_print feeds/time_lastpublish
+drr_print time_lastpublish/1
+drr_print time_lastpublish/2
+drr_print time_lastpublish/3
+drr_print time_lastpublish/4
+drr_print time_lastpublish/5
+
+drr_print dwl_volume
+drr_print feeds/dwl_volume
+drr_print dwl_volume/1
+drr_print dwl_volume/2
+drr_print dwl_volume/3
+drr_print dwl_volume/4
+drr_print dwl_volume/5
+
+
+drr_contain_str tc_info "normal"
+drr_contain_str execution_time "0:"
+drr_contain_str feeds "1:A,2:B,3:C,4:D,5:E"
+drr_equal speed 0
+
+drr_equal ctr_publish_requests 0
+drr_contain_str feeds/ctr_publish_requests "0,0,0,0,0"
+drr_equal ctr_publish_requests/1 0
+drr_equal ctr_publish_requests/2 0
+drr_equal ctr_publish_requests/3 0
+drr_equal ctr_publish_requests/4 0
+drr_equal ctr_publish_requests/5 0
+
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_contain_str feeds/ctr_publish_requests_bad_file_prefix "0,0,0,0,0"
+drr_equal ctr_publish_requests_bad_file_prefix/1 0
+drr_equal ctr_publish_requests_bad_file_prefix/2 0
+drr_equal ctr_publish_requests_bad_file_prefix/3 0
+drr_equal ctr_publish_requests_bad_file_prefix/4 0
+drr_equal ctr_publish_requests_bad_file_prefix/5 0
+
+drr_equal ctr_publish_responses 0
+drr_contain_str feeds/ctr_publish_responses "0,0,0,0,0"
+drr_equal ctr_publish_responses/1 0
+drr_equal ctr_publish_responses/2 0
+drr_equal ctr_publish_responses/3 0
+drr_equal ctr_publish_responses/4 0
+drr_equal ctr_publish_responses/5 0
+
+drr_contain_str time_lastpublish "--:--"
+drr_contain_str feeds/time_lastpublish "--:--,--:--,--:--,--:--,--:--"
+drr_contain_str time_lastpublish/1 "--:--"
+drr_contain_str time_lastpublish/2 "--:--"
+drr_contain_str time_lastpublish/3 "--:--"
+drr_contain_str time_lastpublish/4 "--:--"
+drr_contain_str time_lastpublish/5 "--:--"
+
+drr_equal dwl_volume 0
+drr_contain_str feeds/dwl_volume "0,0,0,0,0"
+drr_equal dwl_volume/1 0
+drr_equal dwl_volume/2 0
+drr_equal dwl_volume/3 0
+drr_equal dwl_volume/4 0
+drr_equal dwl_volume/5 0
+
+
+
+
+
+
+
+
+
+
+dr_equal ctr_published_files 0 60
+
+mr_print tc_info
+dr_print tc_info
+drr_print tc_info
+
+start_dfc 0
+start_dfc 1
+start_dfc 2
+start_dfc 3
+start_dfc 4
+
+dr_equal ctr_published_files 1 60
+
+sleep_wait 30
+
+dr_equal ctr_published_files 1
+
+mr_greater ctr_requests 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_double_publish 0
+
+drr_equal ctr_publish_requests 1
+drr_equal ctr_publish_responses 1
+
+drr_equal dwl_volume 1000000
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/DFC_FileRetentionSuite.sh b/test/mocks/datafilecollector-testharness/auto-test/DFC_FileRetentionSuite.sh
index 219e9c589..ccdcdf1ae 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/DFC_FileRetentionSuite.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/DFC_FileRetentionSuite.sh
@@ -16,4 +16,3 @@ run_tc FTC33.sh $1 $2
##########################################
suite_complete
-
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh
index b6685a920..fe6d45349 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="One 1MB file from one PNF in one event using SFTP, from poll t
clean_containers
+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 MR_TC="--tc100"
-export BC_TC=""
-export NUM_FTPFILES="1"
+export DR_REDIR_FEEDS="2:A"
+
+export NUM_FTPFILES="10"
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
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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh
index 65c585a20..918906fa7 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="3500 1MB files from 700 PNFs in 3500 events in 5 polls using S
clean_containers
+export MR_TC="--tc510"
+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="--tc510"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="5"
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
-dr_equal ctr_published_files 3500 900
+dr_equal ctr_published_files 3500 900
sleep_wait 30
-dr_equal ctr_published_files 3500
+dr_equal ctr_published_files 3500
-mr_greater ctr_requests 5
+mr_greater ctr_requests 5
-mr_equal ctr_events 3500
-mr_equal ctr_unique_files 3500
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 3500
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 3500
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 3500
-dr_equal ctr_publish_req 3500
-dr_equal ctr_publish_req_redirect 3500
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 3500
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 3500
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 3500
+dr_equal ctr_publish_req 3500
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 3500
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 3500
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 3500
-drr_equal ctr_publish_responses 3500
+drr_equal ctr_publish_requests 3500
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 3500
-drr_equal dwl_volume 3500000000
+drr_equal dwl_volume 3500000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh
new file mode 100755
index 000000000..77477a82a
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="100 event with 1 1MB file in each evewnt from one PNF in one event using SFTP with feed reconfigure"
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc110"
+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="200"
+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
+
+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
+
+dr_contain_str feeds "2:A"
+drr_contain_str feeds "2:A"
+
+start_dfc 0
+
+dr_equal ctr_published_files 50 900
+
+
+export DR_TC="--tc normal"
+export DR_FEEDS="1:A"
+
+export DR_REDIR_TC="--tc normal"
+export DR_REDIR_FEEDS="1:A"
+
+consul_config_app 0 "../simulator-group/consul/c12_feed1_PM.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.json"
+
+kill_dr
+kill_drr
+
+log_sim_settings
+
+start_simulators
+
+mr_equal ctr_events 100 900
+mr_equal ctr_unique_files 100
+mr_equal ctr_unique_PNFs 1
+
+dr_greater ctr_published_files 1
+
+dr_contain_str feeds "1:A"
+drr_contain_str feeds "1:A"
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh
index 0d91ec7cb..d6560a3c5 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="3500 1MB files from 700 PNFs in 3500 events in 5 polls using F
clean_containers
+export MR_TC="--tc610"
+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="--tc610"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="5"
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
-dr_equal ctr_published_files 3500 900
+dr_equal ctr_published_files 3500 900
sleep_wait 30
-dr_equal ctr_published_files 3500
+dr_equal ctr_published_files 3500
-mr_greater ctr_requests 5
+mr_greater ctr_requests 5
-mr_equal ctr_events 3500
-mr_equal ctr_unique_files 3500
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 3500
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 3500
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 3500
-dr_equal ctr_publish_req 3500
-dr_equal ctr_publish_req_redirect 3500
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 3500
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 3500
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 3500
+dr_equal ctr_publish_req 3500
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 3500
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 3500
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 3500
-drr_equal ctr_publish_responses 3500
+drr_equal ctr_publish_requests 3500
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 3500
-drr_equal dwl_volume 3500000000
+drr_equal dwl_volume 3500000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh
index d721fe197..adafb2fed 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="3500 1KB files from 700 PNFs in 3500 events in 5 polls using S
clean_containers
+export MR_TC="--tc511"
+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="--tc511"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="5"
export NUM_PNFS="700"
export FILE_SIZE="1KB"
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
-dr_equal ctr_published_files 3500 900
+dr_equal ctr_published_files 3500 900
sleep_wait 30
-dr_equal ctr_published_files 3500
+dr_equal ctr_published_files 3500
-mr_greater ctr_requests 5
+mr_greater ctr_requests 5
-mr_equal ctr_events 3500
-mr_equal ctr_unique_files 3500
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 3500
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 3500
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 3500
-dr_equal ctr_publish_req 3500
-dr_equal ctr_publish_req_redirect 3500
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 3500
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 3500
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 3500
+dr_equal ctr_publish_req 3500
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 3500
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 3500
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 3500
-drr_equal ctr_publish_responses 3500
+drr_equal ctr_publish_requests 3500
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 3500
-drr_equal dwl_volume 3500000
+drr_equal dwl_volume 3500000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh
index 5cf211229..12e9ddc88 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="3500 1KB files from 700 PNFs in 3500 events in 5 polls using F
clean_containers
+export MR_TC="--tc611"
+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="--tc611"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="5"
export NUM_PNFS="700"
export FILE_SIZE="1KB"
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
-dr_equal ctr_published_files 3500 900
+dr_equal ctr_published_files 3500 900
sleep_wait 30
-dr_equal ctr_published_files 3500
+dr_equal ctr_published_files 3500
-mr_greater ctr_requests 5
+mr_greater ctr_requests 5
-mr_equal ctr_events 3500
-mr_equal ctr_unique_files 3500
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 3500
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 3500
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 3500
-dr_equal ctr_publish_req 3500
-dr_equal ctr_publish_req_redirect 3500
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 3500
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 3500
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 3500
+dr_equal ctr_publish_req 3500
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 3500
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 3500
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 3500
-drr_equal ctr_publish_responses 3500
+drr_equal ctr_publish_requests 3500
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 3500
-drr_equal dwl_volume 3500000
+drr_equal dwl_volume 3500000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh
new file mode 100755
index 000000000..27d51f659
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="3500 50MB files from 700 PNFs in 3500 events in 5 polls using SFTP, from poll to publish."
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc550"
+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="5"
+export NUM_PNFS="700"
+export FILE_SIZE="50MB"
+export FTP_TYPE="SFTP"
+export FTP_FILE_PREFIXES="A"
+export NUM_FTP_SERVERS=5
+
+log_sim_settings
+
+start_simulators
+
+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 0
+
+dr_equal ctr_published_files 3500 3600
+
+sleep_wait 30
+
+dr_equal ctr_published_files 3500
+
+mr_greater ctr_requests 5
+
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 3500
+mr_equal ctr_unique_PNFs 700
+
+dr_equal ctr_publish_query 3500
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 3500
+dr_equal ctr_publish_req 3500
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 3500
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 3500
+dr_equal ctr_double_publish 0
+
+drr_equal ctr_publish_requests 3500
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 3500
+
+drr_equal dwl_volume 175000000000
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh
new file mode 100755
index 000000000..060f3c364
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="3500 50MB files from 700 PNFs in 3500 events in 5 polls using FTPS, from poll to publish."
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc650"
+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="5"
+export NUM_PNFS="700"
+export FILE_SIZE="50MB"
+export FTP_TYPE="FTPS"
+export FTP_FILE_PREFIXES="A"
+export NUM_FTP_SERVERS=5
+
+log_sim_settings
+
+start_simulators
+
+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 0
+
+dr_equal ctr_published_files 3500 3600
+
+sleep_wait 30
+
+dr_equal ctr_published_files 3500
+
+mr_greater ctr_requests 5
+
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 3500
+mr_equal ctr_unique_PNFs 700
+
+dr_equal ctr_publish_query 3500
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 3500
+dr_equal ctr_publish_req 3500
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 3500
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 3500
+dr_equal ctr_double_publish 0
+
+drr_equal ctr_publish_requests 3500
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 3500
+
+drr_equal dwl_volume 175000000000
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh
index 45ecb6f3f..e46c0f287 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="One 5MB file from one PNF in one event using SFTP, from poll t
clean_containers
+export MR_TC="--tc101"
+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="--tc101"
-export BC_TC=""
-export NUM_FTPFILES="1"
+export DR_REDIR_FEEDS="2:A"
+
+export NUM_FTPFILES="10"
export NUM_PNFS="1"
export FILE_SIZE="5MB"
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
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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 5000000
+drr_equal dwl_volume 5000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh
index 88d9e57fd..a61b1a429 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="72800 1MB files from 700 PNFs in 3500 events in 100 polls (35
clean_containers
+export MR_TC="--tc710"
+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="--tc710"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="105"
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
-dr_equal ctr_published_files 72800 18000
+dr_equal ctr_published_files 72800 18000
sleep_wait 30
-dr_equal ctr_published_files 72800
+dr_equal ctr_published_files 72800
-mr_greater ctr_requests 100
+mr_greater ctr_requests 100
-mr_equal ctr_events 3500
-mr_equal ctr_unique_files 72800
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 72800
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 72800
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 72800
-dr_equal ctr_publish_req 72800
-dr_equal ctr_publish_req_redirect 72800
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 72800
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 72800
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 72800
+dr_equal ctr_publish_req 72800
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 72800
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 72800
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 72800
-drr_equal ctr_publish_responses 72800
+drr_equal ctr_publish_requests 72800
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 72800
-drr_equal dwl_volume 72800000000
+drr_equal dwl_volume 72800000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
index 7cb07de2c..8060ddfc2 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
@@ -8,86 +8,101 @@ TC_ONELINE_DESCR="DFC start, stop and hearbeat output."
clean_containers
+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 MR_TC="--tc100"
+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
-
-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 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!"
+start_dfc 0
+
+dr_equal ctr_published_files 1 60
+
+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 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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh
index a3c051427..fb18d7644 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="72800 1MB files from 700 PNFs in 3500 events in 100 polls (35
clean_containers
+export MR_TC="--tc810"
+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="--tc810"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="105"
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
-dr_equal ctr_published_files 72800 18000
+dr_equal ctr_published_files 72800 18000
sleep_wait 30
-dr_equal ctr_published_files 72800
+dr_equal ctr_published_files 72800
-mr_greater ctr_requests 100
+mr_greater ctr_requests 100
-mr_equal ctr_events 3500
-mr_equal ctr_unique_files 72800
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 72800
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 72800
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 72800
-dr_equal ctr_publish_req 72800
-dr_equal ctr_publish_req_redirect 72800
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 72800
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 72800
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 72800
+dr_equal ctr_publish_req 72800
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 72800
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 72800
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 72800
-drr_equal ctr_publish_responses 72800
+drr_equal ctr_publish_requests 72800
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 72800
-drr_equal dwl_volume 72800000000
+drr_equal dwl_volume 72800000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh
index a652f8554..08222d2ec 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh
@@ -8,60 +8,74 @@ TC_ONELINE_DESCR="DFC stop before polling event (no polling during stopped), the
clean_containers
+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 MR_TC="--tc100"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
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 30
+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 30
kill_mr
-start_dfc
+start_dfc 0
sleep_wait 30
-dfc_contain_str stopDatafile "Datafile Service has already been stopped!"
+dfc_contain_str 0 stopDatafile "Datafile Service has already been stopped!"
start_simulators
sleep_wait 120
-mr_less ctr_requests 2
+mr_equal ctr_requests 0
-dfc_contain_str start "Datafile Service has been started!"
+dfc_contain_str 0 start "Datafile Service has been started!"
-dr_equal ctr_published_files 1 60
+dr_equal ctr_published_files 1 60
-mr_greater ctr_requests 0
+mr_greater ctr_requests 0
-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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh
index afa1f2ac1..06baaefe4 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="One 50MB file from one PNF in one event using SFTP, from poll
clean_containers
+export MR_TC="--tc102"
+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="--tc102"
-export BC_TC=""
-export NUM_FTPFILES="1"
+export DR_REDIR_FEEDS="2:A"
+
+export NUM_FTPFILES="10"
export NUM_PNFS="1"
export FILE_SIZE="50MB"
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
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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 50000000
+drr_equal dwl_volume 50000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh
index 0fb3b0572..e29d948bf 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh
@@ -8,84 +8,97 @@ TC_ONELINE_DESCR="DFC file retention. Publish 1 file, restart MR sim. No new pu
clean_containers
+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 MR_TC="--tc100"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
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
sleep_wait 30
-dr_equal ctr_published_files 1
+dr_equal ctr_published_files 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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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
store_logs PART1
+mr_greater ctr_requests 4 120
kill_mr
start_simulators
-mr_equal ctr_events 0 60
-mr_equal ctr_unique_files 0
-mr_equal ctr_unique_PNFs 0
+mr_equal ctr_requests 4 120
-mr_equal ctr_events 1 60
-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_double_publish 0
+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_double_publish 0
-drr_equal ctr_publish_requests 1
-drr_equal ctr_publish_responses 1
+drr_equal ctr_publish_requests 1
+drr_equal ctr_publish_responses 1
-drr_equal dwl_volume 1000000
+drr_equal dwl_volume 1000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
index 34cf8aecf..ad71d3043 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
@@ -8,66 +8,80 @@ TC_ONELINE_DESCR="DFC file retention using DR. Publish 1 file, retstart MR sim
clean_containers
+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 MR_TC="--tc100"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
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
sleep_wait 30
-dr_equal ctr_published_files 1
+dr_equal ctr_published_files 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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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
store_logs PART1
kill_mr
-kill_dfc
+kill_dfc 0
start_simulators
mr_equal ctr_events 0 60
mr_equal ctr_unique_files 0
mr_equal ctr_unique_PNFs 0
-start_dfc
+start_dfc 0
sleep_wait 30
@@ -89,7 +103,7 @@ drr_equal ctr_publish_responses 1
drr_equal dwl_volume 1000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh
index 48257a8df..3d608351a 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh
@@ -8,54 +8,68 @@ TC_ONELINE_DESCR="DFC file retention, 100 identical file names in 100 events"
clean_containers
+export MR_TC="--tc122"
+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="--tc122"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="200"
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
-mr_equal ctr_events 100 1800
+mr_equal ctr_events 100 1800
sleep_wait 30
-dr_equal ctr_published_files 1
+dr_equal ctr_published_files 1
-mr_equal ctr_events 100
-mr_equal ctr_unique_files 1
-mr_equal ctr_unique_PNFs 1
+mr_equal ctr_events 100
+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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh
index a45ce1098..1b1ae452c 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 @@ TC_ONELINE_DESCR="DFC file retention (files with SFTP and then same files overSF
clean_containers
+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 MR_TC="--tc100"
-export BC_TC=""
+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 @@ log_sim_settings
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 @@ log_sim_settings
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 @@ log_sim_settings
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 @@ start_simulators
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 @@ start_simulators
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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh
index a29b6b1e6..bb3d2ba70 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="One 1MB file from one PNF in one event using FTPS, from poll t
clean_containers
+export MR_TC="--tc200"
+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="1:A"
+
export DR_REDIR_TC="--tc normal"
-export MR_TC="--tc200"
-export BC_TC=""
-export NUM_FTPFILES="1"
+export DR_REDIR_FEEDS="1:A"
+
+export NUM_FTPFILES="10"
export NUM_PNFS="1"
export FILE_SIZE="1MB"
export FTP_TYPE="FTPS"
+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_feed1_PM.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.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
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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh
index 074f290f4..25e68e725 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh
@@ -8,28 +8,39 @@ TC_ONELINE_DESCR="Poll, download and publish of 1MB, 5MB and 50MB using both SFT
clean_containers
+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 MR_TC="--tc100"
-export BC_TC=""
+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 @@ log_sim_settings
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 @@ log_sim_settings
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 @@ log_sim_settings
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 @@ start_simulators
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 @@ start_simulators
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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh
index f62b85a76..f5996213b 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="One 5MB file from one PNF in one event using FTPS, from poll t
clean_containers
+export MR_TC="--tc201"
+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="1:A"
+
export DR_REDIR_TC="--tc normal"
-export MR_TC="--tc201"
-export BC_TC=""
-export NUM_FTPFILES="1"
+export DR_REDIR_FEEDS="1:A"
+
+export NUM_FTPFILES="10"
export NUM_PNFS="1"
export FILE_SIZE="5MB"
export FTP_TYPE="FTPS"
+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_feed1_PM.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.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
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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 5000000
+drr_equal dwl_volume 5000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh
index 0eb972287..7e6288b84 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh
@@ -8,53 +8,67 @@ TC_ONELINE_DESCR="Poll 199 new files (100 events) with 10% missing files (20 fil
clean_containers
+export MR_TC="--tc121"
+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="--tc121"
-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
+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 179 5000
+dr_equal ctr_published_files 179 5000
sleep_wait 600
-dr_equal ctr_published_files 179
+dr_equal ctr_published_files 179
-mr_equal ctr_events 100
-mr_equal ctr_unique_files 179
-mr_equal ctr_unique_PNFs 1
+mr_equal ctr_events 100
+mr_equal ctr_unique_files 179
+mr_equal ctr_unique_PNFs 1
-dr_greater ctr_publish_query 179
-dr_equal ctr_publish_query_published 0
-dr_greater ctr_publish_query_not_published 179
-dr_equal ctr_publish_req 179
-dr_equal ctr_publish_req_redirect 179
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 179
+dr_greater ctr_publish_query 179
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_greater ctr_publish_query_not_published 179
+dr_equal ctr_publish_req 179
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 179
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 179
-drr_equal ctr_publish_requests 179
-drr_equal ctr_publish_responses 179
+drr_equal ctr_publish_requests 179
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 179
-drr_equal dwl_volume 179000000
+drr_equal dwl_volume 179000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh
index 036225cfd..10de5c7fe 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="One 50MB file from one PNF in one event using FTPS, from poll
clean_containers
+export MR_TC="--tc202"
+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="1:A"
+
export DR_REDIR_TC="--tc normal"
-export MR_TC="--tc202"
-export BC_TC=""
-export NUM_FTPFILES="1"
+export DR_REDIR_FEEDS="1:A"
+
+export NUM_FTPFILES="10"
export NUM_PNFS="1"
export FILE_SIZE="50MB"
export FTP_TYPE="FTPS"
+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_feed1_PM.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.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
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_double_publish 0
+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
+dr_equal ctr_double_publish 0
-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 50000000
+drr_equal dwl_volume 50000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh
index f68b9b04e..8be18cbcd 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh
@@ -8,61 +8,75 @@ TC_ONELINE_DESCR="Kill SFTP sever for 10+ sec during download"
clean_containers
+export MR_TC="--tc500"
+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="--tc500"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="2"
export NUM_PNFS="700"
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_greater ctr_published_files 100 200
+dr_greater ctr_published_files 100 200
-kill_sftp
-sleep_wait 10 #Server will be gone longer due to long startup time of ftp (ftp file creatation)
-start_simulators
+stop_sftp 0
+sleep_wait 30
+start_sftp 0
-dr_equal ctr_published_files 1400 400
+dr_equal ctr_published_files 1400 400
sleep_wait 30
-dr_equal ctr_published_files 1400
+dr_equal ctr_published_files 1400
-mr_greater ctr_requests 1
+mr_greater ctr_requests 1
-mr_equal ctr_events 700
-mr_equal ctr_unique_files 1400
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 700
+mr_equal ctr_unique_files 1400
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 1400
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 1400
-dr_equal ctr_publish_req 1400
-dr_equal ctr_publish_req_redirect 1400
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 1400
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 1400
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 1400
+dr_equal ctr_publish_req 1400
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 1400
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 1400
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 1400
-drr_equal ctr_publish_responses 1400
+drr_equal ctr_publish_requests 1400
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 1400
-drr_equal dwl_volume 1400000000
+drr_equal dwl_volume 1400000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh
index ef480473d..861e03532 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-TC_ONELINE_DESCR="Kill FTPs sever for 10+ sec during download"
+TC_ONELINE_DESCR="Kill FTPS sever for 10+ sec during download"
. ../common/testcase_common.sh $1 $2
@@ -8,61 +8,75 @@ TC_ONELINE_DESCR="Kill FTPs sever for 10+ sec during download"
clean_containers
+export MR_TC="--tc600"
+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="--tc600"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="2"
export NUM_PNFS="700"
export FILE_SIZE="1MB"
export FTP_TYPE="FTPS"
+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_greater ctr_published_files 100 200
+dr_greater ctr_published_files 100 200
-kill_ftps
-sleep_wait 10 #Server will be gone longer due to long startup time of ftp (ftp file creatation)
-start_simulators
+stop_ftps 0
+sleep_wait 30
+start_ftps 0
-dr_equal ctr_published_files 1400 400
+dr_equal ctr_published_files 1400 400
sleep_wait 30
-dr_equal ctr_published_files 1400
+dr_equal ctr_published_files 1400
-mr_greater ctr_requests 1
+mr_greater ctr_requests 1
-mr_equal ctr_events 700
-mr_equal ctr_unique_files 1400
-mr_equal ctr_unique_PNFs 700
+mr_equal ctr_events 700
+mr_equal ctr_unique_files 1400
+mr_equal ctr_unique_PNFs 700
-dr_equal ctr_publish_query 1400
-dr_equal ctr_publish_query_published 0
-dr_equal ctr_publish_query_not_published 1400
-dr_equal ctr_publish_req 1400
-dr_equal ctr_publish_req_redirect 1400
-dr_equal ctr_publish_req_published 0
-dr_equal ctr_published_files 1400
-dr_equal ctr_double_publish 0
+dr_equal ctr_publish_query 1400
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 1400
+dr_equal ctr_publish_req 1400
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 1400
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 1400
+dr_equal ctr_double_publish 0
-drr_equal ctr_publish_requests 1400
-drr_equal ctr_publish_responses 1400
+drr_equal ctr_publish_requests 1400
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 1400
-drr_equal dwl_volume 1400000000
+drr_equal dwl_volume 1400000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
index e464d88e9..0c21b3e01 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
@@ -8,55 +8,69 @@ 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
+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 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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh
index 5f4238ef4..c69958d72 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh
@@ -8,55 +8,69 @@ TC_ONELINE_DESCR="199 file publish attempt where all calls to DR sim and DR redi
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 all_delay_10s"
+export DR_FEEDS="2:A"
+
export DR_REDIR_TC="--tc all_delay_10s"
-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
+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 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_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_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_equal ctr_publish_query_not_published 199
+dr_equal ctr_publish_req 199
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal 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_equal ctr_publish_requests 199
-drr_equal ctr_publish_responses 199
+drr_equal ctr_publish_requests 199
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 199
-drr_equal dwl_volume 199000000
+drr_equal dwl_volume 199000000
-check_dfc_log
+check_dfc_logs
#### TEST COMPLETE ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh
new file mode 100755
index 000000000..134c87c73
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="25 events for each 4 feeds with 100 1MB files per event from one PNF using SFTP, 1 change id with no feed, 1 change with one feed and two change id to one feed."
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc111"
+export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES:CTR_MEAS_FILES:LOG_FILES:TEMP_FILES"
+export MR_FILE_PREFIX_MAPPING="PM_MEAS_FILES:A,CTR_MEAS_FILES:B,LOG_FILES:C,TEMP_FILES:D"
+
+export DR_TC="--tc normal"
+export DR_FEEDS="2:B,3:C:D"
+
+export DR_REDIR_TC="--tc normal"
+export DR_REDIR_FEEDS="2:B,3:C:D"
+
+export NUM_FTPFILES="200"
+export NUM_PNFS="1"
+export FILE_SIZE="1MB"
+export FTP_TYPE="SFTP"
+export FTP_FILE_PREFIXES="A,B,C,D"
+export NUM_FTP_SERVERS=1
+
+log_sim_settings
+
+start_simulators
+
+consul_config_app 0 "../simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1_2_3_4.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 0
+
+dr_equal ctr_published_files 588 2000
+dr_equal ctr_published_files/2 196
+dr_equal ctr_published_files/3 392
+sleep_wait 30
+
+dr_equal ctr_published_files 588
+dr_equal ctr_published_files/2 196
+dr_equal ctr_published_files/3 392
+
+mr_greater ctr_requests 100
+
+mr_equal ctr_events 100
+mr_equal ctr_unique_files 784
+mr_equal ctr_unique_PNFs 1
+
+dr_equal ctr_publish_query 588
+dr_equal ctr_publish_query/2 196
+dr_equal ctr_publish_query/3 392
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 588
+dr_equal ctr_publish_query_not_published/2 196
+dr_equal ctr_publish_query_not_published/3 392
+dr_equal ctr_publish_req 588
+dr_equal ctr_publish_req/2 196
+dr_equal ctr_publish_req/3 392
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 588
+dr_equal ctr_publish_req_redirect/2 196
+dr_equal ctr_publish_req_redirect/3 392
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 588
+dr_equal ctr_published_files/2 196
+dr_equal ctr_published_files/3 392
+dr_equal ctr_double_publish 0
+
+drr_equal ctr_publish_requests 588
+drr_equal ctr_publish_requests/2 196
+drr_equal ctr_publish_requests/3 392
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 588
+drr_equal ctr_publish_responses/2 196
+drr_equal ctr_publish_responses/3 392
+
+drr_equal dwl_volume 588000000
+drr_equal dwl_volume/2 196000000
+drr_equal dwl_volume/3 392000000
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+print_all
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh
new file mode 100755
index 000000000..442bdce88
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="3500 1MB files from 700 PNFs in 3500 events in 5 polls using SFTP, 3 polls with change ids mapped to feeds and 2 polls not."
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc510"
+export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES:CTR_MEAS_FILES:LOG_FILES:TEMP_FILES"
+export MR_FILE_PREFIX_MAPPING="PM_MEAS_FILES:A,CTR_MEAS_FILES:B,LOG_FILES:C,TEMP_FILES:D"
+
+export DR_TC="--tc normal"
+export DR_FEEDS="3:A:B"
+
+export DR_REDIR_TC="--tc normal"
+export DR_REDIR_FEEDS="3:A:B"
+
+export NUM_FTPFILES="30"
+export NUM_PNFS="700"
+export FILE_SIZE="1MB"
+export FTP_TYPE="SFTP"
+export FTP_FILE_PREFIXES="A,B,C,D"
+export NUM_FTP_SERVERS=1
+
+log_sim_settings
+
+start_simulators
+
+consul_config_app 0 "../simulator-group/consul/c12_feed3_PM_CTR.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed3.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 0
+
+dr_equal ctr_published_files 2100 900
+dr_equal ctr_published_files/3 2100
+sleep_wait 30
+
+dr_equal ctr_published_files 2100
+dr_equal ctr_published_files/3 2100
+
+mr_greater ctr_requests 5
+
+mr_equal ctr_events 3500
+mr_equal ctr_unique_files 3500
+mr_equal ctr_unique_PNFs 700
+
+dr_equal ctr_publish_query 2100
+dr_equal ctr_publish_query/3 2100
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 2100
+dr_equal ctr_publish_query_not_published/3 2100
+dr_equal ctr_publish_req 2100
+dr_equal ctr_publish_req/3 2100
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 2100
+dr_equal ctr_publish_req_redirect/3 2100
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 2100
+dr_equal ctr_published_files/3 2100
+dr_equal ctr_double_publish 0
+
+drr_equal ctr_publish_requests 2100
+drr_equal ctr_publish_requests/3 2100
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 2100
+drr_equal ctr_publish_responses/3 2100
+
+drr_equal dwl_volume 2100000000
+drr_equal dwl_volume/3 2100000000
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh
new file mode 100755
index 000000000..780fbf724
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+TC_ONELINE_DESCR="100 events (1 evt per poll) per DFC with 100 1MB files from one PNF using two DFC (different consumer groups) each publishing using unique change ids/feeds over SFTP."
+
+. ../common/testcase_common.sh $1 $2
+
+#### TEST BEGIN ####
+
+clean_containers
+
+export MR_TC="--tc111"
+export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES:CTR_MEAS_FILES,OpenDcae-c13:PM_MEAS_FILES:CTR_MEAS_FILES"
+export MR_FILE_PREFIX_MAPPING="PM_MEAS_FILES:A,CTR_MEAS_FILES:B"
+
+export DR_TC="--tc normal"
+export DR_FEEDS="1:A,2:B"
+
+export DR_REDIR_TC="--tc normal"
+export DR_REDIR_FEEDS="1:A,2:B"
+
+export NUM_FTPFILES="1000"
+export NUM_PNFS="1"
+export FILE_SIZE="1MB"
+export FTP_TYPE="SFTP"
+export FTP_FILE_PREFIXES="A,B"
+export NUM_FTP_SERVERS=1
+
+log_sim_settings
+
+start_simulators
+
+consul_config_app 0 "../simulator-group/consul/c12_feed1_PM.json"
+consul_config_dmaap 0 "../simulator-group/consul/dmaap_feed1.json"
+consul_config_app 1 "../simulator-group/consul/c13_feed2_CTR.json"
+consul_config_dmaap 1 "../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 0
+start_dfc 1
+
+dr_equal ctr_published_files 396 2000
+
+sleep_wait 30
+
+dr_equal ctr_published_files 396
+
+mr_greater ctr_requests 200
+
+mr_equal ctr_events 200
+mr_equal ctr_unique_files 792
+mr_equal ctr_unique_PNFs 2
+mr_equal ctr_unique_PNFs/OpenDcae-c12 1
+mr_equal ctr_unique_PNFs/OpenDcae-c13 1
+
+dr_equal ctr_publish_query 396
+dr_equal ctr_publish_query/1 198
+dr_equal ctr_publish_query/2 198
+dr_equal ctr_publish_query_bad_file_prefix 0
+dr_equal ctr_publish_query_published 0
+dr_equal ctr_publish_query_not_published 396
+dr_equal ctr_publish_query_not_published/1 198
+dr_equal ctr_publish_query_not_published/2 198
+dr_equal ctr_publish_req 396
+dr_equal ctr_publish_req/1 198
+dr_equal ctr_publish_req/2 198
+dr_equal ctr_publish_req_bad_file_prefix 0
+dr_equal ctr_publish_req_redirect 396
+dr_equal ctr_publish_req_redirect/1 198
+dr_equal ctr_publish_req_redirect/2 198
+dr_equal ctr_publish_req_published 0
+dr_equal ctr_published_files 396
+dr_equal ctr_published_files/1 198
+dr_equal ctr_published_files/2 198
+dr_equal ctr_double_publish 0
+
+drr_equal ctr_publish_requests 396
+drr_equal ctr_publish_requests/1 198
+drr_equal ctr_publish_requests/2 198
+drr_equal ctr_publish_requests_bad_file_prefix 0
+drr_equal ctr_publish_responses 396
+drr_equal ctr_publish_responses/1 198
+drr_equal ctr_publish_responses/2 198
+
+drr_equal dwl_volume 396000000
+drr_equal dwl_volume/1 198000000
+drr_equal dwl_volume/2 198000000
+
+check_dfc_logs
+
+#### TEST COMPLETE ####
+
+store_logs END
+
+print_result \ No newline at end of file
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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh
index a50fc1686..feae9d5ae 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh
@@ -8,30 +8,42 @@ TC_ONELINE_DESCR="Maximum number of 1MB SFTP files during 24h, 700 PNFs. 100 new
clean_containers
+export MR_TC="--tc1200"
+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="--tc1200"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="1500"
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
# 24h MR sim execution time since first poll, should be reached withing 24h +1h margion
-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 +58,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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/README.md b/test/mocks/datafilecollector-testharness/auto-test/README.md
index 09001d068..a94076f58 100644
--- a/test/mocks/datafilecollector-testharness/auto-test/README.md
+++ b/test/mocks/datafilecollector-testharness/auto-test/README.md
@@ -8,12 +8,14 @@ The functions are described further below.
The integration repo is needed as well as docker.
If needed setup the ``DFC_LOCAL_IMAGE`` and ``DFC_REMOTE_IMAGE`` env var in test_env.sh to point to the dfc images (local registry image or next registry image) without the image tag.
The predefined images should be ok for current usage:
+
``DFC_REMOTE_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server``
+
``DFC_LOCAL_IMAGE=onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server``
If the test cases/suites in this dir are not executed in the auto-test dir in the integration repo, then the ``SIM_GROUP`` env var need to point to the ``simulator-group`` dir.
-See instructions in the test_env.sh. The ../common dir is needed as well in the case. That is, it is possible to have auto-test dir (and the common dir) somewhere
-than in the integration repo but the simulator group dir need to be available.
+See instructions in the test_env.sh. The ../common dir is needed as well in the case. That is, it is possible to have auto-test dir (and the common dir) somewhere else
+than in the integration repo but the simulator-group and common dir need to be available.
##Test cases and test suites naming.
Each file filename should have the format ``<tc-id>.sh`` for test cases and ``<ts-id>.sh`` for test suite. The tc-id and ts-id are the
@@ -24,15 +26,18 @@ A simple way to list all test cases/suite along with the description is to do ``
##Logs from containers and test cases
All logs from each test cases are stored under ``logs/<tc-id>/``.
The logs include the application.log and the container log from dfc, the container logs from each simulator and the test case log (same as the screen output).
-
+In the test cases the logs are stored with a prefix so the logs can be stored at different steps during the test. All test cases contains an entry to save all logs with prefix 'END' at the end of each test case.
##Execution##
-Test cases and test suites are executed by: ``./<tc-id or ts-id>.sh local | remote | remote-remove | manual-container | manual-app``</br>
+Test cases and test suites are executed by: `` [sudo] ./<tc-id or ts-id>.sh local | remote | remote-remove | manual-container | manual-app``</br>
**local** - uses the dfc image pointed out by ``DFC_LOCAL_IMAGE`` in the test_env, should be the dfc image built locally in your docker registry.</br>
**remote** - uses the dfc image pointed out by ``DFC_REMOTE_IMAGE`` in the test_env, should be the dfc nexus image in your docker registry.</br>
**remote-remove** - uses the dfc image pointed out by ``DFC_REMOTE_IMAGE`` in the test_env, should be the dfc nexus image in your docker registry. Removes the nexus image and pull from remote registry.</br>
**manual-container** - uses dfc in a manually started container. The script will prompt you for manual starting and stopping of the container.</br>
**manual-app** - uses dfc app started as an external process (from eclipse etc). The script will prompt you for manual start and stop of the process.</br>
+When running dfc manually, either as a container or an app the ports need to be set to map the instance id of the dfc. Most test cases start dfc with index 0, then the test case expects the ports of dfc to be mapped to the standar port number.
+However, if a higher instance id than 0 is used then the mapped ports need add that index to the port number (eg, if index 2 is used the dfc need to map port 8102 and 8435 instead of the standard 8100 and 8433).
+
##Test case file##
A test case file contains a number of steps to verify a certain functionality.
A description of the test case should be given to the ``TC_ONELINE_DESCR`` var. The description will be printed in the test result.
@@ -72,16 +77,22 @@ The following is a list of the available functions in a test case file. Please s
Print the env variables needed for the simulators and their setup
**clean_containers**</br>
-Stop and remove all containers including dfc app and simulators
+Stop and remove all containers including dfc apps and simulators
-**start_simulators**
+**start_simulators**</br>
Start all simulators in the simulator group
-**start_dfc**</br>
-Start the dfc application
+**start_dfc <dfc-instance-id>**</br>
+Start the dfc application. The arg shall be an integer from 0 to 5 reprenting the dfc instance to start. DFC app will get a name like 'dfc_app0' to 'dfc_app4'.
+
+**kill_dfc <dfc-instance-id> **</br>
+Stop and remove the dfc app container with the instance id.
+
+**consul_config_app <dfc-instance-id> <json-file-path>**</br>
+Configure consul with json file with app config for a dfc instance using the dfc instance id and the json file.
-**kill_dfc**</br>
-Stop and remove the dfc app container
+**consul_config_dmaap <dfc-instance-id> <json-file-path>**</br>
+Configure consul with json file with dmaap config for a dfc instance using the dfc instance id and the json file.
**kill_dr**</br>
Stop and remove the DR simulator container
@@ -92,11 +103,23 @@ Stop and remove the DR redir simulator container
**kill_mr**</br>
Stop and remove the MR simulator container
-**kill_sftp**</br>
-Stop and remove the SFTP container
+**kill_sftp <sftp-instance-id>**</br>
+Stop and remove a SFTP container with the supplied instance id (0-5).
-**kill_ftps**</br>
-Stop and remove the FTPS container
+**stop_sftp <sftp-instance-id>**</br>
+Stop a SFTP container with the supplied instance id (0-5).
+
+**start_sftp <sftp-instance-id>**</br>
+Start a previously stopped SFTP container with the supplied instance id (0-5).
+
+**kill_ftps <ftps-instance-id>**</br>
+Stop and remove a FTPS container with the supplied instance id (0-5).
+
+**stop_ftps <ftps-instance-id>**</br>
+Stop a FTPS container with the supplied instance id (0-5).
+
+**start_ftps <ftps-instance-id>**</br>
+Start a previously stopped FTPS container with the supplied instance id (0-5).
**mr_print <vaiable-name>**</br>
Print a variable value from the MR simulator.
@@ -107,6 +130,9 @@ Print a varialle value from the DR simulator.
**drr_print <vaiable-name>**</br>
Print a variable value from the DR redir simulator.
+**dfc_print <dfc-instance-id> <vaiable-name>**</br>
+Print a variable value from an dfc instance with the supplied instance id (0-5).
+
**mr_read <vaiable-name>**</br>
Read a variable value from MR sim and send to stdout
@@ -178,6 +204,14 @@ less than the target or not.
before setting pass or fail depending on if the variable value is less than the target
value or not.
+**dr_contain_str <variable-name> <target-value> [<timeout-in-sec>]**</br>
+Tests if a variable value in the DR simulator contains a substring target and and optional timeout.
+</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable contains
+the target substring or not.
+</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds
+before setting pass or fail depending on if the variable value contains the target
+substring or not.
+
**drr_equal <variable-name> <target-value> [<timeout-in-sec>]**</br>
Tests if a variable value in the DR Redir simulator is equal to a target value and and optional timeout.
</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable is
@@ -202,6 +236,14 @@ less than the target or not.
before setting pass or fail depending on if the variable value is less than the target
value or not.
+**drr_contain_str <variable-name> <target-value> [<timeout-in-sec>]**</br>
+Tests if a variable value in the DR Redir simulator contains a substring target and and optional timeout.
+</br>Arg: ``<variable-name> <target-value>`` - This test set pass or fail depending on if the variable contains
+the target substring or not.
+</br>Arg: ``<variable-name> <target-value> <timeout-in-sec>`` - This test waits up to the timeout seconds
+before setting pass or fail depending on if the variable value contains the target
+substring or not.
+
**dfc_contain_str <variable-name> <substring-in-quotes>**</br>
Test is a variable in the DFC contains a substring.
@@ -225,7 +267,7 @@ Comments that shall be visible on the screen as well as in the test case log, us
##Test suite files##
A test suite file contains one or more test cases to run in sequence.
-A description of the test case should be given to the TS_ONELINE_DESCR var. The description will be printed in the test result.
+A description of the test case should be given to the ``TS_ONELINE_DESCR`` var. The description will be printed in the test result.
The empty template for a test suite files looks like this:
@@ -235,7 +277,7 @@ The empty template for a test suite files looks like this:
```
#!/bin/bash
-TS_ONELINE_DESCR="<test-suite-description"
+TS_ONELINE_DESCR="<test-suite-description>"
. ../common/testsuite_common.sh
@@ -257,7 +299,7 @@ suite_complete
The ../common/testsuite_common.sh contains all functions needed for a test suite file.
-The following is a list of the available functions in a test case file. Please see a defined test suite for examples.
+The following is a list of the available functions in a test case file. Please see a existing test suite for examples.
**suite_setup**</br>
Sets up the test suite and print out a heading.
diff --git a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh
index 2b76f16e8..f221ac5f5 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh
@@ -8,81 +8,100 @@ TC_ONELINE_DESCR="Stabilty over 72hours, 700 PNFs over FTPS. All new files (100)
clean_containers
+export MR_TC="--tc2300"
+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="--tc2300"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="1000"
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
+
+# 72h MR sim execution time since first poll, should be reached withing 72h + 1h margin
+mr_contain_str exe_time_first_poll 4320: $((60*60*24*3+3600))
+
+# Requirement number of files, 100 new files in first event for each PNF, then 1 new file per PNF in the
+# remaining 15 min polls up to 72h. This is the minimum number of published files for the test
+TARGET_REQUIRMENT_FILES=$((70000+700*95+700*96+700*96))
+
+#Make sure target is reached within 72h + a reasonable tolerance
+mr_greater ctr_unique_files $((TARGET_REQUIRMENT_FILES-1)) 1800
-# 24h MR sim execution time since first poll, should be reached withing 72h +1h margion
-mr_contain_str exe_time_first_poll 4320: $((60*60*24*3+3600))
# stop event delivery
mr_print stop
# wait for MR sim values to stabilize
sleep_wait 30
-# Requirement number of files, 100 new files in first event for each PNF, then 1 new file per PNF in the
-# remaining polls up to 24h. This is the minimum number of published files for the test
-TARGET_REQUIRMENT_FILE=$((70000+700*95+700*96+700*96))
-
#Calculate targets based on the number of of unique files delivered from MR sim
TARGET_FILES=$(mr_read ctr_unique_files)
-TARGET_EVENTS=$((TARGET_FILES/100))
+TARGET_EVENTS=$((TARGET_FILES-70000+700)) #First event from a PNF is 100 new files, remaining events contains 1 new file
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.
+#Maximum number of configured FTP files, if DFC reach this then the NUM_FTPSFILES need to be increased.
MAX_FILES=$((NUM_FTPFILE*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_FILE
+dr_greater ctr_published_files $((TARGET_REQUIRMENT_FILES-1))
-#If greate then MAX_FILES then more FTP files need to be configured
-mr_less ctr_ctr_unique_files MAX_FILES
+#If greater then MAX_FILES then more FTP files need to be configured
+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 ####
diff --git a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh
index 072135ce3..bc0b2efb5 100755
--- a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh
@@ -8,81 +8,100 @@ TC_ONELINE_DESCR="Stabilty over 72hours, 700 PNFs over SFTP. All new files (100)
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="--tc1300"
-export BC_TC=""
+export DR_REDIR_FEEDS="2:A"
+
export NUM_FTPFILES="1000"
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
+
+# 72h MR sim execution time since first poll, should be reached withing 72h + 1h margin
+mr_contain_str exe_time_first_poll 4320: $((60*60*24*3+3600))
+
+# Requirement number of files, 100 new files in first event for each PNF, then 1 new file per PNF in the
+# remaining 15 min polls up to 72h. This is the minimum number of published files for the test
+TARGET_REQUIRMENT_FILES=$((70000+700*95+700*96+700*96))
+
+#Make sure target is reached within 72h + a reasonable tolerance
+mr_greater ctr_unique_files $((TARGET_REQUIRMENT_FILES-1)) 1800
-# 24h MR sim execution time since first poll, should be reached withing 72h +1h margion
-mr_contain_str exe_time_first_poll 4320: $((60*60*24*3+3600))
# stop event delivery
mr_print stop
# wait for MR sim values to stabilize
sleep_wait 30
-# Requirement number of files, 100 new files in first event for each PNF, then 1 new file per PNF in the
-# remaining polls up to 24h. This is the minimum number of published files for the test
-TARGET_REQUIRMENT_FILE=$((70000+700*95+700*96+700*96))
-
#Calculate targets based on the number of of unique files delivered from MR sim
TARGET_FILES=$(mr_read ctr_unique_files)
-TARGET_EVENTS=$((TARGET_FILES/100))
+TARGET_EVENTS=$((TARGET_FILES-70000+700)) #First event from a PNF is 100 new files, remaining events contains 1 new file
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.
+#Maximum number of configured FTP files, if DFC reach this then the NUM_FTPSFILES need to be increased.
MAX_FILES=$((NUM_FTPFILE*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_FILE
+dr_greater ctr_published_files $((TARGET_REQUIRMENT_FILES-1))
-#If greate then MAX_FILES then more FTP files need to be configured
-mr_less ctr_ctr_unique_files MAX_FILES
+#If greater then MAX_FILES then more FTP files need to be configured
+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 ####