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

1 files changed, 2 insertions, 9 deletions

diff --git a/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh b/test/mocks/datafilecollector-testharness/simulator-group/simulators-start.sh
index 71767ffa9..36dd2606d 100755
--- 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 "/"