From 1493f1d215984d960e80c37cb1e68a82b5020ec0 Mon Sep 17 00:00:00 2001 From: krishnaa96 Date: Tue, 22 Sep 2020 11:49:58 +0530 Subject: Modify healthcheck for OOF-OSDF Change Health check name to OSDF from SNIRO Remove headers while sending get request Issue-ID: OPTFRA-851 Signed-off-by: krishnaa96 Change-Id: Idb420076fe6f4e097be3c56078b282d14668c78b --- robot/resources/oof_interface.robot | 22 ++++++++++++++++------ robot/testsuites/health-check.robot | 4 ++-- 2 files changed, 18 insertions(+), 8 deletions(-) (limited to 'robot') diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot index aadd6a62..ec67a267 100644 --- a/robot/resources/oof_interface.robot +++ b/robot/resources/oof_interface.robot @@ -1,5 +1,5 @@ *** Settings *** -Documentation The main interface for interacting with OOF: SNIRO and Homing Service +Documentation The main interface for interacting with OOF: OSDF and Homing Service Library RequestsLibrary Library ONAPLibrary.Utilities Library OperatingSystem @@ -13,7 +13,7 @@ Resource global_properties.robot *** Variables *** ${OOF_HOMING_HEALTH_CHECK_PATH} /v1/plans/healthcheck -${OOF_SNIRO_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck +${OOF_OSDF_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck ${OOF_CMSO_HEALTH_CHECK_PATH} /cmso/v1/health?checkInterfaces=true ${OOF_CMSO_TEMPLATE_FOLDER} cmso @@ -22,7 +22,7 @@ ${OOF_HOMING_PLAN_FOLDER} robot/assets/oof/optf-has ${OOF_OSDF_TEMPLATE_FOLDER} robot/assets/oof/optf-osdf ${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} -${OOF_SNIRO_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT} +${OOF_OSDF_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT} ${OOF_CMSO_ENDPOINT} ${GLOBAL_OOF_CMSO_PROTOCOL}://${GLOBAL_INJECTED_OOF_CMSO_IP_ADDR}:${GLOBAL_OOF_CMSO_SERVER_PORT} ${OOF_OSDF_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} @@ -59,9 +59,19 @@ RUN OOF-Homing SendPlanWithWrongVersion Should Be Equal As Integers ${resp.status_code} 201 Sleep 10s Wait Plan Resolution -Run OOF-SNIRO Health Check - [Documentation] Runs OOF-SNIRO Health check - ${resp}= OOF.Run SNIRO Get Request ${OOF_SNIRO_ENDPOINT} ${OOF_SNIRO_HEALTH_CHECK_PATH} +Run OOF-OSDF Health Check + [Documentation] Runs OOF-OSDF Health check + ${resp}= Run OOF-OSDF Get Request ${OOF_OSDF_HEALTH_CHECK_PATH} + Should Be Equal As Integers ${resp.status_code} 200 + +Run OOF-OSDF Get Request + [Documentation] Runs OOF-OSDF Get request + [Arguments] ${data_path} + ${session}= Create Session session ${OOF_OSDF_ENDPOINT} + ${resp}= Get Request session ${data_path} + Should Be Equal As Integers ${resp.status_code} 200 + Log Received response from OOF-OSDF ${resp.text} + [Return] ${resp} Run OOF-CMSO Health Check [Documentation] Runs OOF-CMSO Health check diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index 9e9e8394..5624b841 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -129,9 +129,9 @@ Basic OOF-Homing Health Check [Tags] health medium health-oof Run OOF-Homing Health Check -Basic OOF-SNIRO Health Check +Basic OOF-OSDF Health Check [Tags] health medium health-oof - Run OOF-SNIRO Health Check + Run OOF-OSDF Health Check Basic OOF-CMSO Health Check [Tags] health medium health-oof -- cgit 1.2.3-korg