Updates to DFC CSIT test

Adaptation of Functional tests due to updated dfc simulators
Adaptation of Management tests due to changes in DFC app
Removed test for FTPS due to issue with ftps sim cert

Issue-ID: DCAEGEN2-1434

Change-Id: Ic92ac4901586cb55164177a8640ba23b60c02f0d
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>

2 files changed, 12 insertions, 1 deletions

diff --git a/scripts/dcaegen2-collectors-datafile/dfc-containers-clean.sh b/scripts/dcaegen2-collectors-datafile/dfc-containers-clean.sh
new file mode 100755
index 00000000..03919343
--- /dev/null
+++ b/scripts/dcaegen2-collectors-datafile/dfc-containers-clean.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Kill dfc and all simulator
+
+docker kill dfc_app
+docker kill dfc_dr-sim
+docker kill dfc_dr-redir-sim
+docker kill dfc_mr-sim
+docker kill dfc_sftp-server
+docker kill dfc_ftpes-server-vsftpd
+
diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh
index ebc28f49..8478bcb0 100755
--- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh
+++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh
@@ -7,7 +7,7 @@ docker restart dfc_app
 DFC_APP="$(docker ps -q --filter='name=dfc_app')"
 
 
-#Wait for initialization of docker containers for dfc app and all simulators
+#Wait for initialization of docker container for dfc app
 for i in {1..10}; do
 if [ $(docker inspect --format '{{ .State.Running }}' $DFC_APP) ]
  then