Update DFC tests to use file based conifg

To remove Consul/CBS dependency in DCAE DFC was updated
to use file based configuration

Tests updates:
- file based config use in DFC
- removal of Consul/CBS from DFC tests
- coversion config files from json to yaml

Issue-ID: DCAEGEN2-2692
Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Change-Id: I7267f99cc1354dee84afc1c187b7e4ca0b89af94

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
index 01b65ce..09c7f1c 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_FTPS.sh
@@ -30,7 +30,7 @@ log_sim_settings
 start_simulators
 
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                    0 60
 dr_equal            ctr_published_files             0 60

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
index 1585205..4265d1b 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/25h_backlog_1MB_SFTP.sh
@@ -30,7 +30,7 @@ log_sim_settings
 start_simulators
 
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                    0 60
 dr_equal            ctr_published_files             0 60
@@ -61,4 +61,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh b/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh
index 7c7d354..719af3c 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/AutoTestTest.sh
@@ -31,15 +31,15 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0 "../simulator-group/consul/c12_feed1_PM_feed2_CTR.json"
+dfc_config_app   0 "../simulator-group/dfc_configs/c12_feed1_PM_feed2_CTR.yaml"
 
-consul_config_app   1 "../simulator-group/consul/c13_feed2_CTR.json"
+dfc_config_app   1 "../simulator-group/dfc_configs/c13_feed2_CTR.yaml"
 
-consul_config_app   2 "../simulator-group/consul/c14_feed3_LOG.json"
+dfc_config_app   2 "../simulator-group/dfc_configs/c14_feed3_LOG.yaml"
 
-consul_config_app   3 "../simulator-group/consul/c15_feed1_PM_feed4_TEST.json"
+dfc_config_app   3 "../simulator-group/dfc_configs/c15_feed1_PM_feed4_TEST.yaml"
 
-consul_config_app   2 "../simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json"
+dfc_config_app   2 "../simulator-group/dfc_configs/c16_feed4_TEST_feed5_TEMP.yaml"
 
 
 mr_print                       ""
@@ -462,4 +462,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh
index f1d6f09..30f4aa8 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC1.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh
index c162a2a..e51f690 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC10.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -75,4 +75,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh
index 9d9665b..a736583 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC100.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -45,7 +45,7 @@ start_dfc           0
 
 dr_equal            ctr_published_files                  5 900
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed1_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed1_PM.yaml"
 
 mr_equal            ctr_events                           100 1800
 mr_equal            ctr_unique_files                     100
@@ -62,4 +62,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh
index 3ecfc77..ce36743 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC11.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh
index a33f37c..4cc915e 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC12.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -75,4 +75,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh
index 79c1003..c776e3c 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC13.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh
index 99646b3..eed03da 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC14.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -75,4 +75,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh
index 96c4844..133f024 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC15.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh
index cb2f71a..0eba6f1 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC2.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh
index 9eef5ae..e3ca92b 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC20.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -75,4 +75,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
index 0b18289..407a452 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC200.sh
@@ -30,7 +30,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -107,4 +107,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh
index b136eec..501a49e 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC21.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh
index 5291b68..36f5022 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC210.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -91,4 +91,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh
index 2eb9abc..cb0610a 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC220.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 30
 
@@ -80,4 +80,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh
index 84db1d8..208de1d 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC3.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh
index 380d3ed..2a642a5 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC30.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -103,4 +103,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
index 2776399..dddccc1 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC31.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -108,4 +108,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh
index b1ab482..f95bfd6 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC32.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -74,4 +74,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh
index 0ad2a12..f17e294 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC33.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh
index be614f2..43d3e79 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC4.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed1_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed1_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh
index f7b67d5..cb84a8d 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC40.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -116,4 +116,4 @@ check_dfc_logs
 
 store_logs END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC400.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC400.sh
index 6dacd49..093e764 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC400.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC400.sh
@@ -38,7 +38,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM_HTTPS.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC401.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC401.sh
index 953f41c..4daeb3c 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC401.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC401.sh
@@ -38,7 +38,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM_HTTPS.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC402.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC402.sh
index c406c1f..ed76d23 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC402.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC402.sh
@@ -38,7 +38,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM_HTTPS.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC403.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC403.sh
index 86c0f7e..01bca13 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC403.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC403.sh
@@ -38,7 +38,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM_HTTPS.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC404.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC404.sh
index 90ef7cc..7370d82 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC404.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC404.sh
@@ -38,7 +38,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM_HTTPS.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh
index 489cd1e..594fdba 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC5.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed1_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed1_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh
index 6efa322..c41a743 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC50.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -73,4 +73,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh
index 4349cb4..1e7c41e 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC6.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed1_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed1_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh
index cc3839b..637e558 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC60.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -81,4 +81,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh
index c4458a8..05e735b 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC61.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC7.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC7.sh
index 0da52f1..6b9bd2f 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC7.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC7.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
index 0a5b3f1..4de28e3 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC70.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -75,4 +75,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh
index add1454..dd29b7e 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC71.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -75,4 +75,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC8.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC8.sh
index e0d30a5..5479009 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC8.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC8.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh
index 960ea96..9a264fc 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC80.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_CTR_feed3_LOG_TEMP.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -96,4 +96,4 @@ print_all
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh
index 9734d97..901f57c 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC81.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed3_PM_CTR.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed3_PM_CTR.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -84,4 +84,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC9.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC9.sh
index f92cb4b..a78b693 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC9.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC9.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

diff --git a/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh b/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh
index 50da063..9ecda18 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/FTC90.sh
@@ -29,8 +29,8 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed1_PM.json"
-consul_config_app   1                                    "../simulator-group/consul/c13_feed2_CTR.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed1_PM.yaml"
+dfc_config_app   1                                    "../simulator-group/dfc_configs/c13_feed2_CTR.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -95,4 +95,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

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 ad2073b..fd1b886 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_FTPS_24h.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

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 1bc88ef..e902119 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/MaxFiles1MB_SFTP_24h.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -103,4 +103,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

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 4319853..b6fe014 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_FTPS_72h.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60

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 baafc90..5584c63 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh
+++ b/test/mocks/datafilecollector-testharness/auto-test/Stability1MB_SFTP_72h.sh
@@ -29,7 +29,7 @@ log_sim_settings
 
 start_simulators
 
-consul_config_app   0                                    "../simulator-group/consul/c12_feed2_PM.json"
+dfc_config_app   0                                    "../simulator-group/dfc_configs/c12_feed2_PM.yaml"
 
 mr_equal            ctr_requests                         0 60
 dr_equal            ctr_published_files                  0 60
@@ -106,4 +106,4 @@ check_dfc_logs
 
 store_logs          END
 
-print_result
\ No newline at end of file
+print_result

diff --git a/test/mocks/datafilecollector-testharness/common/README.md b/test/mocks/datafilecollector-testharness/common/README.md
index 736ed48..13cbd46 100644 (file)
--- a/test/mocks/datafilecollector-testharness/common/README.md
+++ b/test/mocks/datafilecollector-testharness/common/README.md
@@ -28,13 +28,9 @@ dfc instance to start. DFC app will get a name like 'dfc_app0' to 'dfc_app4'.
 **kill_dfc \<dfc-instance-id>**:
 Stop and remove the dfc app container with the instance id.
 
-**consul_config_app \<dfc-instance-id> \<json-file-path>**:
-Configure consul with json file with app config for a dfc instance using the dfc
-instance id and the json file.
-
-**consul_config_dmaap \<dfc-instance-id> \<json-file-path>**:
-Configure consul with json file with dmaap config for a dfc instance using the dfc
-instance id and the json file.
+**dfc_config_app \<dfc-instance-id> \<yaml-file-path>**:
+Apply app configuration for a dfc instance using the dfc
+instance id and the yaml file.
 
 **kill_dr**:
 Stop and remove the DR simulator container

diff --git a/test/mocks/datafilecollector-testharness/common/test_env.sh b/test/mocks/datafilecollector-testharness/common/test_env.sh
index 35d82ab..f76af32 100644 (file)
--- a/test/mocks/datafilecollector-testharness/common/test_env.sh
+++ b/test/mocks/datafilecollector-testharness/common/test_env.sh
@@ -31,8 +31,6 @@ DFC_PORT=8100                          #Up to five dfc apps can be used, dfc_app
 DFC_PORT_SECURE=8433                   #Up to five dfc apps can be used, dfc_app0 will be mapped to 8433 on local machine for hhtps, dfc_app1 mapped to 8434 etc
 DFC_LOGPATH="/var/log/ONAP/application.log"  #Path the application log in the dfc container
 DOCKER_SIM_NWNAME="dfcnet"             #Name of docker private network
-CONSUL_HOST="consul-server"            #Host name of consul
-CONSUL_PORT=8500                       #Port number of consul
 CONFIG_BINDING_SERVICE="config-binding-service"  #Host name of CBS
 CONFIG_BINDING_SERVICE_SERVICE_PORT=10000  #CBS port
 MR_PORT=2222                           #MR simulator port number http

diff --git a/test/mocks/datafilecollector-testharness/common/testcase_common.sh b/test/mocks/datafilecollector-testharness/common/testcase_common.sh
index 601c093..ba665f6 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/common/testcase_common.sh
+++ b/test/mocks/datafilecollector-testharness/common/testcase_common.sh
@@ -181,8 +181,6 @@ echo "DR redir simulator:       " $(docker images | grep drsim_common)
 echo "SFTP:                     " $(docker images | grep atmoz/sftp)
 echo "FTPES:                    " $(docker images | grep ftpes_vsftpd)
 echo "HTTP/HTTPS/HTTPS no auth: " $(docker images | grep http_https_httpd)
-echo "Consul:                   " $(docker images | grep consul)
-echo "CBS:                      " $(docker images | grep platform.configbinding)
 echo ""
 
 #Configure MR sim to use correct host:port for running dfc as an app or as a container
@@ -391,7 +389,7 @@ __start_dfc_image() {
        docker network ls| grep "$DOCKER_SIM_NWNAME" > /dev/null || docker network create "$DOCKER_SIM_NWNAME"
 
        echo "Starting DFC: " $appname " with ports mapped to " $localport " and " $localport_secure " in docker network "$DOCKER_SIM_NWNAME
-  docker run -d --volume $(pwd)/../simulator-group/tls/:/opt/app/datafile/etc/cert/ -p $localport":8100" -p $localport_secure":8433" --network=$DOCKER_SIM_NWNAME -e CONSUL_HOST=$CONSUL_HOST -e CONSUL_PORT=$CONSUL_PORT -e CONFIG_BINDING_SERVICE=$CONFIG_BINDING_SERVICE -e CONFIG_BINDING_SERVICE_SERVICE_PORT=$CONFIG_BINDING_SERVICE_SERVICE_PORT -e HOSTNAME=$appname --name $appname $DFC_IMAGE
+  docker run -d --volume $(pwd)/../simulator-group/tls/:/opt/app/datafile/etc/cert/ --volume $(pwd)/../simulator-group/dfc_config_volume/:/app-config/ -p $localport":8100" -p $localport_secure":8433" --network=$DOCKER_SIM_NWNAME -e CONFIG_BINDING_SERVICE=$CONFIG_BINDING_SERVICE -e CONFIG_BINDING_SERVICE_SERVICE_PORT=$CONFIG_BINDING_SERVICE_SERVICE_PORT -e HOSTNAME=$appname --name $appname $DFC_IMAGE
        sleep 3
        set +x
        dfc_started=false
@@ -489,8 +487,6 @@ __wait_for_dfc() {
        http=$(($DFC_PORT+$2))
        https=$((DFC_PORT_SECURE+$2))
        echo "The app is expected to listen to http port ${http} and https port ${https}"
-       echo "The app shall use 'localhost' and '8500' for CONSUL_HOST and CONSUL_PORT."
-       echo "The app shale use 'config-binding-service-localhost' for CONFIG_BINDING_SERVICE"
        echo "The app shall use ${1} for HOSTNAME."
        read -p "Press enter to continue when app mapping to ${1} has been manually started"
 }
@@ -584,12 +580,12 @@ start_dfc() {
        fi
 }
 
-# Configure consul with dfc config, args <dfc-instance-id> <json-file-path>
+# Configure volume with dfc config, args <dfc-instance-id> <yaml-file-path>
 # Not intended to be called directly by test scripts.
-__consul_config() {
+__dfc_config() {
 
        if [ $# != 2 ]; then
-       __print_err "need two args, <dfc-instance-id> <json-file-path>"
+       __print_err "need two args, <dfc-instance-id> <yaml-file-path>"
                exit 1
        fi
 
@@ -598,26 +594,27 @@ __consul_config() {
                exit 1
        fi
        if ! [ -f $2 ]; then
-               __print_err "json file does not extis: "$2
+               __print_err "yaml file does not exist: "$2
                exit 1
        fi
 
        appname=$DFC_APP_BASE$1
 
-       echo "Configuring consul for " $appname " from " $2
-       curl -s http://127.0.0.1:${CONSUL_PORT}/v1/kv/${appname}?dc=dc1 -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data-binary "@"$2 >/dev/null
+       echo "Applying configuration for " $appname " from " $2
+       mkdir $(pwd)/../simulator-group/dfc_config_volume/
+       cp $2 $(pwd)/../simulator-group/dfc_config_volume/application_config.yaml
 }
 
-# Configure consul with dfc app config, args <dfc-instance-id> <json-file-path>
-consul_config_app() {
+# Configure volume with dfc app config, args <dfc-instance-id> <yaml-file-path>
+dfc_config_app() {
        if [ $START_ARG == "manual-app" ]; then
-               echo "Replacing 'mrsim' with 'localhost' in json app config for consul"
-               sed 's/mrsim/localhost/g' $2 > .tmp_app.json
-               echo "Replacing 'drsim' with 'localhost' in json dmaap config for consul"
-               sed 's/drsim/localhost/g' .tmp_app.json > .app.json
-               __consul_config $1 .app.json
+               echo "Replacing 'mrsim' with 'localhost' in yaml app config"
+               sed 's/mrsim/localhost/g' $2 > .tmp_app.yaml
+               echo "Replacing 'drsim' with 'localhost' in yaml dmaap config"
+               sed 's/drsim/localhost/g' .tmp_app.yaml > .app.yaml
+               __dfc_config $1 .app.yaml
        else
-               __consul_config $1 $2
+               __dfc_config $1 $2
        fi
 }
 
@@ -645,6 +642,8 @@ kill_dfc() {
        elif [ $START_ARG == "manual-app" ]; then
                __wait_for_dfc_gone $appname
        fi
+
+       rm -rf $(pwd)/../simulator-group/dfc_config_volume
 }
 
 # Stop and remove the DR simulator container
@@ -1222,8 +1221,6 @@ store_logs() {
                docker logs $appname > $TESTLOGS/$ATC/${1}_${appname}.log 2>&1
        done
 
-       docker logs dfc_consul > $TESTLOGS/$ATC/$1_consul.log 2>&1
-       docker logs dfc_cbs > $TESTLOGS/$ATC/$1_cbs.log 2>&1
 }
 # Check the dfc application log, for all dfc instances, for WARN and ERR messages and print the count.
 check_dfc_logs() {

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/README.md b/test/mocks/datafilecollector-testharness/simulator-group/README.md
old mode 100644 (file)
new mode 100755 (executable)
index 545776a..e133893
--- a/test/mocks/datafilecollector-testharness/simulator-group/README.md
+++ b/test/mocks/datafilecollector-testharness/simulator-group/README.md
@@ -9,10 +9,9 @@ In general these steps are needed to run the simulator group and dfc
 
 1. Build the simulator images
 2. Edit simulator env variables (to adapt the behavior of simulators)
-3. Configure consul
-4. Start the simulator monitor (to view the simulator stats)
-5. Start the simulators
-6. Start dfc
+3. Start the simulator monitor (to view the simulator stats)
+4. Start the simulators
+5. Start dfc
 
 # Overview of the simulators.
 
@@ -44,7 +43,6 @@ Run the script `prepare-images.sh` to build the docker images for MR, DR and FTP
 
 ## Summary of scripts and files
 
-- `consul_config.sh` - Convert a json config file to work with dfc when manually started as java-app or container and then add that json to Consul.
 - `dfc-internal-stats.sh` - Periodically extract jvm data and dfc internal data and print to console/file.
 - `docker-compose-setup.sh` - Sets environment variables for the simulators and start the simulators with that settings.
 - `docker-compose-template.yml` - A docker compose template with environment variables setting. Used for producing a docker-compose file to defined the simulator containers.
@@ -112,7 +110,7 @@ Kill all the containers with `simulators-kill.se`
 `setup-ftp-files.for-image.sh` and `setup-http-files-for-image.sh` is for CSIT and executed when the ftp/http servers are started from the docker-compose-setup.sh\`.
 
 To make DFC to be able to connect to the simulator containers, DFC need to run in host mode.
-Start DFC by the following cmd: ` docker run -d --network="host" --name dfc_app <dfc-image>  `
+Start DFC by the following cmd: `docker run -d --network="host" --name dfc_app <dfc-image> `
 
 `<dfc-image>` could be either the locally built image `onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server`
 or the one in nexus `nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server`.

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json
deleted file mode 100644 (file)
index 76d6822..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/1",
-        "publish_url": "https://drsim:3907/publish/1",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
deleted file mode 100644 (file)
index ddf0bbb..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed1_PM_feed2_CTR.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "username": "user",
-      "log_url": "https://drsim:3907/feedlog/1",
-      "publish_url": "https://drsim:3907/publish/1",
-      "location": "loc00",
-      "password": "password",
-      "publisher_id": "972.360gm"
-    },
-    "CTR_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "feed02": {
-          "username": "user",
-          "log_url": "https://drsim:3907/feedlog/2",
-          "publish_url": "https://drsim:3907/publish/2",
-          "location": "loc00",
-          "password": "password",
-          "publisher_id": "972.360gm"
-        }
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json
deleted file mode 100644 (file)
index 43dc6a9..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  },
-  "streams_publishes": {
-    "CTR_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "feed02": {
-          "username": "user",
-          "log_url": "https://drsim:3907/feedlog/2",
-          "publish_url": "https://drsim:3907/publish/2",
-          "location": "loc00",
-          "password": "password",
-          "publisher_id": "972.360gm"
-        }
-      }
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json
deleted file mode 100644 (file)
index bc9c9b1..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_CTR_feed3_LOG_TEMP.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "CTR_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/2",
-        "publish_url": "https://drsim:3907/publish/2",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    },
-    "LOG_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/3",
-        "publish_url": "https://drsim:3907/publish/3",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    },
-    "TEMP_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/3",
-        "publish_url": "https://drsim:3907/publish/3",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json
deleted file mode 100644 (file)
index c5a5f84..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/2",
-        "publish_url": "https://drsim:3907/publish/2",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_HTTPS.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_HTTPS.json
deleted file mode 100644 (file)
index 6d1f0c0..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_HTTPS.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.p12",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/p12.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.certificateConfig.httpsHostnameVerify": false,
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/2",
-        "publish_url": "https://drsim:3907/publish/2",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json
deleted file mode 100644 (file)
index c5a5f84..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/2",
-        "publish_url": "https://drsim:3907/publish/2",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json
deleted file mode 100644 (file)
index 9f37039..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "false",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/2",
-        "publish_url": "https://drsim:3907/publish/2",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json
deleted file mode 100644 (file)
index c5a5f84..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed2_PM_secureMR.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/2",
-        "publish_url": "https://drsim:3907/publish/2",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
deleted file mode 100644 (file)
index bf65e85..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c12_feed3_PM_CTR.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C12",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/3",
-        "publish_url": "https://drsim:3907/publish/3",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    },
-    "CTR_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/3",
-        "publish_url": "https://drsim:3907/publish/3",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json
deleted file mode 100644 (file)
index 486d5ee..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c13_feed2_CTR.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c13",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C13",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "CTR_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/2",
-        "publish_url": "https://drsim:3907/publish/2",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json
deleted file mode 100644 (file)
index 6509bcf..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c14_feed3_LOG.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c14",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C14",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "LOG_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/3",
-        "publish_url": "https://drsim:3907/publish/3",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json
deleted file mode 100644 (file)
index 620d172..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c15_feed1_PM_feed4_TEST.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c15",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C15",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "PM_MEAS_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/1",
-        "publish_url": "https://drsim:3907/publish/1",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    },
-    "TEST_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/4",
-        "publish_url": "https://drsim:3907/publish/4",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json
deleted file mode 100644 (file)
index dfbecaa..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/c16_feed4_TEST_feed5_TEMP.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-  "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-  "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-  "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-  "dmaap.security.enableDmaapCertAuth": "false",
-  "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c15",
-  "dmaap.dmaapConsumerConfiguration.consumerId": "C15",
-  "dmaap.dmaapConsumerConfiguration.timeoutMs": -1,
-  "sftp.security.strictHostKeyChecking": "true",
-  "streams_publishes": {
-    "TEST_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/4",
-        "publish_url": "https://drsim:3907/publish/4",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    },
-    "TEMP_FILES": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "user",
-        "log_url": "https://drsim:3907/feedlog/5",
-        "publish_url": "https://drsim:3907/publish/4",
-        "location": "loc00",
-        "password": "password",
-        "publisher_id": "972.360gm"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "dmaap_info": {
-        "topic_url": "http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-      },
-      "type": "message_router"
-    }
-  }
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_config.hcl b/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_config.hcl
deleted file mode 100644 (file)
index f540975..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_config.hcl
+++ /dev/null
@@ -1,13 +0,0 @@
-#server = true
-#bootstrap = true
-#client_addr = "0.0.0.0"
-
-service  {
-  # Name for CBS in consul, env var CONFIG_BINDING_SERVICE
-  # should be passed to dfc app with this value
-  Name = "config-binding-service"
-  # Host name where CBS is running
-  Address = "config-binding-service"
-  # Port number where CBS is running
-  Port = 10000
-}

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_localhost_config.hcl b/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_localhost_config.hcl
deleted file mode 100644 (file)
index c2d9839..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul/cbs_localhost_config.hcl
+++ /dev/null
@@ -1,11 +0,0 @@
-service {
-  # Name for CBS in consul, env var CONFIG_BINDING_SERVICE
-  # should be passed to dfc app with this value
-  # This is only to be used when contacting cbs via local host
-  # (typicall when dfc is executed as an application without a container)
-  Name = "config-binding-service-localhost"
-  # Host name where CBS is running
-  Address = "localhost"
-  # Port number where CBS is running
-  Port = 10000
-}
\ No newline at end of file

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul/consul_config.json b/test/mocks/datafilecollector-testharness/simulator-group/consul/consul_config.json
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/consul_config.sh b/test/mocks/datafilecollector-testharness/simulator-group/consul_config.sh
deleted file mode 100755 (executable)
index 5e8f7e2..0000000
--- a/test/mocks/datafilecollector-testharness/simulator-group/consul_config.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-bash -x 
-
-# Script to configure consul with json configuration files with 'localhost' urls. This
-# is needed when running the simulator as as a stand-alone app or via a dfc container in 'host' network mode. 
-# Assuming the input json files hostnames for MR and DR simulators are given as 'mrsim'/'drsim'
-# See available consul files in the consul dir
-# The script stores a json config for 'dfc_app'<dfc-instance-id>' if arg 'app' is given.
-# And for 'dfc_app'<dfc-instance-id>':dmaap' if arg 'dmaap' is given.
-# Instance id shall be and integer in the range 0..5
-
-. ../common/test_env.sh
-
-if [ $# != 3 ]; then
-       echo "Script needs three args, app|dmaap <dfc-instance-id> <json-file-path>"
-       exit 1
-fi
-
-if [ $2 -lt 0 ] || [ $2 -gt $DFC_MAX_IDX ]; then
-       __print_err "dfc-instance-id should be 0.."$DFC_MAX_IDX
-       exit 1
-fi
-if ! [ -f $3 ]; then
-       __print_err "json file does not extis: "$3
-       exit 1
-fi
-
-echo "Configuring consul for " $appname " from " $3
-curl -s http://127.0.0.1:${CONSUL_PORT}/v1/kv/${appname}?dc=dc1 -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data-binary "@"$3
-
-echo "Reading back from consul:"
-curl "http://127.0.0.1:${CONSUL_PORT}/v1/kv/${appname}?dc=dc1&raw=0"
-
-echo "done"
\ No newline at end of file

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM.yaml
new file mode 100644 (file)
index 0000000..89b1f7f
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM.yaml
@@ -0,0 +1,28 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/1
+      publish_url: https://drsim:3907/publish/1
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM_feed2_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM_feed2_CTR.yaml
new file mode 100644 (file)
index 0000000..cbc79f5
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed1_PM_feed2_CTR.yaml
@@ -0,0 +1,37 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    username: user
+    log_url: https://drsim:3907/feedlog/1
+    publish_url: https://drsim:3907/publish/1
+    location: loc00
+    password: password
+    publisher_id: 972.360gm
+  CTR_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      feed02:
+        username: user
+        log_url: https://drsim:3907/feedlog/2
+        publish_url: https://drsim:3907/publish/2
+        location: loc00
+        password: password
+        publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR.yaml
new file mode 100644 (file)
index 0000000..7e5e3df
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR.yaml
@@ -0,0 +1,29 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router
+streams_publishes:
+  CTR_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      feed02:
+        username: user
+        log_url: https://drsim:3907/feedlog/2
+        publish_url: https://drsim:3907/publish/2
+        location: loc00
+        password: password
+        publisher_id: 972.360gm

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR_feed3_LOG_TEMP.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR_feed3_LOG_TEMP.yaml
new file mode 100644 (file)
index 0000000..dbd7641
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_CTR_feed3_LOG_TEMP.yaml
@@ -0,0 +1,46 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  CTR_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/2
+      publish_url: https://drsim:3907/publish/2
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+  LOG_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/3
+      publish_url: https://drsim:3907/publish/3
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+  TEMP_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/3
+      publish_url: https://drsim:3907/publish/3
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM.yaml
new file mode 100644 (file)
index 0000000..ce3e3a6
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM.yaml
@@ -0,0 +1,28 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/2
+      publish_url: https://drsim:3907/publish/2
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml
new file mode 100644 (file)
index 0000000..50a41be
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_HTTPS.yaml
@@ -0,0 +1,29 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.p12
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/p12.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.certificateConfig.httpsHostnameVerify: false
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/2
+      publish_url: https://drsim:3907/publish/2
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS.yaml
new file mode 100644 (file)
index 0000000..ce3e3a6
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS.yaml
@@ -0,0 +1,28 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/2
+      publish_url: https://drsim:3907/publish/2
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS_no_strict_host_key_checking.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS_no_strict_host_key_checking.yaml
new file mode 100644 (file)
index 0000000..f249f76
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_MEAS_no_strict_host_key_checking.yaml
@@ -0,0 +1,28 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "false"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/2
+      publish_url: https://drsim:3907/publish/2
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_secureMR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_secureMR.yaml
new file mode 100644 (file)
index 0000000..ce3e3a6
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed2_PM_secureMR.yaml
@@ -0,0 +1,28 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/2
+      publish_url: https://drsim:3907/publish/2
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed3_PM_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed3_PM_CTR.yaml
new file mode 100644 (file)
index 0000000..e578430
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c12_feed3_PM_CTR.yaml
@@ -0,0 +1,37 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c12
+dmaap.dmaapConsumerConfiguration.consumerId: C12
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/3
+      publish_url: https://drsim:3907/publish/3
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+  CTR_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/3
+      publish_url: https://drsim:3907/publish/3
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c13_feed2_CTR.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c13_feed2_CTR.yaml
new file mode 100644 (file)
index 0000000..8ec155f
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c13_feed2_CTR.yaml
@@ -0,0 +1,28 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c13
+dmaap.dmaapConsumerConfiguration.consumerId: C13
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  CTR_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/2
+      publish_url: https://drsim:3907/publish/2
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c14_feed3_LOG.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c14_feed3_LOG.yaml
new file mode 100644 (file)
index 0000000..274fdfb
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c14_feed3_LOG.yaml
@@ -0,0 +1,28 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c14
+dmaap.dmaapConsumerConfiguration.consumerId: C14
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  LOG_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/3
+      publish_url: https://drsim:3907/publish/3
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c15_feed1_PM_feed4_TEST.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c15_feed1_PM_feed4_TEST.yaml
new file mode 100644 (file)
index 0000000..d72ff44
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c15_feed1_PM_feed4_TEST.yaml
@@ -0,0 +1,37 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c15
+dmaap.dmaapConsumerConfiguration.consumerId: C15
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  PM_MEAS_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/1
+      publish_url: https://drsim:3907/publish/1
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+  TEST_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/4
+      publish_url: https://drsim:3907/publish/4
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c16_feed4_TEST_feed5_TEMP.yaml b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c16_feed4_TEST_feed5_TEMP.yaml
new file mode 100644 (file)
index 0000000..e4cc8cf
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/simulator-group/dfc_configs/c16_feed4_TEST_feed5_TEMP.yaml
@@ -0,0 +1,37 @@
+dmaap.certificateConfig.keyCert: /opt/app/datafile/etc/cert/cert.jks
+dmaap.certificateConfig.keyPasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.certificateConfig.trustedCa: /opt/app/datafile/etc/cert/trust.jks
+dmaap.certificateConfig.trustedCaPasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.trustStorePath: /opt/app/datafile/etc/cert/trust.jks
+dmaap.security.trustStorePasswordPath: /opt/app/datafile/etc/cert/trust.pass
+dmaap.security.keyStorePath: /opt/app/datafile/etc/cert/cert.jks
+dmaap.security.keyStorePasswordPath: /opt/app/datafile/etc/cert/jks.pass
+dmaap.security.enableDmaapCertAuth: "false"
+dmaap.dmaapConsumerConfiguration.consumerGroup: OpenDcae-c15
+dmaap.dmaapConsumerConfiguration.consumerId: C15
+dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+sftp.security.strictHostKeyChecking: "true"
+streams_publishes:
+  TEST_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/4
+      publish_url: https://drsim:3907/publish/4
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+  TEMP_FILES:
+    type: data_router
+    dmaap_info:
+      username: user
+      log_url: https://drsim:3907/feedlog/5
+      publish_url: https://drsim:3907/publish/4
+      location: loc00
+      password: password
+      publisher_id: 972.360gm
+streams_subscribes:
+  dmaap_subscriber:
+    dmaap_info:
+      topic_url: http://mrsim:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT
+    type: message_router

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh
index 9f531f4..e145d26 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh
+++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-setup.sh
@@ -10,7 +10,6 @@
 #
 
 # Script for manually starting all simulators with test setting below
-# Matching json config is needed in CBS/Consul as well. Use consul_config.sh to add config to consul
 
 export MR_TC="--tc710"                                 # Test behaviour for MR sim
 export MR_GROUPS="OpenDcae-c12:PM_MEAS_FILES"          # Comma-separated list of <consumer-group>:<change-identifier>

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
index 01113e3..6c36884 100644 (file)
--- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
+++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
@@ -7,33 +7,6 @@ networks:
 
 services:
 
-  consul-server:
-    networks:
-      - dfcnet
-    container_name: dfc_consul
-    image: nexus3.onap.org:10001/onap/oom/consul:2.1.0
-    ports:
-      - "8500:8500"
-    entrypoint: /usr/local/bin/docker-entrypoint.sh agent -dev -client 0.0.0.0
-    volumes:
-      - ./consul/consul/:/consul/config
-
-  config-binding-service:
-    networks:
-      - dfcnet
-    container_name: dfc_cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.5.3
-    ports:
-      - "10000:10000"
-    command: sh -c "
-      unset PROD_LOGGING;
-      /usr/local/bin/run.py;
-      "
-    environment:
-      - CONSUL_HOST=consul-server
-    depends_on:
-      - consul-server
-
   tls-init-container:
     container_name: dfc_tls-init-container
     image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.4

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh b/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh
index 4384439..634450b 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh
+++ b/test/mocks/datafilecollector-testharness/simulator-group/simulators-kill.sh
@@ -30,8 +30,6 @@ docker kill dfc_http-https-server1
 docker kill dfc_http-https-server2
 docker kill dfc_http-https-server3
 docker kill dfc_http-https-server4
-docker kill dfc_cbs
-docker kill dfc_consul
 
 echo "Removing simulator containers"
 docker rm dfc_dr-sim
@@ -56,7 +54,5 @@ if [ "$HTTP_TYPE" = "HTTPS" ]
   then
        docker rm -f oom-certservice-post-processor
 fi
-docker rm dfc_cbs
-docker rm dfc_consul
 
 echo "done"

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh b/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh
index 71767ff..36dd260 100755 (executable)
--- a/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh
+++ b/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh
@@ -119,8 +119,7 @@ docker-compose -f docker-compose-template.yml config > docker-compose.yml
 
 docker-compose up -d
 
-sudo chown $(id -u):$(id -g) consul
-sudo chown $(id -u):$(id -g) consul/consul/
+sudo chown $(id -u):$(id -g) dfc_configs
 
 declare -a SFTP_SIM
 declare -a FTPES_SIM
@@ -144,8 +143,6 @@ HTTP_SIM[1]="$(docker ps -q --filter='name=dfc_http-https-server1')"
 HTTP_SIM[2]="$(docker ps -q --filter='name=dfc_http-https-server2')"
 HTTP_SIM[3]="$(docker ps -q --filter='name=dfc_http-https-server3')"
 HTTP_SIM[4]="$(docker ps -q --filter='name=dfc_http-https-server4')"
-CBS_SIM="$(docker ps -q --filter='name=dfc_cbs')"
-CONSUL_SIM="$(docker ps -q --filter='name=dfc_consul')"
 
 #Wait for initialization of docker containers for all simulators
 for i in {1..10}; do
@@ -166,9 +163,7 @@ if [ $(docker inspect --format '{{ .State.Running }}' $DR_SIM) ] && \
 [ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[1]}) ] && \
 [ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[2]}) ] && \
 [ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[3]}) ] && \
-[ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[4]}) ] && \
-[ $(docker inspect --format '{{ .State.Running }}' $CBS_SIM) ] && \
-[ $(docker inspect --format '{{ .State.Running }}' $CONSUL_SIM) ]
+[ $(docker inspect --format '{{ .State.Running }}' ${HTTP_SIM[4]}) ]
  then
    echo "All simulators Started"
    break
@@ -188,8 +183,6 @@ if [ -z "$BASIC_AUTH_PASSWORD" ]
  BASIC_AUTH_PASSWORD=demo123456!
 fi
 
-server_check      "cbs          " 10000 "/healthcheck"
-server_check      "consul       " 8500 "/v1/catalog/service/agent"
 server_check      "DR sim       " 3906 "/"
 server_check      "DR redir sim " 3908 "/"
 server_check      "MR sim       " 2222 "/"