Merge "INT-885: fix netopeer and update yang model"

[integration.git] / test / mocks / pnfsimulator / docker-compose.yml

diff --git a/test/mocks/pnfsimulator/docker-compose.yml b/test/mocks/pnfsimulator/docker-compose.yml
index f3500d2..bbb983f 100644 (file)
--- a/test/mocks/pnfsimulator/docker-compose.yml
+++ b/test/mocks/pnfsimulator/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   pnf-simulator:
     container_name: pnf-simulator
-    image: nexus3.onap.org:10003/onap/pnf-simulator:latest
+    image: nexus3.onap.org:10003/onap/pnf-simulator:4.0.0-SNAPSHOT
     ports:
       - "5000:5000"
     volumes:
@@ -20,14 +20,18 @@ services:
     image: sysrepo/sysrepo-netopeer2:latest
     ports:
       - "830:830"
+      - "6513:6513"
     volumes:
       - ./netconf:/netconf
+      - ./netopeer_tls_cfg:/netopeer_tls_cfg
     env_file:
       - ./config/netconf.env
     restart: on-failure
     depends_on:
       - sftp-server
-      - ftpes-server
+      - ftpes-server-pure-ftpd
+      - ftpes-server-vsftpd
+    command: bash -c "/netopeer_tls_cfg/entrypoint.sh"
 
   sftp-server:
     container_name: sftp-server
@@ -40,17 +44,40 @@ services:
     restart: on-failure
     command: sftp-user::1001
 
-  ftpes-server:
-    container_name: ftpes-server
+  ftpes-server-pure-ftpd:
+    container_name: ftpes-server-pure-ftpd
     image: stilliard/pure-ftpd:latest
     ports:
       - "2221:21"
-#      - "30000-30009:30000-30009"
+      - "30000-30009:30000-30009"
     volumes:
-      - ./ftpes/userpass/:/etc/pure-ftpd/passwd/
-      - ./ftpes/tls/:/etc/ssl/private/
+      - ./ftpes/files:/home/ftpusers/onap
+      - ./ftpes/pure-ftpd/userpass/:/etc/pure-ftpd/passwd/
+      - ./ftpes/pure-ftpd/tls/:/etc/ssl/private/
     environment:
       PUBLICHOST: localhost
       ADDED_FLAGS: --tls=2
-#    entrypoint: /run.sh -c 5 -C 5 -l puredb:/etc/pure-ftpd/pureftpd.pdb -E -j -R -p 30000:30009
-    restart: on-failure
\ No newline at end of file
+      FTP_USER_HOME: onap
+    restart: on-failure
+
+  ftpes-server-vsftpd:
+    container_name: ftpes-server-vsftpd
+    image: docker.io/panubo/vsftpd
+    ports:
+      - "8221:21"
+      - "8001-8010:8001-8010"
+    environment:
+      FTP_USER: onap
+      FTP_PASSWORD: pano
+      PASV_ADDRESS: localhost
+      PASV_MIN_PORT: 8001
+      PASV_MAX_PORT: 8010
+    volumes:
+      - ./ftpes/vsftpd/tls/vsftpd.crt:/etc/ssl/private/vsftpd.crt:ro
+      - ./ftpes/vsftpd/tls/vsftpd.key:/etc/ssl/private/vsftpd.key:ro
+      - ./ftpes/vsftpd/configuration/vsftpd_ssl.conf:/etc/vsftpd_ssl.conf:ro
+      - ./ftpes/files/onap/ftpes-onap.txt:/home/vsftpd/onap/ftpes-onap.txt:ro
+      - ./ftpes/files/onap/ftpes-onap.txt:/srv/ftpes-onap.txt:ro
+    restart: on-failure
+    command: vsftpd /etc/vsftpd_ssl.conf
+