diff options
| author |   Daniel Rose <dr695h@att.com> | 2019-09-16 15:51:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-16 15:51:21 +0000 |
| commit | fd2c98390a1185c9706e7ac9de9611972b0b11fc (patch) | |
| tree | 871ff659d1b19dc00be08942fa2fbf4db25b6f49 | |
| parent | 327191ff7bb6918b63089a1e7e7a6e9f7b0e4a7e (diff) | |
| parent | 46c195e341fa9f27afb63cca9826f9bf98282aa0 (diff) | |
Merge "Add dfc log to console"
| -rwxr-xr-x | scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh | 2 | ||||
| -rwxr-xr-x | tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh index 491b6405..db446443 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 595b37f0..3f8be179 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 @@ Verify single event with single 1MB SFTP file. From event poll to published file 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 @@ Verify single event with single 5MB SFTP file. From event poll to published file 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 @@ Verify single event with single 50MB SFTP file. From event poll to published fil 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. |