From 3d6a7d967721c86ed76e94c112661b8c4fc413c7 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Thu, 2 Mar 2023 10:01:27 +0100 Subject: [HEALTHCHECK] Disable MSB call in Holmes test and fix VFC Use component interfaces instead of MSB and correct problems in VFC setup Issue-ID: TEST-392 Signed-off-by: Andreas Geissler Change-Id: I4ae47c81e6f811a4904549f0118b405f780d158a --- robot/resources/holmes_interface.robot | 12 +++++++----- robot/resources/vfc_interface.robot | 16 ++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'robot') diff --git a/robot/resources/holmes_interface.robot b/robot/resources/holmes_interface.robot index 6d30aa04..73dec481 100644 --- a/robot/resources/holmes_interface.robot +++ b/robot/resources/holmes_interface.robot @@ -3,25 +3,27 @@ Library RequestsLibrary Resource global_properties.robot *** Variables *** -${MSB_ENDPOINT} ${GLOBAL_MSB_SERVER_PROTOCOL}://${GLOBAL_INJECTED_MSB_IP_ADDR}:${GLOBAL_MSB_SERVER_PORT} ${HOLMES_RULE_HEALTH_CHECK} /api/holmes-rule-mgmt/v1/healthcheck ${HOLMES_ENGINE_HEALTH_CHECK} /api/holmes-engine-mgmt/v1/healthcheck +${HOLMES_RULE_ENDPOINT} ${GLOBAL_HOLMES_RULE_SERVER_PROTOCOL}://${GLOBAL_INJECTED_HOLMES_RULE_IP_ADDR}:${GLOBAL_HOLMES_RULE_SERVER_PORT} +${HOLMES_ENGINE_ENDPOINT} ${GLOBAL_HOLMES_ENGINE_SERVER_PROTOCOL}://${GLOBAL_INJECTED_HOLMES_ENGINE_IP_ADDR}:${GLOBAL_HOLMES_ENGINE_SERVER_PORT} + *** Keywords *** Run Holmes Rule Mgmt Healthcheck [Documentation] Run Holmes Rule Management Health Check - ${resp}= Run Holmes Get Request ${HOLMES_RULE_HEALTH_CHECK} + ${resp}= Run Holmes Get Request ${HOLMES_RULE_ENDPOINT} ${HOLMES_RULE_HEALTH_CHECK} Should Be Equal As Integers ${resp.status_code} 200 Run Holmes Engine Mgmt Healthcheck [Documentation] Run Holmes Engine Management Health Check - ${resp}= Run Holmes Get Request ${HOLMES_ENGINE_HEALTH_CHECK} + ${resp}= Run Holmes Get Request ${HOLMES_ENGINE_ENDPOINT} ${HOLMES_ENGINE_HEALTH_CHECK} Should Be Equal As Integers ${resp.status_code} 200 Run Holmes Get Request - [Arguments] ${data_path} + [Arguments] ${endpoint} ${data_path} [Documentation] Runs Holmes Get request - ${session}= Create Session holmes ${MSB_ENDPOINT} + ${session}= Create Session holmes ${endpoint} ${resp}= Get Request holmes ${data_path} Should Be Equal As Integers ${resp.status_code} 200 Log Received response from server ${resp.text} diff --git a/robot/resources/vfc_interface.robot b/robot/resources/vfc_interface.robot index c7b6ebb0..35c6a6d5 100644 --- a/robot/resources/vfc_interface.robot +++ b/robot/resources/vfc_interface.robot @@ -25,42 +25,42 @@ ${VFC_ZTEVNFDRIVER_ENDPOINT} ${GLOBAL_VFC_ZTEVNFDRIVER_SERVER_PROTOCOL}://${ *** Keywords *** Run VFC gvnfmdriver Health Check [Documentation] Runs VFC gvnfmdriver Health check - ${resp}= Run VFC Get Request ${VFC_GVNFMDRIVER_ENDPOINT} ${VFC_GVNFMDRIVER_HEALTH_CHECK_PATH} + ${resp}= Run VFC Get Request ${VFC_GVNFMDRIVER_ENDPOINT} ${VFC_GVNFMDRIVER_HEALTH_CHECK_PATH} Should Be Equal As Integers ${resp.status_code} 200 Run VFC huaweivnfmdriver Health Check [Documentation] Runs VFC huaweivnfmdriver Health check - ${resp}= Run VFC Get Request ${VFC_HUAWEIVNFMDRIVER_ENDPOINT} ${VFC_HUAWEIVNFMDRIVER_HEALTH_CHECK_PATH} + ${resp}= Run VFC Get Request ${VFC_HUAWEIVNFMDRIVER_ENDPOINT} ${VFC_HUAWEIVNFMDRIVER_HEALTH_CHECK_PATH} Should Be Equal As Integers ${resp.status_code} 200 Run VFC nslcm Health Check [Documentation] Runs VFC nslcm Health check - ${resp}= Run VFC Get Request ${VFC_NSLCM_ENDPOINT} ${VFC_NSLCM_HEALTH_CHECK_PATH} + ${resp}= Run VFC Get Request ${VFC_NSLCM_ENDPOINT} ${VFC_NSLCM_HEALTH_CHECK_PATH} Should Be Equal As Integers ${resp.status_code} 200 Run VFC vnflcm Health Check [Documentation] Runs VFC vnflcm Health check - ${resp}= Run VFC Get Request ${VFC_VNFLCM_ENDPOINT} ${VFC_VNFLCM_HEALTH_CHECK_PATH} + ${resp}= Run VFC Get Request ${VFC_VNFLCM_ENDPOINT} ${VFC_VNFLCM_HEALTH_CHECK_PATH} Should Be Equal As Integers ${resp.status_code} 200 Run VFC vnfmgr Health Check [Documentation] Runs VFC vnfmgr Health check - ${resp}= Run VFC Get Request ${VFC_VNFMGR_ENDPOINT} ${VFC_VNFMGR_HEALTH_CHECK_PATH} + ${resp}= Run VFC Get Request ${VFC_VNFMGR_ENDPOINT} ${VFC_VNFMGR_HEALTH_CHECK_PATH} Should Be Equal As Integers ${resp.status_code} 200 Run VFC vnfres Health Check [Documentation] Runs VFC vnfres Health check - ${resp}= Run VFC Get Request ${VFC_VNFRES_ENDPOINT} ${VFC_VNFRES_HEALTH_CHECK_PATH} + ${resp}= Run VFC Get Request ${VFC_VNFRES_ENDPOINT} ${VFC_VNFRES_HEALTH_CHECK_PATH} Should Be Equal As Integers ${resp.status_code} 200 Run VFC ztevnfmdriver Health Check [Documentation] Runs VFC ztevnfmdriver Health check - ${resp}= Run VFC Get Request ${VFC_ZTEVNFDRIVER_ENDPOINT} ${VFC_ZTEVNFDRIVER_HEALTH_CHECK_PATH} + ${resp}= Run VFC Get Request ${VFC_ZTEVNFDRIVER_ENDPOINT} ${VFC_ZTEVNFDRIVER_HEALTH_CHECK_PATH} Should Be Equal As Integers ${resp.status_code} 200 Run VFC Get Request [Documentation] Runs VFC Get request - [Arguments] ${endpoint} ${data_path} + [Arguments] ${endpoint} ${data_path} ${session}= Create Session session ${endpoint} ${resp}= Get Request session ${data_path} Should Be Equal As Integers ${resp.status_code} 200 -- cgit 1.2.3-korg