Code Review / integration.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
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 f078d36..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
@@ -1,74 +1,74 @@
 version: '2'
 
 networks:
-   dfcnet:
-      external:
-         name: dfcnet
+  dfcnet:
+    external:
+      name: dfcnet
 
 services:
 
-  consul-server:
-    networks:
-      - dfcnet
-    container_name: dfc_consul
-    image: docker.io/consul:1.4.4
-    ports:
-      - "8500:8500"
+  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:
-      - ./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
+      - ${SIM_GROUP}/tls:/opt/app/datafile/etc/cert
+      - ${SIM_GROUP}/../certservice/generated-certs/dfc-p12:/opt/app/datafile/etc/
 
   drsim:
     networks:
       - dfcnet
     environment:
-        DRR_SIM_IP: ${DR_REDIR_SIM}
-        DR_FEEDS: ${DR_FEEDS}
+      DRR_SIM_IP: ${DR_REDIR_SIM}
+      DR_FEEDS: ${DR_FEEDS}
     image: drsim_common:latest
     ports:
-     - "3906:3906"
-     - "3907:3907"
+      - "3906:3906"
+      - "3907:3907"
     container_name: dfc_dr-sim
     command: node dmaapDR.js ${DR_TC}
+    volumes:
+      - ./tls:/app/cert/:rw
 
   drsim_redir:
     networks:
       - dfcnet
-    environment: 
-        DR_SIM_IP: drsim
-        DR_REDIR_FEEDS: ${DR_REDIR_FEEDS}
+    environment:
+      DR_SIM_IP: drsim
+      DR_REDIR_FEEDS: ${DR_REDIR_FEEDS}
     image: drsim_common:latest
     ports:
-     - "3908:3908"
-     - "3909:3909"
+      - "3908:3908"
+      - "3909:3909"
     container_name: dfc_dr-redir-sim
     command: node dmaapDR_redir.js ${DR_REDIR_TC}
+    volumes:
+      - ./tls:/app/cert/:rw
 
   mrsim:
     networks:
       - dfcnet
     environment:
-        SFTP_SIMS: ${SFTP_SIMS}
-        FTPS_SIMS: ${FTPS_SIMS}
-        NUM_FTP_SERVERS: ${NUM_FTP_SERVERS}
-        MR_GROUPS: ${MR_GROUPS}
-        MR_FILE_PREFIX_MAPPING: ${MR_FILE_PREFIX_MAPPING}
+      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}
+      MR_FILE_PREFIX_MAPPING: ${MR_FILE_PREFIX_MAPPING}
     image: mrsim:latest
     ports:
-     - "2222:2222"
+      - "2222:2222"
+      - "2223:2223"
     container_name: dfc_mr-sim
     command: python mr-sim.py ${MR_TC}
+    volumes:
+      - ./tls:/app/cert/:rw
 
   sftp-server0:
     networks:
@@ -124,7 +124,7 @@ services:
     networks:
       - dfcnet
     container_name: dfc_ftpes-server-vsftpd0
-    image: ftps_vsftpd:latest
+    image: ftpes_vsftpd:latest
     ports:
       - "1032:21"
     environment:
@@ -132,12 +132,14 @@ services:
       FTP_PASSWORD: pano
     restart: on-failure
     command: vsftpd /etc/vsftpd_ssl.conf
+    volumes:
+      - ./tls:/etc/ssl/private/:rw
 
   ftpes-server-vsftpd1:
     networks:
       - dfcnet
     container_name: dfc_ftpes-server-vsftpd1
-    image: ftps_vsftpd:latest
+    image: ftpes_vsftpd:latest
     ports:
       - "1033:21"
     environment:
@@ -145,12 +147,14 @@ services:
       FTP_PASSWORD: pano
     restart: on-failure
     command: vsftpd /etc/vsftpd_ssl.conf
+    volumes:
+      - ./tls:/etc/ssl/private/:rw
 
   ftpes-server-vsftpd2:
     networks:
       - dfcnet
     container_name: dfc_ftpes-server-vsftpd2
-    image: ftps_vsftpd:latest
+    image: ftpes_vsftpd:latest
     ports:
       - "1034:21"
     environment:
@@ -158,12 +162,14 @@ services:
       FTP_PASSWORD: pano
     restart: on-failure
     command: vsftpd /etc/vsftpd_ssl.conf
+    volumes:
+      - ./tls:/etc/ssl/private/:rw
 
   ftpes-server-vsftpd3:
     networks:
       - dfcnet
     container_name: dfc_ftpes-server-vsftpd3
-    image: ftps_vsftpd:latest
+    image: ftpes_vsftpd:latest
     ports:
       - "1035:21"
     environment:
@@ -171,12 +177,14 @@ services:
       FTP_PASSWORD: pano
     restart: on-failure
     command: vsftpd /etc/vsftpd_ssl.conf
+    volumes:
+      - ./tls:/etc/ssl/private/:rw
 
   ftpes-server-vsftpd4:
     networks:
       - dfcnet
     container_name: dfc_ftpes-server-vsftpd4
-    image: ftps_vsftpd:latest
+    image: ftpes_vsftpd:latest
     ports:
       - "1036:21"
     environment:
@@ -184,4 +192,80 @@ services:
       FTP_PASSWORD: pano
     restart: on-failure
     command: vsftpd /etc/vsftpd_ssl.conf
+    volumes:
+      - ./tls:/etc/ssl/private/:rw
+
+  http-https-server0:
+    networks:
+      - dfcnet
+    container_name: dfc_http-https-server0
+    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:/etc/apache2/certs/:rw
 
+  http-https-server1:
+    networks:
+      - dfcnet
+    container_name: dfc_http-https-server1
+    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:/etc/apache2/certs/:rw
+
+  http-https-server2:
+    networks:
+      - dfcnet
+    container_name: dfc_http-https-server2
+    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:/etc/apache2/certs/:rw
+
+  http-https-server3:
+    networks:
+      - dfcnet
+    container_name: dfc_http-https-server3
+    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:/etc/apache2/certs/:rw
+
+  http-https-server4:
+    networks:
+      - dfcnet
+    container_name: dfc_http-https-server4
+    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:/etc/apache2/certs/:rw
Integration framework, automated tools, code and scripts, best practice guidance related to cross-project Continuous System Integration Testing (CSIT), and delivery of ONAP.