Adjust DFC test files to use FTPES instead of FTPS

DFC doesn't support FTPS protocol. FTPS is treated exactly like
FTPES and soon DFC won't accept file  locations starting with
"ftps://".

Fix mr-sim.py lint issues

Issue-ID: DCAEGEN2-2367
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Idab56aab3bdb6734a04bfc9c9212f2ea800d0d74

3 files changed, 36 insertions, 36 deletions

diff --git a/test/mocks/datafilecollector-testharness/common/README.md b/test/mocks/datafilecollector-testharness/common/README.md
index 31f40ef10..f0e3eec79 100644
--- a/test/mocks/datafilecollector-testharness/common/README.md
+++ b/test/mocks/datafilecollector-testharness/common/README.md
@@ -52,14 +52,14 @@ Stop a SFTP container with the supplied instance id (0-5).
 **start_sftp <sftp-instance-id>**</br>
 Start a previously stopped SFTP container with the supplied instance id (0-5).
 
-**kill_ftps <ftps-instance-id>**</br>
-Stop and remove a FTPS container with the supplied instance id (0-5).
+**kill_ftpes <ftpes-instance-id>**</br>
+Stop and remove a FTPES container with the supplied instance id (0-5).
 
-**stop_ftps <ftps-instance-id>**</br>
-Stop a FTPS container with the supplied instance id (0-5).
+**stop_ftpes <ftpes-instance-id>**</br>
+Stop a FTPES container with the supplied instance id (0-5).
 
-**start_ftps <ftps-instance-id>**</br>
-Start a previously stopped FTPS container with the supplied instance id (0-5).
+**start_ftpes <ftpes-instance-id>**</br>
+Start a previously stopped FTPES container with the supplied instance id (0-5).
 
 **mr_print <vaiable-name>**</br>
 Print a variable value from the MR simulator.
diff --git a/test/mocks/datafilecollector-testharness/common/test_env.sh b/test/mocks/datafilecollector-testharness/common/test_env.sh
index 1a97ffc73..63c0f2ecf 100644
--- a/test/mocks/datafilecollector-testharness/common/test_env.sh
+++ b/test/mocks/datafilecollector-testharness/common/test_env.sh
@@ -34,24 +34,24 @@ DFC_APP_BASE="dfc_app"                 #Base name of the dfc containers. Instanc
 DFC_MAX_NUM=5                          #Max number of dfc containers to run in paralell in auto test
 DFC_MAX_IDX=$(($DFC_MAX_NUM - 1))      #Max index of the dfc containers
 SFTP_BASE="dfc_sftp-server"            #Base name of the dfc_sftp-server containers. Instance 0 will be named dfc_sftp-server0, instance 1 will named dfc_sftp-server1 etc
-FTPS_BASE="dfc_ftpes-server-vsftpd"    #Base name of the dfc_ftpes-server-vsftpd containers. Instance 0 will be named dfc_ftpes-server-vsftpd0, instance 1 will named dfc_ftpes-server-vsftpd1 etc
-FTP_MAX_NUM=5                          #Max number of sftp and ftps containers to run in paralell in auto test
-FTP_MAX_IDX=$(($FTP_MAX_NUM - 1))      #Max index of sftp and ftps containers
+FTPES_BASE="dfc_ftpes-server-vsftpd"    #Base name of the dfc_ftpes-server-vsftpd containers. Instance 0 will be named dfc_ftpes-server-vsftpd0, instance 1 will named dfc_ftpes-server-vsftpd1 etc
+FTP_MAX_NUM=5                          #Max number of sftp and ftpes containers to run in paralell in auto test
+FTP_MAX_IDX=$(($FTP_MAX_NUM - 1))      #Max index of sftp and ftpes containers
 
 #List of sftp server name and port number, used by MR sim to produce file urls. Theses server names and ports are used when running dfc and the simulators in a private docker network
 SFTP_SIMS_CONTAINER="sftp-server0:22,sftp-server1:22,sftp-server2:22,sftp-server3:22,sftp-server4:22"
 
 #List of sftp server name and port number, used by MR sim to produce file urls. Theses server names and ports are used when running dfc and the simulators in a private docker network
-FTPS_SIMS_CONTAINER="ftpes-server-vsftpd0:21,ftpes-server-vsftpd1:21,ftpes-server-vsftpd2:21,ftpes-server-vsftpd3:21,ftpes-server-vsftpd4:21"
+FTPES_SIMS_CONTAINER="ftpes-server-vsftpd0:21,ftpes-server-vsftpd1:21,ftpes-server-vsftpd2:21,ftpes-server-vsftpd3:21,ftpes-server-vsftpd4:21"
 
 #List of sftp server name and port number, used by MR sim to produce file urls. Theses server names and ports are used when running dfc as stand along app and the simulators in a private docker network
 SFTP_SIMS_LOCALHOST="localhost:1022,localhost:1023,localhost:1024,localhost:1025,localhost:1026"
 
-#List of ftps server name and port number, used by MR sim to produce file urls. Theses server names and ports are used when running dfc as stand along app and the simulators in a private docker network
-FTPS_SIMS_LOCALHOST="localhost:1032,localhost:1033,localhost:1034,localhost:1035,localhost:1036"
+#List of ftpes server name and port number, used by MR sim to produce file urls. Theses server names and ports are used when running dfc as stand along app and the simulators in a private docker network
+FTPES_SIMS_LOCALHOST="localhost:1032,localhost:1033,localhost:1034,localhost:1035,localhost:1036"
 
 export SFTP_SIMS=$SFTP_SIMS_CONTAINER   #This env will be set to SFTP_SIMS_LOCALHOST if auto test is executed with 'manual-app'
-export FTPS_SIMS=$FTPS_SIMS_CONTAINER   #This env will be set to FTPS_SIMS_LOCALHOST if auto test is executed with 'manual-app'
+export FTPES_SIMS=$FTPES_SIMS_CONTAINER   #This env will be set to FTPES_SIMS_LOCALHOST if auto test is executed with 'manual-app'
 
 #Host name of the DR redirect simulator
 export DR_REDIR_SIM="drsim_redir"       #This env will be set to 'localhost' if auto test is executed with arg 'manual-app'
diff --git a/test/mocks/datafilecollector-testharness/common/testcase_common.sh b/test/mocks/datafilecollector-testharness/common/testcase_common.sh
index a1e092157..d2072c141 100755
--- a/test/mocks/datafilecollector-testharness/common/testcase_common.sh
+++ b/test/mocks/datafilecollector-testharness/common/testcase_common.sh
@@ -151,15 +151,15 @@ fi
 
 echo ""
 
-echo "Building images for the simulators if needed, MR, DR, DR Redir and FTPS simulators"
+echo "Building images for the simulators if needed, MR, DR, DR Redir and FTPES simulators"
 curdir=$PWD
 cd $SIM_GROUP
 cd ../dr-sim
 docker build -t drsim_common:latest . &> /dev/null
 cd ../mr-sim
 docker build -t mrsim:latest . &> /dev/null
-cd ../ftps-sftp-server
-docker build -t ftps_vsftpd:latest -f Dockerfile-ftps . &> /dev/null
+cd ../ftpes-sftp-server
+docker build -t ftpes_vsftpd:latest -f Dockerfile-ftpes . &> /dev/null
 cd $curdir
 
 echo ""
@@ -169,7 +169,7 @@ echo "MR simulator        " $(docker images | grep mrsim)
 echo "DR simulator:       " $(docker images | grep drsim_common)
 echo "DR redir simulator: " $(docker images | grep drsim_common)
 echo "SFTP:               " $(docker images | grep atmoz/sftp)
-echo "FTPS:               " $(docker images | grep ftps_vsftpd)
+echo "FTPES:               " $(docker images | grep ftpes_vsftpd)
 echo "Consul:             " $(docker images | grep consul)
 echo "CBS:                " $(docker images | grep platform.configbinding.app)
 echo ""
@@ -178,12 +178,12 @@ echo ""
 #Configure DR sim with correct address for DR redirect simulator
 if [ $START_ARG == "manual-app" ]; then
 	export SFTP_SIMS=$SFTP_SIMS_LOCALHOST
-	export FTPS_SIMS=$FTPS_SIMS_LOCALHOST
+	export FTPES_SIMS=$FTPES_SIMS_LOCALHOST
 	export DR_REDIR_SIM="localhost"
 fi
 #else
 #	export SFTP_SIMS=$SFTP_SIMS_CONTAINER
-#	export FTPS_SIMS=$FTPS_SIMS_CONTAINER
+#	export FTPES_SIMS=$FTPES_SIMS_CONTAINER
 #	export DR_REDIR_SIM="drsim_redir"
 #fi
 
@@ -507,7 +507,7 @@ log_sim_settings() {
 	echo "FTP_FILE_PREFIXES=     "$FTP_FILE_PREFIXES
 	echo "NUM_FTP_SERVERS=       "$NUM_FTP_SERVERS
 	echo "SFTP_SIMS=             "$SFTP_SIMS
-	echo "FTPS_SIMS=             "$FTPS_SIMS
+	echo "FTPES_SIMS=             "$FTPES_SIMS
 	echo ""
 }
 
@@ -699,11 +699,11 @@ start_sftp() {
 	__docker_start $appname
 }
 
-# Stop and remove the FTPS container, arg: <ftps-instance-id>
-kill_ftps() {
+# Stop and remove the FTPES container, arg: <ftpes-instance-id>
+kill_ftpes() {
 
 	if [ $# != 1 ]; then
-    	__print_err "need one arg, <ftpS-instance-id>"
+    	__print_err "need one arg, <ftpes-instance-id>"
 		exit 1
 	fi
 
@@ -711,19 +711,19 @@ kill_ftps() {
 		__print_err "arg should be 0.."$FTP_MAX_IDX
 		exit 1
 	fi
-	appname=$FTPS_BASE$1
+	appname=$FTPES_BASE$1
 
-	echo "Killing FTPS, instance id: "$1
+	echo "Killing FTPES, instance id: "$1
 
 	__docker_stop $appname
 	__docker_rm $appname
 }
 
-# Stop FTPS container, arg: <ftps-instance-id>
-stop_ftps() {
+# Stop FTPES container, arg: <ftpes-instance-id>
+stop_ftpes() {
 
 	if [ $# != 1 ]; then
-    	__print_err "need one arg, <ftps-instance-id>"
+    	__print_err "need one arg, <ftpes-instance-id>"
 		exit 1
 	fi
 
@@ -731,18 +731,18 @@ stop_ftps() {
 		__print_err "arg should be 0.."$FTP_MAX_IDX
 		exit 1
 	fi
-	appname=$FTPS_BASE$1
+	appname=$FTPES_BASE$1
 
-	echo "Stopping FTPS, instance id: "$1
+	echo "Stopping FTPES, instance id: "$1
 
 	__docker_stop $appname
 }
 
-# Starts a stopped FTPS container, arg: <ftps-instance-id>
-start_ftps() {
+# Starts a stopped FTPES container, arg: <ftpes-instance-id>
+start_ftpes() {
 
 	if [ $# != 1 ]; then
-    	__print_err "need one arg, <ftps-instance-id>"
+    	__print_err "need one arg, <ftpes-instance-id>"
 		exit 1
 	fi
 
@@ -750,9 +750,9 @@ start_ftps() {
 		__print_err "arg should be 0.."$FTP_MAX_IDX
 		exit 1
 	fi
-	appname=$FTPS_BASE$1
+	appname=$FTPES_BASE$1
 
-	echo "Starting FTPS, instance id: "$1
+	echo "Starting FTPES, instance id: "$1
 
 	__docker_start $appname
 }
@@ -1128,7 +1128,7 @@ store_logs() {
 	for (( i=0; i<=$FTP_MAX_IDX; i++ )); do
 		appname=$SFTP_BASE$i
 		docker logs $appname > $TESTLOGS/$ATC/${1}_${appname}.log 2>&1
-		appname=$FTPS_BASE$i
+		appname=$FTPES_BASE$i
 		docker logs $appname > $TESTLOGS/$ATC/${1}_${appname}.log 2>&1
 	done