aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Migdal <marcin.migdal@nokia.com>2018-09-27 15:48:40 +0200
committerMarcin Migdal <marcin.migdal@nokia.com>2018-09-27 16:00:34 +0200
commitbd1884482f35595fc625870d409f630510b12430 (patch)
tree35646d1265140a3e03143a6905c8726cb584df0d
parent55dc9b21809e8513ec92fe8904fa4e801965c283 (diff)
Expose file via FTPES
Change-Id: I501f3cb01f1bcbc1a4c913e1e33117ad22f083b9 Issue-ID: INT-657 Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
-rw-r--r--test/mocks/pnfsimulator/README.md7
-rw-r--r--test/mocks/pnfsimulator/docker-compose.yml10
-rw-r--r--test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt0
-rw-r--r--test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt0
4 files changed, 10 insertions, 7 deletions
diff --git a/test/mocks/pnfsimulator/README.md b/test/mocks/pnfsimulator/README.md
index 14b62eecc..9e2946a70 100644
--- a/test/mocks/pnfsimulator/README.md
+++ b/test/mocks/pnfsimulator/README.md
@@ -36,10 +36,9 @@ After that again execute sftp command: *sftp -P 2222 -i ssh/ssh_host_rsa_key sft
In order to disable usage of SSH keys and start using password, change in *docker-compose.yml* service *sftp-service* entry *command* from *sftp-user::1001* to *sftp-user:password:1001*
###FTPES support
-PNF Simulator allows to serve files via FTPES server. FTPES server has predefined user: onap with password: pano.
-In order to connect we execute command *ftp-ssl host* and then enter user name and password.
-In order to download execute command while logged in*get file_name*.
-In order to add a new file execute command while logged in*put file_name*.
+PNF Simulator allows to serve files via FTPES server. FTPES server has predefined user *onap* with password *pano*.
+In order to connect execute command *ftp -p localhost 2221* and then when requested provide user and password.
+In order to download a file execute while being logged in *get file-name-to-be-downloaded*.
###Developer mode
For development of PNF Simulator, run *simulator.sh* start-dev in order to run Netopeer.
diff --git a/test/mocks/pnfsimulator/docker-compose.yml b/test/mocks/pnfsimulator/docker-compose.yml
index 3d23e00c9..d837f9e10 100644
--- a/test/mocks/pnfsimulator/docker-compose.yml
+++ b/test/mocks/pnfsimulator/docker-compose.yml
@@ -45,11 +45,15 @@ services:
image: stilliard/pure-ftpd:latest
ports:
- "2221:21"
+ - "30000-30009:30000-30009"
volumes:
+ - ./ftpes/files:/home/ftpusers/onap
- ./ftpes/userpass/:/etc/pure-ftpd/passwd/
- - ./ftpes/tls/:/etc/ssl/private/
- - ./ftpes/files:/home/onap
+ #- ./ftpes/tls/:/etc/ssl/private/
+
environment:
PUBLICHOST: localhost
- ADDED_FLAGS: --tls=2
+ #ADDED_FLAGS: --tls=2
+ FTP_USER_HOME: onap
+
restart: on-failure \ No newline at end of file
diff --git a/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt b/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/files/ftpes-noone.txt
diff --git a/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt b/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/test/mocks/pnfsimulator/ftpes/files/onap/ftpes-onap.txt