Add dfc log to console
Change-Id: I9d382dedf25448c2e138bab14443addde27caa47
Signed-off-by: yanhuanwang <martin.c.yan@est.tech>
Issue-ID: DCAEGEN2-1702
diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh
index 491b640..db44644 100755
--- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh
+++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh
@@ -1,4 +1,4 @@
#!/bin/bash
-
+docker exec -it dfc_app0 cat /var/log/ONAP/application.log
docker kill dfc_app0
\ No newline at end of file
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 595b37f..3f8be17 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
@@ -65,10 +65,10 @@
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 1 000 000 #Verify 1 000 000 bytes published file data in DR redir sim
- #${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
- #${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+ ${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}
Verify single event with single 5MB SFTP file. From event poll to published file
[TAGS] DFC_FUNCTIONAL_2
@@ -120,16 +120,16 @@
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 5 000 000 #Verify 5 000 000 bytes published file data in DR redir sim
- #${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
- #${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
-#
- #${cli_cmd_output}= Run Process docker stop $(docker ps -aq) shell=yes
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
-#
- #${cli_cmd_output}= Run Process docker rm $(docker ps -aq) shell=yes
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+ ${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}
+
+ ${cli_cmd_output}= Run Process docker stop $(docker ps -aq) shell=yes
+ Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+
+ ${cli_cmd_output}= Run Process docker rm $(docker ps -aq) shell=yes
+ Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
Sleep 10
@@ -182,10 +182,10 @@
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 50 000 000 #Verify 50 000 000 bytes published file data in DR redir sim
- #${cli_cmd_output}= Run Process ${SIMGROUP_ROOT}/simulators-kill.sh
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
- #${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-kill.sh
- #Log ${cli_cmd_output.stdout} ${cli_cmd_output.stderr}
+ ${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}
######### Single file, FTPS
# Temporarily removed due to issues with the certificates for the ftsp server simulator cert.