Merge "Adjust DFC tests to use FTPES instead of FTPS"

diff --combined tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
index 1d87cfb,bfc8238..8213c70
--- 1/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
--- 2/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
@@@ -33,26 -33,27 +33,26 @@@ Verify single event with single 50MB SF
      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
      [Documentation]                 Keyword to verify single event with file with given parameters.
      [Arguments]                     ${file_size_in_mb}    ${mr_tc}    ${ftp_type}
 -    ${cli_cmd_output}=              Run Process     ${DFC_ROOT}/../dfc-containers-clean.sh
      Set Environment Variable        MR_TC                   ${mr_tc}
      Set Environment Variable        FILE_SIZE               ${file_size_in_mb}MB
      Set Environment Variable        FTP_TYPE                ${ftp_type}
@@@ -84,8 -85,10 +84,8 @@@
      Wait Until Keyword Succeeds     1 minute      10 sec    DR Sim Query Not Published Equal    1                       #Verify 1 query response for not published files
      Wait Until Keyword Succeeds     1 minute      10 sec    DR Sim Published Files Equal        1                       #Verify 1 file published to DR sim
      DR Redir Sim Downloaded Volume Equal          ${file_size_in_mb} 000 000                                            #Verify correct number of bytes published file data in DR redir sim
 -    ${cli_cmd_output}=              Run Process             ${SIMGROUP_ROOT}/simulators-kill.sh
 -    Log To Console                  ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
 -    ${cli_cmd_output}=              Run Process             ${DFC_ROOT}/dfc-kill.sh
 -    Log To Console                  ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
 +
 +    [Teardown]                      Test Teardown
  
  Set Default Environment Variables
      [Documentation]                 Set default environment variables for simulators setup
@@@ -101,4 -104,4 +101,4 @@@
      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