aboutsummaryrefslogtreecommitdiffstats
path: root/test/mocks/datafilecollector-testharness/common
diff options
context:
space:
mode:
authorKrzysztof Gajewski <krzysztof.gajewski@nokia.com>2021-03-23 12:36:28 +0100
committerKrzysztof Gajewski <krzysztof.gajewski@nokia.com>2021-03-24 16:36:41 +0100
commit11b4934a1c264bddeec0b5d93f6f3fa64f55e376 (patch)
tree9933edb711d66d295455af88d13e50d4aa240815 /test/mocks/datafilecollector-testharness/common
parent29f9945c5f02e95087c1a8944fb1785f89fea4ae (diff)
DFC test containers and config update to fit honolulu release
Issue-ID: DCAEGEN2-2699 Signed-off-by: Krzysztof Gajewski <krzysztof.gajewski@nokia.com> Change-Id: I002b2cad53f27f900aa422e9b7912c9da3f01eee
Diffstat (limited to 'test/mocks/datafilecollector-testharness/common')
-rwxr-xr-xtest/mocks/datafilecollector-testharness/common/testcase_common.sh11
1 files changed, 1 insertions, 10 deletions
diff --git a/test/mocks/datafilecollector-testharness/common/testcase_common.sh b/test/mocks/datafilecollector-testharness/common/testcase_common.sh
index 8ead942ce..601c093e1 100755
--- a/test/mocks/datafilecollector-testharness/common/testcase_common.sh
+++ b/test/mocks/datafilecollector-testharness/common/testcase_common.sh
@@ -182,7 +182,7 @@ 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.app)
+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,15 +391,6 @@ __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
- if [ "$HTTP_TYPE" = "HTTPS" ]
- then
- docker run \
- --name oom-certservice-post-processor \
- --env-file "$SIM_GROUP"/../certservice/merger/merge-certs.env \
- --mount type=bind,src="$SIM_GROUP"/tls,dst=/opt/app/datafile/etc/cert \
- --mount type=bind,src="$SIM_GROUP"/../certservice/generated-certs/dfc-p12,dst=/opt/app/datafile/etc/ \
- nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest
- fi
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