From 5a92334c36554cc4a3dce1cdac6c79ce49e20de4 Mon Sep 17 00:00:00 2001 From: DR695H Date: Mon, 16 Apr 2018 14:43:06 -0400 Subject: updating the dcae healthcheck dcae healthcheck not has new port so updating the properites Change-Id: Ie241c594f46cbb62d4f4d6592fa64c35ada94dc8 Issue-ID: TEST-87 Signed-off-by: DR695H --- robot/resources/dcae_interface.robot | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 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 -- cgit 1.2.3-korg