Merge "Fix SDC DE Test"
diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot
new file mode 100644
index 0000000..fc59526
--- /dev/null
+++ b/robot/resources/oof_interface.robot
@@ -0,0 +1,41 @@
+*** Settings ***
+Documentation The main interface for interacting with OOF: SNIRO and Homing Service
+Library RequestsLibrary
+
+Resource global_properties.robot
+
+*** Variables ***
+${OOF_HOMING_HEALTH_CHECK_PATH} /v1/plans/healthcheck
+${OOF_SNIRO_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck
+
+${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT}
+${OOF_SNIRO_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT}
+
+*** Keywords ***
+Run OOF-Homing Health Check
+ [Documentation] Runs OOF-Homing Health check
+ ${resp}= Run OOF-Homing Get Request ${OOF_HOMING_HEALTH_CHECK_PATH}
+ Should Be Equal As Integers ${resp.status_code} 200
+
+Run OOF-Homing Get Request
+ [Documentation] Runs OOF-Homing Get request
+ [Arguments] ${data_path}
+ ${session}= Create Session session ${OOF_HOMING_ENDPOINT}
+ ${resp}= Get Request session ${data_path}
+ Should Be Equal As Integers ${resp.status_code} 200
+ Log Received response from OOF-Homing ${resp.text}
+ [Return] ${resp}
+
+Run OOF-SNIRO Health Check
+ [Documentation] Runs OOF-SNIRO Health check
+ ${resp}= Run OOF-SNIRO Get Request ${OOF_SNIRO_HEALTH_CHECK_PATH}
+ Should Be Equal As Integers ${resp.status_code} 200
+
+Run OOF-SNIRO Get Request
+ [Documentation] Runs OOF-SNIRO Get request
+ [Arguments] ${data_path}
+ ${session}= Create Session session ${OOF_SNIRO_ENDPOINT}
+ ${resp}= Get Request session ${data_path}
+ Should Be Equal As Integers ${resp.status_code} 200
+ Log Received response from OOF-SNIRO ${resp.text}
+ [Return] ${resp}
diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot
index 9d049ef..6adf3ad 100644
--- a/robot/testsuites/health-check.robot
+++ b/robot/testsuites/health-check.robot
@@ -23,6 +23,7 @@
Resource ../resources/cli_interface.robot
Resource ../resources/vnfsdk_interface.robot
Resource ../resources/log_interface.robot
+Resource ../resources/oof_interface.robot
*** Test Cases ***
@@ -34,6 +35,10 @@
[Tags] health core
Run APPC Health Check
+Basic CLI Health Check
+ [Tags] health core
+ Run CLI Health Check
+
Basic CLAMP Health Check
[Tags] health core
Run CLAMP Health Check
@@ -46,6 +51,22 @@
[Tags] health core
Run MR Health Check
+Basic External API NBI Health Check
+ [Tags] health externalapi api
+ Run NBI Health Check
+
+Basic Log Elasticsearch Health Check
+ [Tags] health core
+ Run Log Elasticsearch Health Check
+
+Basic Log Kibana Health Check
+ [Tags] health core
+ Run Log Kibana Health Check
+
+Basic Log Logstash Health Check
+ [Tags] health core
+ Run Log Logstash Health Check
+
Basic Microservice Bus Health Check
[Tags] health core
Run MSB Health Check
@@ -66,6 +87,14 @@
[Tags] health multicloud
Run MSB Get Request /api/multicloud-vio/v0/swagger.json
+Basic OOF-Homing Health Check
+ [Tags] health core
+ Run OOF-Homing Health Check
+
+Basic OOF-SNIRO Health Check
+ [Tags] health core
+ Run OOF-SNIRO Health Check
+
Basic Policy Health Check
[Tags] health core
Run Policy Health Check
@@ -102,6 +131,10 @@
[Tags] health 3rdparty
Run MSB Get Request /api/gvnfmdriver/v1/swagger.json
+Basic VFC huaweivnfmdriver API Health Check
+ [Tags] health 3rdparty
+ Run MSB Get Request /api/huaweivnfmdriver/v1/swagger.json
+
Basic VFC jujuvnfmdriver API Health Check
[Tags] health 3rdparty
Run MSB Get Request /api/jujuvnfmdriver/v1/swagger.json
@@ -110,10 +143,6 @@
[Tags] health 3rdparty
Run MSB Get Request /api/multivimproxy/v1/swagger.json
-Basic VFC huaweivnfmdriver API Health Check
- [Tags] health 3rdparty
- Run MSB Get Request /api/huaweivnfmdriver/v1/swagger.json
-
Basic VFC nokiavnfmdriver API Health Check
[Tags] health 3rdparty
Run MSB Get Request /api/nokiavnfmdriver/v1/swagger.json
@@ -158,6 +187,10 @@
[Tags] health core
Run VID Health Check
+Basic VNFSDK Health Check
+ [Tags] health core
+ Run VNFSDK Health Check
+
Health Distribution Test
[Tags] healthdist
[Timeout] 240
@@ -170,29 +203,4 @@
Portal Application Access Tests
[Tags] healthportalapp
[Timeout] 180
- Run Portal Application Access Tests
-
-Basic NBI Health Check
- [Tags] health externalapi api
- Run NBI Health Check
-
-Basic CLI Health Check
- [Tags] health core
- Run CLI Health Check
-
-Basic VNFSDK Health Check
- [Tags] health core
- Run VNFSDK Health Check
-
-Basic Log Elasticsearch Health Check
- [Tags] health core
- Run Log Elasticsearch Health Check
-
-Basic Log Logstash Health Check
- [Tags] health core
- Run Log Logstash Health Check
-
-Basic Log Kibana Health Check
- [Tags] health core
- Run Log Kibana Health Check
-
+ Run Portal Application Access Tests
\ No newline at end of file