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

5 files changed, 47 insertions, 40 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
diff --git a/test/mocks/datafilecollector-testharness/dr-sim/Dockerfile b/test/mocks/datafilecollector-testharness/dr-sim/Dockerfile
index cbe30366c..b429c72fe 100644
--- a/test/mocks/datafilecollector-testharness/dr-sim/Dockerfile
+++ b/test/mocks/datafilecollector-testharness/dr-sim/Dockerfile
@@ -1,6 +1,6 @@
 #Common image for both dmmapDR and dmaapDR_redir
 
-FROM node:12
+FROM node:14
 
 WORKDIR /app
 
@@ -17,4 +17,4 @@ RUN npm install argparse
 
 #Ports for DR redir
 #EXPOSE 3908
-#EXPOSE 3909
\ No newline at end of file
+#EXPOSE 3909
diff --git a/test/mocks/datafilecollector-testharness/dr-sim/package.json b/test/mocks/datafilecollector-testharness/dr-sim/package.json
index faebcc929..ad96f0a78 100644
--- a/test/mocks/datafilecollector-testharness/dr-sim/package.json
+++ b/test/mocks/datafilecollector-testharness/dr-sim/package.json
@@ -12,9 +12,9 @@
       }
     },
     "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -105,38 +105,38 @@
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
     "express": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.18.3",
-        "content-disposition": "0.5.2",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.3.1",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.1.1",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
-        "qs": "6.5.2",
-        "range-parser": "~1.2.0",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
         "safe-buffer": "5.1.2",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       }
diff --git a/test/mocks/datafilecollector-testharness/mr-sim/Dockerfile b/test/mocks/datafilecollector-testharness/mr-sim/Dockerfile
index bb21a5276..e0c580ddf 100755
--- a/test/mocks/datafilecollector-testharness/mr-sim/Dockerfile
+++ b/test/mocks/datafilecollector-testharness/mr-sim/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:8.0.0
 
 COPY . /app
 
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 f23c85102..01113e396 100644
--- a/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
+++ b/test/mocks/datafilecollector-testharness/simulator-group/docker-compose-template.yml
@@ -11,9 +11,10 @@ services:
     networks:
       - dfcnet
     container_name: dfc_consul
-    image: docker.io/consul:1.4.4
+    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
 
@@ -21,9 +22,13 @@ services:
     networks:
       - dfcnet
     container_name: dfc_cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.3.0
+    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:
@@ -37,6 +42,17 @@ services:
     volumes:
       - ./tls:/opt/tls/shared:rw
 
+  cmpv2-postprocessor:
+    container_name: dfc_cmpv2-postprocessor
+    image: nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:2.3.3
+    env_file:
+      - ../certservice/merger/merge-certs.env
+    volumes:
+      - ${SIM_GROUP}/tls:/opt/app/datafile/etc/cert
+      - ${SIM_GROUP}/../certservice/generated-certs/dfc-p12:/opt/app/datafile/etc/
+    depends_on:
+      - tls-init-container
+
   drsim:
     networks:
       - dfcnet
@@ -236,7 +252,7 @@ services:
     networks:
       - dfcnet
     container_name: dfc_http-https-server0
-    image: nexus3.onap.org:10001/onap/org.onap.integration.simulators.httpserver:1.0.5
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "81:80"
       - "444:443"
@@ -251,7 +267,7 @@ services:
     networks:
       - dfcnet
     container_name: dfc_http-https-server1
-    image: nexus3.onap.org:10001/onap/org.onap.integration.simulators.httpserver:1.0.5
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "82:80"
       - "445:443"
@@ -266,7 +282,7 @@ services:
     networks:
       - dfcnet
     container_name: dfc_http-https-server2
-    image: nexus3.onap.org:10001/onap/org.onap.integration.simulators.httpserver:1.0.5
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "83:80"
       - "446:443"
@@ -281,7 +297,7 @@ services:
     networks:
       - dfcnet
     container_name: dfc_http-https-server3
-    image: nexus3.onap.org:10001/onap/org.onap.integration.simulators.httpserver:1.0.5
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "84:80"
       - "447:443"
@@ -296,7 +312,7 @@ services:
     networks:
       - dfcnet
     container_name: dfc_http-https-server4
-    image: nexus3.onap.org:10001/onap/org.onap.integration.simulators.httpserver:1.0.5
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "85:80"
       - "448:443"