diff options
11 files changed, 190 insertions, 39 deletions
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh index bdee34ee..7736d4a7 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh @@ -52,11 +52,11 @@ docker build -t drsim_common:latest . cd $SIMGROUP_ROOT #Copy ftp config for the ftp servers -cp -r ../ftps-sftp-server/configuration . -cp -r ../ftps-sftp-server/tls . +cp -r ../ftpes-sftp-server/configuration . +cp -r ../ftpes-sftp-server/tls . -cd ../ftps-sftp-server -docker build -t ftps_vsftpd:latest -f Dockerfile-ftps . +cd ../ftpes-sftp-server +docker build -t ftpes_vsftpd:latest -f Dockerfile-ftpes . #All containers will be started and stopped via the robot tests. diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt b/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt index 30d7a2d7..052ab7c8 100755 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/testplan.txt @@ -1,3 +1,4 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite +dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json index 6abfb566..bd13327b 100644 --- a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json @@ -10,6 +10,7 @@ "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks", "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass", "dmaap.security.enableDmaapCertAuth": "false", + "sftp.security.strictHostKeyChecking": "true", "streams_publishes": { "PM_MEAS_FILES": { "type": "data_router", diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml index e2f16a7c..dff4824c 100644 --- a/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -110,6 +110,8 @@ services: tmp_bulk-pm-network: aliases: - dcaegen2-datafile-collector + environment: + KNOWN_HOSTS_FILE_PATH: "/home/datafile/.ssh/known_hosts" cbs-sim: container_name: config-binding-service-sim diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/setup.sh b/plans/usecases-5G-bulkpm/5G-bulkpm/setup.sh index 1f5f26df..8cb3d9f8 100644 --- a/plans/usecases-5G-bulkpm/5G-bulkpm/setup.sh +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/setup.sh @@ -78,6 +78,11 @@ DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dmaap-message-router-server) VESC_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' dcaegen2-vescollector) +#Add SFTP server pubilc key to known hosts of datafile collector +HOST_NAMES=$(docker inspect -f '{{ range .NetworkSettings.Networks}}{{join .Aliases ","}}{{end}}' sftp) +KEY_ENTRY=$(echo $HOST_NAMES "$(docker exec sftp cat /etc/ssh/ssh_host_rsa_key.pub)" | sed -e 's/\w*@\w*$//') +docker exec -i -u root dcaegen2-datafile-collector sh -c "echo $KEY_ENTRY >> /home/datafile/.ssh/known_hosts" + # Add gateway IP to DR Prov docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP" docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP" @@ -116,4 +121,4 @@ export VESC_PORT=8080 export DMAAP_MR_IP=${DMAAP_MR_IP} #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v VESC_IP:${VESC_IP} -v VESC_PORT:${VESC_PORT}"
\ No newline at end of file +ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v VESC_IP:${VESC_IP} -v VESC_PORT:${VESC_PORT}" diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh index 808b0b17..38b78f2d 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh @@ -1,12 +1,30 @@ #!/bin/bash +#function to load sftp servers keys to dfc app depending on KNOWN_HOSTS environment variable +# when KNOWN_HOSTS == "all_hosts_keys" or is not set, public keys of all sftp servers are loaded +# when KNOWN_HOSTS == "known_hosts_empty", empty known hosts file is created +# for other strings known hosts file is not created +function load-sftp-servers-keys() { + if [ -z "$KNOWN_HOSTS" ] || [ "$KNOWN_HOSTS" == "all_hosts_keys" ]; then + SFTP_SERVERS="$(docker ps -q --filter='name=dfc_sftp')" + + for SFTP_SERVER in $SFTP_SERVERS; do + HOST_NAMES=$(docker inspect -f '{{ join .NetworkSettings.Networks.dfcnet.Aliases ","}}' $SFTP_SERVER) + KEY_ENTRY=$(echo $HOST_NAMES "$(docker exec $SFTP_SERVER cat /etc/ssh/ssh_host_rsa_key.pub)" | + sed -e 's/\w*@\w*$//') + docker exec -u root dfc_app0 sh -c "echo $KEY_ENTRY >> /home/datafile/.ssh/known_hosts" + done + elif [ "$KNOWN_HOSTS" == "known_hosts_empty" ]; then + docker exec -u root dfc_app0 sh -c "touch /home/datafile/.ssh/known_hosts" + fi +} + set -x #Start DFC app - DOCKER_SIM_NWNAME="dfcnet" echo "Creating docker network $DOCKER_SIM_NWNAME, if needed" -docker network ls| grep $DOCKER_SIM_NWNAME > /dev/null || docker network create $DOCKER_SIM_NWNAME +docker network ls | grep $DOCKER_SIM_NWNAME >/dev/null || docker network create $DOCKER_SIM_NWNAME docker-compose up -d @@ -14,21 +32,23 @@ DFC_APP="$(docker ps -q --filter='name=dfc_app0')" #Wait for initialization of docker containers for dfc app and all simulators for i in {1..10}; do - if [ $(docker inspect --format '{{ .State.Running }}' $DFC_APP) ] - then - echo "DFC app Running" - # enable TRACE logging of DFC - docker exec $DFC_APP /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml" - - #enable TRACE logging of spring-framework - docker exec $DFC_APP /bin/sh -c " sed -i 's/org.springframework.data: ERROR/org.springframework.data: TRACE/g' /opt/app/datafile/config/application.yaml" - - docker restart $DFC_APP - sleep 10 - - break - else - echo sleep $i - sleep $i + if [ $(docker inspect --format '{{ .State.Running }}' $DFC_APP) ]; then + echo "DFC app Running" + + load-sftp-servers-keys + + # enable TRACE logging of DFC + docker exec $DFC_APP /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml" + + #enable TRACE logging of spring-framework + docker exec $DFC_APP /bin/sh -c " sed -i 's/org.springframework.data: ERROR/org.springframework.data: TRACE/g' /opt/app/datafile/config/application.yaml" + + docker restart $DFC_APP + sleep 10 + + break + else + echo sleep $i + sleep $i fi done diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml index 02e0eb6d..f92d19f6 100644 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml @@ -22,3 +22,4 @@ services: CONSUL_PORT: 8500 CONFIG_BINDING_SERVICE: "config-binding-service" HOSTNAME: "dfc_app0" + KNOWN_HOSTS_FILE_PATH: "/home/datafile/.ssh/known_hosts" diff --git a/tests/dcaegen2-collectors-datafile/resources/common-keywords.robot b/tests/dcaegen2-collectors-datafile/resources/common-keywords.robot index a36833e1..c425fe2a 100644 --- a/tests/dcaegen2-collectors-datafile/resources/common-keywords.robot +++ b/tests/dcaegen2-collectors-datafile/resources/common-keywords.robot @@ -44,3 +44,13 @@ Start DFC ${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-start.sh cwd=${DFC_ROOT} env:SIMGROUP_ROOT=${SIMGROUP_ROOT} Log To Console Dfc-start: Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + + +Test Teardown + [Documentation] Cleanup containers + ${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 ${DFC_ROOT}/../dfc-containers-clean.sh stderr=STDOUT + Log To Console Dfc containter clean: ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} 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 5b9048ff..8213c702 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 @@ -33,27 +33,26 @@ Verify single event with single 50MB SFTP file. From event poll to published fil Verify Single Event From Event Poll To Published File 50 --tc102 SFTP -######## Single file, FTPS -Verify single event with single 1MB FTPS file. From event poll to published file +######## Single file, FTPES +Verify single event with single 1MB FTPES file. From event poll to published file [TAGS] DFC_FUNCTIONAL_10 - [Documentation] Verify single event with single FTPS 1MB file from event poll to published file. - Verify Single Event From Event Poll To Published File 1 --tc200 FTPS + [Documentation] Verify single event with single FTPES 1MB file from event poll to published file. + Verify Single Event From Event Poll To Published File 1 --tc200 FTPES -Verify single event with single 1MB FTPS file. From event poll to published file +Verify single event with single 5MB FTPES file. From event poll to published file [TAGS] DFC_FUNCTIONAL_11 - [Documentation] Verify single event with single FTPS 5MB file from event poll to published file. - Verify Single Event From Event Poll To Published File 5 --tc201 FTPS + [Documentation] Verify single event with single FTPES 5MB file from event poll to published file. + Verify Single Event From Event Poll To Published File 5 --tc201 FTPES -Verify single event with single 1MB FTPS file. From event poll to published file +Verify single event with single 50MB FTEPS file. From event poll to published file [TAGS] DFC_FUNCTIONAL_12 - [Documentation] Verify single event with single FTPS 50MB file from event poll to published file. - Verify Single Event From Event Poll To Published File 50 --tc202 FTPS + [Documentation] Verify single event with single FTPES 50MB file from event poll to published file. + Verify Single Event From Event Poll To Published File 50 --tc202 FTPES *** Keywords *** Verify Single Event From Event Poll To Published File [Documentation] Keyword to verify single event with file with given parameters. [Arguments] ${file_size_in_mb} ${mr_tc} ${ftp_type} - ${cli_cmd_output}= Run Process ${DFC_ROOT}/../dfc-containers-clean.sh Set Environment Variable MR_TC ${mr_tc} Set Environment Variable FILE_SIZE ${file_size_in_mb}MB Set Environment Variable FTP_TYPE ${ftp_type} @@ -85,10 +84,8 @@ Verify Single Event From Event Poll To Published File Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Query Not Published Equal 1 #Verify 1 query response for not published files 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 ${file_size_in_mb} 000 000 #Verify correct number of bytes published file data in DR redir sim - ${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} + + [Teardown] Test Teardown Set Default Environment Variables [Documentation] Set default environment variables for simulators setup @@ -104,4 +101,4 @@ Set Default Environment Variables Set Environment Variable DR_FEEDS 2:A 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 + Set Environment Variable FTPES_SIMS ftpes-server-vsftpd0:21 diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot new file mode 100755 index 00000000..3962d4e5 --- /dev/null +++ b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/StrictHostChecking.robot @@ -0,0 +1,112 @@ +*** Settings *** +Library OperatingSystem +Library RequestsLibrary +Library Process + +Resource ../../resources/common-keywords.robot + +Test Teardown + +*** Variables *** +${CONSUL_UPL_APP} /usr/bin/curl -v http://127.0.0.1:8500/v1/kv/dfc_app0?dc=dc1 -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data-binary @${SIMGROUP_ROOT}/consul/c12_feed2_PM_MEAS.json +${CONSUL_UPL_APP_INSECURE_SFTP} /usr/bin/curl -v http://127.0.0.1:8500/v1/kv/dfc_app0?dc=dc1 -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data-binary @${SIMGROUP_ROOT}/consul/c12_feed2_PM_MEAS_no_strict_host_key_checking.json +${CONSUL_GET_APP} /usr/bin/curl -v http://127.0.0.1:8500/v1/kv/dfc_app0?raw +${CBS_GET_MERGED_CONFIG} /usr/bin/curl -v http://127.0.0.1:10000/service_component_all/dfc_app0 + +*** Test Cases *** + +######### Single file, SFTP, various SFTP Strict host key checking settings + +Verify single event with SFTP file, when host known and strict host key checking enabled. From event poll to published file + [TAGS] DFC_STRICT_HOST_KEY_CHECKING_1 + [Documentation] Verify single event with SFTP file, when host known and strict host key checking enabled. From event poll to published file. + [Setup] Setup Strict Host Key Checking Test ${CONSUL_UPL_APP} all_hosts_keys + + Wait Until Keyword Succeeds 1 minute 10 sec MR Sim Emitted Files Equal 1 #Verify 1 file emitted from MR sim + Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Query Not Published Equal 1 #Verify 1 query response for not published files + 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 + + [Teardown] Test Teardown + +Verify single event with SFTP file, when host unknown and strict host key checking disabled. From event poll to published file + [TAGS] DFC_STRICT_HOST_KEY_CHECKING_2 + [Documentation] Verify single event with SFTP file, when host unknown and strict host key checking disabled. From event poll to published file. + [Setup] Setup Strict Host Key Checking Test ${CONSUL_UPL_APP_INSECURE_SFTP} known_hosts_empty + + Wait Until Keyword Succeeds 1 minute 10 sec MR Sim Emitted Files Equal 1 #Verify 1 file emitted from MR sim + Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Query Not Published Equal 1 #Verify 1 query response for not published files + 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 + + [Teardown] Test Teardown + +Verify single event with SFTP file, when no known hosts file and strict host key checking enabled. From event poll to published file + [TAGS] DFC_STRICT_HOST_KEY_CHECKING_3 + [Documentation] Verify single event with SFTP file, when host unknown and strict host key checking enabled. File not published. + [Setup] Setup Strict Host Key Checking Test ${CONSUL_UPL_APP} no_known_hosts_file + + Wait Until Keyword Succeeds 1 minute 10 sec MR Sim Emitted Files Equal 1 #Verify 1 file emitted from MR sim + Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Query Not Published Equal 1 #Verify 1 query response for not published files + 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 + + [Teardown] Test Teardown + + + +Verify single event with SFTP file, when host unknown and strict host key checking enabled. File not published + [TAGS] DFC_STRICT_HOST_KEY_CHECKING_4 + [Documentation] Verify single event with SFTP file, when host unknown and strict host key checking enabled. File not published. + [Setup] Setup Strict Host Key Checking Test ${CONSUL_UPL_APP} known_hosts_empty + Wait Until Keyword Succeeds 1 minute 10 sec MR Sim Emitted Files Equal 1 #Verify 1 file emitted from MR sim + Wait Until Keyword Succeeds 1 minute 10 sec DR Sim Query Not Published Equal 1 #Verify 1 query response for not published files + Sleep 60 + DR Sim Published Files Equal 0 #Verify no file was published to DR sim + [Teardown] Test Teardown + +*** Keywords *** + +Setup Strict Host Key Checking Test + [Documentation] Sets up strict host key checking test with single 1MB file + [Arguments] ${consul_config_request} ${known_hosts_file} + Set Environment Variable MR_TC --tc100 + Set Environment Variable DR_TC --tc normal + Set Environment Variable DR_REDIR_TC --tc normal + Set Environment Variable MR_GROUPS OpenDcae-c12:PM_MEAS_FILES + Set Environment Variable MR_FILE_PREFIX_MAPPING PM_MEAS_FILES:A + Set Environment Variable DR_REDIR_FEEDS 2:A + Set Environment Variable FTP_FILE_PREFIXES A + Set Environment Variable NUM_FTPFILES 1 + Set Environment Variable NUM_PNFS 1 + Set Environment Variable FILE_SIZE 1MB + Set Environment Variable FTP_TYPE SFTP + Set Environment Variable NUM_FTP_SERVERS 1 + Set Environment Variable DR_FEEDS 2:A + 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 + + ${cli_cmd_output}= Run Process ./simulators-start.sh cwd=${SIMGROUP_ROOT} + Log To Console Simulator-start: + Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + MR Sim Emitted Files Equal 0 #Verify 0 file emitted from MR sim + DR Sim Published Files Equal 0 #Verify 0 file published to DR sim + + ${cli_cmd_output}= Run Process ${consul_config_request} shell=yes + Log To Console Consul APP write: + Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + + ${cli_cmd_output}= Run Process ${CONSUL_GET_APP} shell=yes + Log To Console Consul APP read: + Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + + ${cli_cmd_output}= Run Process ${CBS_GET_MERGED_CONFIG} shell=yes + Log To Console CBS merged configuration: + Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} + + Sleep 10 + + ${cli_cmd_output}= Run Process ${DFC_ROOT}/dfc-start.sh cwd=${DFC_ROOT} env:KNOWN_HOSTS=${known_hosts_file} + Log To Console Dfc-start: + Log To Console ${cli_cmd_output.stdout} ${cli_cmd_output.stderr} diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/__init__.robot b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/__init__.robot new file mode 100755 index 00000000..77743849 --- /dev/null +++ b/tests/dcaegen2-collectors-datafile/testsuites/Strict-Host-Checking-suite/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation DFC Strict Host Checking test suite. Single event with single file. |