Fix problem with expired certs in FTPES tests

[integration.git] / test / mocks / datafilecollector-testharness / simulator-group / docker-compose-template.yml

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 537012a..255d732 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,35 +7,14 @@ networks:
 
 services:
 
-  consul-server:
-    networks:
-      - dfcnet
-    container_name: dfc_consul
-    image: docker.io/consul:1.4.4
-    ports:
-      - "8500:8500"
-    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.app-app:2.3.0
-    ports:
-      - "10000:10000"
-    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
-    networks:
-      - dfcnet
+  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:
-      - ./tls:/opt/tls/shared:rw
+      - ${SIM_GROUP}/tls:/opt/app/datafile/etc/cert
+      - ${SIM_GROUP}/../certservice/generated-certs/dfc-p12:/opt/app/datafile/etc/
 
   drsim:
     networks:
@@ -51,8 +30,6 @@ services:
     command: node dmaapDR.js ${DR_TC}
     volumes:
       - ./tls:/app/cert/:rw
-    depends_on:
-      - tls-init-container
 
   drsim_redir:
     networks:
@@ -68,8 +45,6 @@ services:
     command: node dmaapDR_redir.js ${DR_REDIR_TC}
     volumes:
       - ./tls:/app/cert/:rw
-    depends_on:
-      - tls-init-container
 
   mrsim:
     networks:
@@ -78,8 +53,10 @@ services:
       SFTP_SIMS: ${SFTP_SIMS}
       FTPES_SIMS: ${FTPES_SIMS}
       HTTP_SIMS: ${HTTP_SIMS}
+      HTTP_JWT_SIMS: ${HTTP_JWT_SIMS}
       HTTPS_SIMS: ${HTTPS_SIMS}
       HTTPS_SIMS_NO_AUTH: ${HTTPS_SIMS_NO_AUTH}
+      HTTPS_JWT_SIMS: ${HTTPS_JWT_SIMS}
       NUM_FTP_SERVERS: ${NUM_FTP_SERVERS}
       NUM_HTTP_SERVERS: ${NUM_HTTP_SERVERS}
       MR_GROUPS: ${MR_GROUPS}
@@ -92,8 +69,6 @@ services:
     command: python mr-sim.py ${MR_TC}
     volumes:
       - ./tls:/app/cert/:rw
-    depends_on:
-      - tls-init-container
 
   sftp-server0:
     networks:
@@ -159,8 +134,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd1:
     networks:
@@ -176,8 +149,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd2:
     networks:
@@ -193,8 +164,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd3:
     networks:
@@ -210,8 +179,6 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   ftpes-server-vsftpd4:
     networks:
@@ -227,70 +194,78 @@ services:
     command: vsftpd /etc/vsftpd_ssl.conf
     volumes:
       - ./tls:/etc/ssl/private/:rw
-    depends_on:
-      - tls-init-container
 
   http-https-server0:
     networks:
       - dfcnet
     container_name: dfc_http-https-server0
-    image: http_https_httpd:latest
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "81:80"
       - "444:443"
       - "8081:8080"
+      - "32001:32000"
+      - "32101:32100"
     restart: on-failure
     volumes:
-      - ./../certservice/generated-certs/apache-pem:/usr/local/apache2/certs/:rw
+      - ./../certservice/generated-certs/apache-pem:/etc/apache2/certs/:rw
 
   http-https-server1:
     networks:
       - dfcnet
     container_name: dfc_http-https-server1
-    image: http_https_httpd:latest
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "82:80"
       - "445:443"
       - "8082:8080"
+      - "32002:32000"
+      - "32102:32100"
     restart: on-failure
     volumes:
-      - ./../certservice/generated-certs/apache-pem:/usr/local/apache2/certs/:rw
+      - ./../certservice/generated-certs/apache-pem:/etc/apache2/certs/:rw
 
   http-https-server2:
     networks:
       - dfcnet
     container_name: dfc_http-https-server2
-    image: http_https_httpd:latest
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "83:80"
       - "446:443"
       - "8083:8080"
+      - "32003:32000"
+      - "32103:32100"
     restart: on-failure
     volumes:
-      - ./../certservice/generated-certs/apache-pem:/usr/local/apache2/certs/:rw
+      - ./../certservice/generated-certs/apache-pem:/etc/apache2/certs/:rw
 
   http-https-server3:
     networks:
       - dfcnet
     container_name: dfc_http-https-server3
-    image: http_https_httpd:latest
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "84:80"
       - "447:443"
       - "8084:8080"
+      - "32004:32000"
+      - "32104:32100"
     restart: on-failure
     volumes:
-      - ./../certservice/generated-certs/apache-pem:/usr/local/apache2/certs/:rw
+      - ./../certservice/generated-certs/apache-pem:/etc/apache2/certs/:rw
 
   http-https-server4:
     networks:
       - dfcnet
     container_name: dfc_http-https-server4
-    image: http_https_httpd:latest
+    image: nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:1.0.0
     ports:
       - "85:80"
       - "448:443"
       - "8085:8080"
+      - "32005:32000"
+      - "32105:32100"
     restart: on-failure
     volumes:
-      - ./../certservice/generated-certs/apache-pem:/usr/local/apache2/certs/:rw
+      - ./../certservice/generated-certs/apache-pem:/etc/apache2/certs/:rw