From fae33f2ac2195fdf01476d4ebb111db4d65fd30e Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Mon, 27 Jul 2020 15:22:57 +0200 Subject: [PATCH] Adjust DFC tests to use FTPES instead of FTPS Issue-ID: DCAEGEN2-2367 Signed-off-by: Remigiusz Janeczek Change-Id: I56a7092225aebde78d20976cf2863e7b362b995a --- .../Functional-suite/setup.sh | 8 ++++---- .../FuncSingleFile.robot | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh index bdee34ee..7736d4a7 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh @@ -52,11 +52,11 @@ docker build -t drsim_common:latest . cd $SIMGROUP_ROOT #Copy ftp config for the ftp servers -cp -r ../ftps-sftp-server/configuration . -cp -r ../ftps-sftp-server/tls . +cp -r ../ftpes-sftp-server/configuration . +cp -r ../ftpes-sftp-server/tls . -cd ../ftps-sftp-server -docker build -t ftps_vsftpd:latest -f Dockerfile-ftps . +cd ../ftpes-sftp-server +docker build -t ftpes_vsftpd:latest -f Dockerfile-ftpes . #All containers will be started and stopped via the robot tests. diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot index 5b9048ff..bfc82387 100755 --- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot +++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot @@ -33,21 +33,21 @@ Verify single event with single 50MB SFTP file. From event poll to published fil Verify Single Event From Event Poll To Published File 50 --tc102 SFTP -######## Single file, FTPS -Verify single event with single 1MB FTPS file. From event poll to published file +######## Single file, FTPES +Verify single event with single 1MB FTPES file. From event poll to published file [TAGS] DFC_FUNCTIONAL_10 - [Documentation] Verify single event with single FTPS 1MB file from event poll to published file. - Verify Single Event From Event Poll To Published File 1 --tc200 FTPS + [Documentation] Verify single event with single FTPES 1MB file from event poll to published file. + Verify Single Event From Event Poll To Published File 1 --tc200 FTPES -Verify single event with single 1MB FTPS file. From event poll to published file +Verify single event with single 5MB FTPES file. From event poll to published file [TAGS] DFC_FUNCTIONAL_11 - [Documentation] Verify single event with single FTPS 5MB file from event poll to published file. - Verify Single Event From Event Poll To Published File 5 --tc201 FTPS + [Documentation] Verify single event with single FTPES 5MB file from event poll to published file. + Verify Single Event From Event Poll To Published File 5 --tc201 FTPES -Verify single event with single 1MB FTPS file. From event poll to published file +Verify single event with single 50MB FTEPS file. From event poll to published file [TAGS] DFC_FUNCTIONAL_12 - [Documentation] Verify single event with single FTPS 50MB file from event poll to published file. - Verify Single Event From Event Poll To Published File 50 --tc202 FTPS + [Documentation] Verify single event with single FTPES 50MB file from event poll to published file. + Verify Single Event From Event Poll To Published File 50 --tc202 FTPES *** Keywords *** Verify Single Event From Event Poll To Published File @@ -104,4 +104,4 @@ Set Default Environment Variables Set Environment Variable DR_FEEDS 2:A Set Environment Variable DR_REDIR_SIM drsim_redir Set Environment Variable SFTP_SIMS sftp-server0:22 - Set Environment Variable FTPS_SIMS ftpes-server-vsftpd0:21 + Set Environment Variable FTPES_SIMS ftpes-server-vsftpd0:21 -- 2.16.6