Update Pomba Health Check

Issue-ID: LOG-1021
Issue-ID: LOG-1024
Issue-ID: LOG-1018

Change-Id: I75e1908177a930e88fe2640cc12019032516459e
Signed-off-by: Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com>

diff --git a/robot/resources/pomba_interface.robot b/robot/resources/pomba_interface.robot
index c181eda..9ca9b7e 100644 (file)
--- a/robot/resources/pomba_interface.robot
+++ b/robot/resources/pomba_interface.robot
@@ -13,7 +13,6 @@ ${POMBA_AAICB_PATH}   /aaicontextbuilder/health
 ${POMBA_SDCCB_PATH}   /sdccontextbuilder/health
 ${POMBA_NDCB_PATH}    /ndcontextbuilder/health
 ${POMBA_NDMS_PATH}   /health
-${POMBA_VALIDATIONSERVICE_PATH}   /health
 ${POMBA_KIBANA_PATH}   /
 ${POMBA_ELASTICSEARCH_PATH}   /
 
@@ -23,8 +22,7 @@ ${POMBA_SDCCONTEXTBUILDER_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTP}://${
 ${POMBA_NETWORKDISCCONTEXTBUILDER_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTP}://${GLOBAL_INJECTED_POMBA_NETWORK_DISC_CONTEXTBUILDER_IP_ADDR}:${GLOBAL_POMBA_NETWORKDISCCONTEXTBUILDER_PORT}
 ${POMBA_SERVICEDECOMPOSITION_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTP}://${GLOBAL_INJECTED_POMBA_SERVICE_DECOMPOSITION_IP_ADDR}:${GLOBAL_POMBA_SERVICEDECOMPOSITION_PORT}
 ${POMBA_NETWORKDISCOVERY_MICROSERVICE_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTPS}://${GLOBAL_INJECTED_POMBA_NETWORKDISCOVERY_MICROSERVICE_IP_ADDR}:${GLOBAL_POMBA_NETWORKDISCOVERY_MICROSERVICE_PORT}
-${POMBA_VALIDATIONSERVICE_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTP}://${GLOBAL_INJECTED_POMBA_VALIDATION_SERVICE_IP_ADDR}:${GLOBAL_POMBA_VALIDATIONSERVICE_PORT}
-${POMBA_KIBANA_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTP}://${GLOBAL_INJECTED_POMBA_KIBANA_IP_ADDR}:${GLOBAL_POMBA_KIBANA_PORT}
+${POMBA_KIBANA_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTPS}://${GLOBAL_INJECTED_POMBA_KIBANA_IP_ADDR}:${GLOBAL_POMBA_KIBANA_PORT}
 ${POMBA_ELASTICSEARCH_ENDPOINT}    ${GLOBAL_POMBA_SERVER_PROTOCOL_HTTP}://${GLOBAL_INJECTED_POMBA_ELASTIC_SEARCH_IP_ADDR}:${GLOBAL_POMBA_ELASTICSEARCH_PORT}
 
 *** Keywords ***
@@ -98,20 +96,6 @@ Run Pomba Network Discovery MicroService Get Request
     Log    Received response from pomba-networkdiscovery ${resp.text}
     [Return]    ${resp}
 
-Run Pomba Validation Service Health Check
-    [Documentation]   Tests Pomba Validation Service interface
-    ${resp}=    Run Pomba Validation Service Get Request    ${POMBA_VALIDATIONSERVICE_PATH}
-    Should Be Equal As Strings         ${resp.status_code}     200
-
-Run Pomba Validation Service Get Request
-    [Documentation]    Runs a Pomba Validation Service request
-    [Arguments]    ${data_path}
-    Log    Creating session ${POMBA_VALIDATIONSERVICE_ENDPOINT}
-    ${session}=    Create Session      pomba-validation-service        ${POMBA_VALIDATIONSERVICE_ENDPOINT}
-    ${resp}=   Get Request     pomba-validation-service        ${data_path}
-    Log    Received response from pomba-validation-service ${resp.text}
-    [Return]    ${resp}
-
 Run Pomba Kibana Health Check
     [Documentation]   Tests Pomba Kibana interface
     ${resp}=    Run Pomba Kibana Get Request    ${POMBA_KIBANA_PATH}

diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 6054a15..75f2cdf 100644 (file)
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -152,10 +152,6 @@ Basic Pomba Network-Discovery-MicroService Health Check
     [Tags]    health    oom
     Run Pomba Network Discovery MicroService Health Check
 
-Basic Pomba Validation-Service Health Check
-    [Tags]    health    oom
-    Run Pomba Validation Service Health Check
-
 Basic Pomba Pomba-Kibana Health Check
     [Tags]    health    oom
     Run Pomba Kibana Health Check