CSIT uplift for CBS, generalized DFC, bugfixes, stability, traceability
Issue-ID: DCAEGEN2-1719
Change-Id: If5c96a7f205a34f78e50585a7187c5b9a3820023
Signed-off-by: TamasBakai <tamas.bakai@est.tech>
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
index 1a0ec6e..0dc2af1 100644
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
@@ -1,13 +1,14 @@
#!/usr/bin/env bash
-#Stop dfc
+running_containers=$(docker ps --filter name=dfc_ -q)
-kill-instance.sh dfc_app
-#Stop all simulators
+if [ -z "$running_containers" ]
+then
+ echo "No container requires termination"
+else
+ echo "Stopping and removing containers"
+ docker stop $running_containers
+ docker rm $running_containers
+fi
-kill-instance.sh dfc_dr-sim
-kill-instance.sh dfc_dr-redir-sim
-kill-instance.sh dfc_mr-sim
-kill-instance.sh dfc_sftp-server
-kill-instance.sh dfc_ftpes-server-vsftpd
\ No newline at end of file