diff options
| author |   Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2020-08-25 14:36:16 +0200 |
|---|---|---|
| committer |   Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com> | 2020-08-28 07:34:28 +0000 |
| commit | 13b842ccd307ed4a2860b0044cf00d326f3866b9 (patch) | |
| tree | 47193012d1b25cca94444c433fb9736e43866088 /test/mocks/datafilecollector-testharness/common | |
| parent | d1cc6db2b73f6381e82cfa8613da66e8b3705440 (diff) | |
Update tests for Datafile Collector (DCAE SDK update)
Adjust DFC consul configs
Make message router sim return array of strings instead of array of
json objects as response (as in live environment)
Issue-ID: DCAEGEN2-2267
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I792c9abcb1c49d73a790ca9c2e8f46a0e1dfd099
Diffstat (limited to 'test/mocks/datafilecollector-testharness/common')
| -rw-r--r-- | test/mocks/datafilecollector-testharness/common/test_env.sh | 1 | ||||
| -rwxr-xr-x | test/mocks/datafilecollector-testharness/common/testcase_common.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/mocks/datafilecollector-testharness/common/test_env.sh b/test/mocks/datafilecollector-testharness/common/test_env.sh index 63c0f2ecf..cc96ce8b9 100644 --- a/test/mocks/datafilecollector-testharness/common/test_env.sh +++ b/test/mocks/datafilecollector-testharness/common/test_env.sh @@ -25,6 +25,7 @@ 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 DR_PORT=3906 #DR simulator port number http DR_PORT_SECURE=3907 #DR simulator port number for https diff --git a/test/mocks/datafilecollector-testharness/common/testcase_common.sh b/test/mocks/datafilecollector-testharness/common/testcase_common.sh index d2072c141..61f3c5d43 100755 --- a/test/mocks/datafilecollector-testharness/common/testcase_common.sh +++ b/test/mocks/datafilecollector-testharness/common/testcase_common.sh @@ -375,7 +375,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 HOSTNAME=$appname --name $appname $DFC_IMAGE + 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 sleep 3 set +x dfc_started=false |