diff options
| -rw-r--r-- | robot/resources/dcae_interface.robot | 31 | ||||
| -rw-r--r-- | robot/resources/music/music_interface.robot | 4 |
2 files changed, 6 insertions, 29 deletions
diff --git a/robot/resources/dcae_interface.robot b/robot/resources/dcae_interface.robot index fafa57ab..ce0e4ac9 100644 --- a/robot/resources/dcae_interface.robot +++ b/robot/resources/dcae_interface.robot @@ -8,39 +8,16 @@ Resource global_properties.robot *** Variables *** ${DCAE_HEALTH_CHECK_PATH} /healthcheck -${DCAE_ENDPOINT} ${GLOBAL_DCAE_SERVER_PROTOCOL}://${GLOBAL_INJECTED_DCAE_IP_ADDR}:${GLOBAL_DCAE_SERVER_PORT} +${DCAE_HEALTH_ENDPOINT} ${GLOBAL_DCAE_SERVER_PROTOCOL}://${GLOBAL_INJECTED_DCAE_IP_ADDR}:${GLOBAL_DCAE_HEALTH_SERVER_PORT} *** Keywords *** Run DCAE Health Check [Documentation] Runs a DCAE health check ${auth}= Create List ${GLOBAL_DCAE_USERNAME} ${GLOBAL_DCAE_PASSWORD} - Log Creating session ${DCAE_ENDPOINT} - ${session}= Create Session dcae ${DCAE_ENDPOINT} auth=${auth} + Log Creating session ${DCAE_HEALTH_ENDPOINT} + ${session}= Create Session dcae ${DCAE_HEALTH_ENDPOINT} auth=${auth} ${uuid}= Generate UUID ${headers}= Create Dictionary X-ECOMP-Client-Version=ONAP-R2 action=getTable Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Get Request dcae ${DCAE_HEALTH_CHECK_PATH} headers=${headers} Log Received response from dcae ${resp.json()} - Should Be Equal As Strings ${resp.status_code} 200 - Check DCAE Results ${resp.json()} - -Check DCAE Results - [Documentation] Parse DCAE JSON response and make sure all rows have healthTestStatus=GREEN (except for the exceptions ;-) - [Arguments] ${json} - # ${service_names} to contain only the names of services that are passing - ${service_names}= Evaluate map( lambda s: s['ServiceName'], filter(lambda s: s['Status'] == 'passing', ${json} )) - Should Contain Match ${service_names} cdap - Should Contain Match ${service_names} cdap_broker - Should Contain Match ${service_names} config_binding_service - Should Contain Match ${service_names} deployment_handler - Should Contain Match ${service_names} inventory - Should Contain Match ${service_names} service-change-handler - # Should Contain Match ${service_names} policy_handler - Should Contain Match ${service_names} platform_dockerhost - Should Contain Match ${service_names} component_dockerhost - Should Contain Match ${service_names} cloudify_manager - Should Contain Match ${service_names} regexp=.*dcaegen2-collectors-ves - Should Contain Match ${service_names} regexp=.*cdap_app_cdap_app_tca - Should Contain Match ${service_names} regexp=.*dcae-analytics-holmes-rule-management - Should Contain Match ${service_names} regexp=.*dcae-analytics-holmes-engine-management - [Return] ${service_names} - + Should Be Equal As Strings ${resp.status_code} 200
\ No newline at end of file diff --git a/robot/resources/music/music_interface.robot b/robot/resources/music/music_interface.robot index cde2d3db..456e119b 100644 --- a/robot/resources/music/music_interface.robot +++ b/robot/resources/music/music_interface.robot @@ -7,7 +7,7 @@ Library UUID Resource ../global_properties.robot *** Variables *** -${MUSIC_HEALTH_CHECK_PATH} /MUSIC/rest/version +${MUSIC_HEALTH_CHECK_PATH} /MUSIC/rest/v2/version ${MUSIC_ENDPOINT} ${GLOBAL_MUSIC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MUSIC_IP_ADDR}:${GLOBAL_MUSIC_SERVER_PORT} *** Keywords *** @@ -25,4 +25,4 @@ Run MUSIC Get Request ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Get Request music ${data_path} headers=${headers} Log Received response from music ${resp.text} - [Return] ${resp}
\ No newline at end of file + [Return] ${resp} |