Added support for Consul/CBS and multiple DFCs

Issue-ID: INT-1155
Change-Id: I3c1ed2f6072655c4396e406ddfd490d3786fe4d6
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>

2 files changed, 20 insertions, 2 deletions

diff --git a/test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps b/test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps
new file mode 100644
index 000000000..736314cef
--- /dev/null
+++ b/test/mocks/datafilecollector-testharness/ftps-sftp-server/Dockerfile-ftps
@@ -0,0 +1,18 @@
+FROM docker.io/panubo/vsftpd
+
+
+COPY tls/ftp.crt /etc/ssl/private/ftp.crt
+RUN chmod 644 /etc/ssl/private/ftp.crt
+RUN chown root:root /etc/ssl/private/ftp.crt
+
+COPY tls/ftp.key /etc/ssl/private/ftp.key
+RUN chmod 644 /etc/ssl/private/ftp.key
+RUN chown root:root /etc/ssl/private/ftp.key
+
+COPY tls/dfc.crt /etc/ssl/private/dfc.crt
+RUN chmod 644 /etc/ssl/private/dfc.crt
+RUN chown root:root /etc/ssl/private/dfc.crt
+
+COPY configuration/vsftpd_ssl.conf /etc/vsftpd_ssl.conf
+RUN chmod 644 /etc/vsftpd_ssl.conf
+RUN chown root:root /etc/vsftpd_ssl.conf
\ No newline at end of file
diff --git a/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf b/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf
index 99d64dca0..6946bffe2 100644
--- a/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf
+++ b/test/mocks/datafilecollector-testharness/ftps-sftp-server/configuration/vsftpd_ssl.conf
@@ -34,8 +34,8 @@ hide_ids=YES
 connect_from_port_20=NO
 listen=YES
 tcp_wrappers=YES
-pasv_min_port=8001
-pasv_max_port=8010
+#pasv_min_port=8001
+#pasv_max_port=8010
 
 # SSL
 ssl_enable=Yes