aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-26 08:20:12 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-09-26 08:20:29 -0700
commite3d841145bc8e71255336a82937aabdc6e2f7e5a (patch)
treef1078c1c5f21007a3d645dedbbc12b179fa327b7
parenteb05feec6bfc54cc6ff41791ab708a7af7b9d3e9 (diff)
Revert "Healthcheck for PRH and HV-VES"
This reverts commit 3a6ff9be81f284d23b0170231de9aa9591f7e59b. Change-Id: I8b0ddfad6f2a900e29876ebe6f8f6c6c2a19b1a6 Issue-ID: INT-651 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--robot/resources/dcae_interface.robot13
-rw-r--r--robot/resources/global_properties.robot5
-rw-r--r--robot/resources/prh_interface.robot24
-rw-r--r--robot/testsuites/health-check.robot9
4 files changed, 0 insertions, 51 deletions
diff --git a/robot/resources/dcae_interface.robot b/robot/resources/dcae_interface.robot
index 9b447ded..dd804503 100644
--- a/robot/resources/dcae_interface.robot
+++ b/robot/resources/dcae_interface.robot
@@ -8,10 +8,7 @@ Resource global_properties.robot
*** Variables ***
${DCAE_HEALTH_CHECK_PATH} /healthcheck
-${VES_HV_HEALTH_CHECK_PATH} /health/ready
${DCAE_HEALTH_ENDPOINT} ${GLOBAL_DCAE_SERVER_PROTOCOL}://${GLOBAL_INJECTED_DCAE_IP_ADDR}:${GLOBAL_DCAE_HEALTH_SERVER_PORT}
-${VES_HV_HEALTH_ENDPOINT} ${GLOBAL_DCAE_SERVER_PROTOCOL}://${GLOBAL_DNS_VES_NAME}:${GLOBAL_HV_VES_HEALTH_SERVER_PORT}
-
*** Keywords ***
Run DCAE Health Check
@@ -25,13 +22,3 @@ Run DCAE Health Check
Log Received response code from dcae ${resp}
Log Received content from dcae ${resp.content}
Should Be Equal As Strings ${resp.status_code} 200
-
-Run VES-HV Health Check
- [Documentation] Runs a VES-HV health check
- Log Creating session ${VES_HV_HEALTH_ENDPOINT}
- ${session}= Create Session hv-ves ${VES_HV_HEALTH_ENDPOINT}
- ${uuid}= Generate UUID
- ${resp}= Get Request hv-ves ${VES_HV_HEALTH_CHECK_PATH}
- Log Received response code from hv-ves ${resp}
- Log Received content from hv-ves ${resp.content}
- Should Be Equal As Strings ${resp.status_code} 200
diff --git a/robot/resources/global_properties.robot b/robot/resources/global_properties.robot
index d2e62f8a..7d8db8e0 100644
--- a/robot/resources/global_properties.robot
+++ b/robot/resources/global_properties.robot
@@ -33,8 +33,3 @@ ${GLOBAL_AAI_ZONE_ID} nova1
${GLOBAL_AAI_ZONE_NAME} nova
${GLOBAL_AAI_DESIGN_TYPE} integration
${GLOBAL_AAI_ZONE_CONTEXT} labs
-${GLOBAL_HV_VES_HEALTH_SERVER_PORT} 6061
-${GLOBAL_DNS_VES_NAME} dcae-hv-ves-collector
-${GLOBAL_DNS_PRH_NAME} dcae-prh
-${GLOBAL_PRH_HEALTH_SERVER_PORT} 8100
-${GLOBAL_SERVER_PROTOCOL} http
diff --git a/robot/resources/prh_interface.robot b/robot/resources/prh_interface.robot
deleted file mode 100644
index b7c09e8c..00000000
--- a/robot/resources/prh_interface.robot
+++ /dev/null
@@ -1,24 +0,0 @@
-*** Settings ***
-Documentation The main interface for interacting with PRH. It handles low level stuff like managing the http request library and PRH required fields
-Library RequestsLibrary
-Library UUID
-Library OperatingSystem
-Library Collections
-Resource global_properties.robot
-
-
-*** Variables ***
-${PRH_HEALTH_CHECK_PATH} /heartbeat
-${PRH_HEALTH_ENDPOINT} ${GLOBAL_SERVER_PROTOCOL}://${GLOBAL_DNS_PRH_NAME}:${GLOBAL_PRH_HEALTH_SERVER_PORT}
-
-
-*** Keywords ***
-Run PRH Health Check
- [Documentation] Runs a PRH health check
- Log Creating session ${PRH_HEALTH_ENDPOINT}
- ${session}= Create Session hv-ves ${PRH_HEALTH_ENDPOINT}
- ${uuid}= Generate UUID
- ${resp}= Get Request hv-ves ${PRH_HEALTH_CHECK_PATH}
- Log Received response code from hv-ves ${resp}
- Log Received content from hv-ves ${resp.content}
- Should Be Equal As Strings ${resp.status_code} 200
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 49a75f0c..2aacf28c 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -27,7 +27,6 @@ Resource ../resources/oof_interface.robot
Resource ../resources/sms_interface.robot
Resource ../resources/dr_interface.robot
Resource ../resources/pomba_interface.robot
-Resource ../resources/prh_interface.robot
*** Test Cases ***
Basic A&AI Health Check
@@ -130,10 +129,6 @@ Basic Portal Health Check
[Tags] health core
Run Portal Health Check
-Basic PRH Health Check
- [Tags] health api prh
- Run PRH Health Check
-
Basic SDC Health Check
[Tags] health core
Run ASDC Health Check
@@ -150,10 +145,6 @@ Basic UseCaseUI API Health Check
[Tags] health api
Run MSB Get Request /iui/usecaseui/
-Basic VES-HV Health Check
- [Tags] health api hv-ves
- Run VES-HV Health Check
-
Basic VFC catalog API Health Check
[Tags] health api
Run MSB Get Request /api/catalog/v1/swagger.json