diff options
| -rw-r--r-- | robot/resources/asdc_interface.robot | 2 | ||||
| -rw-r--r-- | robot/resources/demo_preload.robot | 2 | ||||
| -rw-r--r-- | robot/resources/so_interface.robot (renamed from robot/resources/mso_interface.robot) | 28 | ||||
| -rw-r--r-- | robot/resources/vid/create_service_instance.robot | 2 | ||||
| -rw-r--r-- | robot/resources/vid/create_vid_vnf.robot | 2 | ||||
| -rw-r--r-- | robot/testsuites/health-check.robot | 4 |
6 files changed, 30 insertions, 10 deletions
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot index fa0713a5..382821e9 100644 --- a/robot/resources/asdc_interface.robot +++ b/robot/resources/asdc_interface.robot @@ -103,7 +103,7 @@ Setup ASDC Catalog Resource Package ASDC Software Product ${software_product_id} ${software_product_version_id} ${software_product_resp}= Get ASDC Software Product ${software_product_id} ${software_product_version_id} ${catalog_resource_id}= Add ASDC Catalog Resource ${license_agreement_id} ${software_product_resp['name']} ${license_model_resp['vendorName']} ${software_product_id} - Request Certify ASDC Catalog Resource ${catalog_resource_id} + ${catalog_resource_id}= Certify ASDC Catalog Resource ${catalog_resource_id} ${ASDC_DESIGNER_USER_ID} [Return] ${catalog_resource_id} Add ASDC License Model [Documentation] Creates an asdc license model and returns its id diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index bab21be1..f87cc366 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -4,7 +4,7 @@ Documentation This test template encapsulates the VNF Orchestration use case. Resource test_templates/model_test_template.robot Resource test_templates/vnf_orchestration_test_template.robot Resource asdc_interface.robot -Resource mso_interface.robot +Resource so_interface.robot Resource vid/vid_interface.robot Resource policy_interface.robot diff --git a/robot/resources/mso_interface.robot b/robot/resources/so_interface.robot index bded5282..70faf3bf 100644 --- a/robot/resources/mso_interface.robot +++ b/robot/resources/so_interface.robot @@ -7,16 +7,36 @@ Library Collections Resource global_properties.robot Resource ../resources/json_templater.robot *** Variables *** -${MSO_HEALTH_CHECK_PATH} /ecomp/mso/infra/globalhealthcheck +${MSO_HEALTH_CHECK_PATH} /manage/health ${MSO_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_SERVER_PORT} +${SO_APIHAND_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_APIHAND_SERVER_PORT} +${SO_ASDCHAND_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO__ASDCHAND_SERVER_PORT} +${SO_BPMN_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_BPMN_SERVER_PORT} +${SO_CATDB_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO__CATDB_SERVER_PORT} +${SO_OPENSTACK_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_OPENSTACK_SERVER_PORT} +${SO_REQDB_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_REQDB_SERVER_PORT} +${SO_SDNC_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_SDNC_SERVER_PORT} +${SO_VFC_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_VFC_SERVER_PORT} *** Keywords *** -Run MSO Health Check +Run SO Global Health Check + Run SO Container Health Check API_HANDLER ${SO_APIHAND_ENDPOINT} + Run SO Container Health Check ASDC_HANDLER ${SO_ASDCHAND_ENDPOINT} + Run SO Container Health Check BPMN_INFRA ${SO_BPMN_ENDPOINT} + Run SO Container Health Check CATALOG_DB ${SO_CATDB_ENDPOINT} + Run SO Container Health Check OPENSTACK_INFRA ${SO_OPENSTACK_ENDPOINT} + Run SO Container Health Check REQUEST_DB ${SO_REQDB_ENDPOINT} + Run SO Container Health Check SDNC_INFRA ${SO_SDNC_ENDPOINT} + Run SO Container Health Check VFC_INFRA ${SO_VFC_ENDPOINT} + + +Run SO Container Health Check [Documentation] Runs an MSO global health check + [Arguments] ${so_endpoint_label} ${so_endpoint} ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} - ${session}= Create Session mso ${MSO_ENDPOINT} + ${session}= Create Session mso ${so_endpoint} ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=text/html Content-Type=text/html X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Get Request mso ${MSO_HEALTH_CHECK_PATH} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot index d57abc4b..76597260 100644 --- a/robot/resources/vid/create_service_instance.robot +++ b/robot/resources/vid/create_service_instance.robot @@ -8,7 +8,7 @@ Library UUID Library String Library DateTime -Resource ../mso_interface.robot +Resource ../so_interface.robot Resource vid_interface.robot *** Keywords *** diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot index a7cc8e1f..5997b07e 100644 --- a/robot/resources/vid/create_vid_vnf.robot +++ b/robot/resources/vid/create_vid_vnf.robot @@ -7,7 +7,7 @@ Library String Library DateTime Library RequestsLibrary -Resource ../mso_interface.robot +Resource ../so_interface.robot Resource vid_interface.robot *** Keywords *** diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index bad08850..14ae4e58 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -9,7 +9,7 @@ Resource ../resources/sdngc_interface.robot Resource ../resources/aai/aai_interface.robot Resource ../resources/vid/vid_interface.robot Resource ../resources/policy_interface.robot -Resource ../resources/mso_interface.robot +Resource ../resources/so_interface.robot Resource ../resources/asdc_interface.robot Resource ../resources/appc_interface.robot Resource ../resources/portal_interface.robot @@ -122,7 +122,7 @@ Basic SDNC Health Check Basic SO Health Check [Tags] health core - Run MSO Health Check + Run SO Global Health Check Basic UseCaseUI API Health Check [Tags] health api |