Update dfc env variables
Change-Id: Icc0620d18dc6b4e80ba8b17ca2b85444eedfe0e8
Issue-ID: DCAEGEN2-1702
Signed-off-by: Martin Yan <martin.c.yan@est.tech>
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
index 0dc2af1..2c46439 100644
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-running_containers=$(docker ps --filter name=dfc_ -q)
-
+running_containers=$(docker ps --filter name=dfc_ -qa)
+running_images=$(docker images -q)
if [ -z "$running_containers" ]
then
@@ -10,5 +10,6 @@
echo "Stopping and removing containers"
docker stop $running_containers
docker rm $running_containers
+ docker rmi $running_images
fi
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 0763583..af7b6f1 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
@@ -88,7 +88,7 @@
Set Environment Variable FTP_TYPE SFTP
Set Environment Variable NUM_FTP_SERVERS 1
Set Environment Variable DR_FEEDS 2:A
- Set Environment Variable DRR_SIM_IP drsim_redir
+ 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
@@ -150,7 +150,7 @@
Set Environment Variable FTP_TYPE SFTP
Set Environment Variable NUM_FTP_SERVERS 1
Set Environment Variable DR_FEEDS 2:A
- Set Environment Variable DRR_SIM_IP drsim_redir
+ 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