diff options
Diffstat (limited to 'robot/resources/vid')
| -rw-r--r-- | robot/resources/vid/create_service_instance.robot | 12 | ||||
| -rw-r--r-- | robot/resources/vid/create_vid_vnf.robot | 11 | ||||
| -rw-r--r-- | robot/resources/vid/teardown_vid.robot | 4 |
3 files changed, 15 insertions, 12 deletions
diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot index 45ea899d..ffb3e044 100644 --- a/robot/resources/vid/create_service_instance.robot +++ b/robot/resources/vid/create_service_instance.robot @@ -1,14 +1,13 @@ *** Settings *** Documentation Creates VID Service Instance -... -... Creates VID Service Instance Library SeleniumLibrary Library ONAPLibrary.Utilities Library String Library DateTime +Library ONAPLibrary.SO WITH NAME SO -Resource ../so_interface.robot +Resource ../global_properties.robot Resource vid_interface.robot *** Keywords *** @@ -37,7 +36,8 @@ Create VID Service Instance Click On Button When Enabled //div[@class = 'buttonRow']/button[text() = 'Close'] ${request_id}= Parse Request Id ${response text} ${service_instance_id}= Parse Instance Id ${response text} - Poll MSO Get Request ${GLOBAL_MSO_STATUS_PATH}${request_id} COMPLETE + ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} + SO.Run Polling Get Request ${GLOBAL_SO_ENDPOINT} ${GLOBAL_MSO_STATUS_PATH}${request_id} auth=${auth} [return] ${service_instance_id} Wait For Model @@ -58,8 +58,8 @@ Delete Service Instance By GUI Wait Until Element Contains xpath=//div[@ng-controller='deletionDialogController']//div[@ng-controller= 'msoCommitController']/pre[@class = 'log ng-binding'] requestId timeout=${GLOBAL_VID_UI_TIMEOUT_LONG} ${response text}= Get Text xpath=//div[@ng-controller='deletionDialogController']//div[@ng-controller= 'msoCommitController']/pre[@class = 'log ng-binding'] ${request_id}= Parse Request Id ${response text} - Poll MSO Get Request ${GLOBAL_MSO_STATUS_PATH}${request_id} COMPLETE - + ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} + SO.Run Polling Get Request ${GLOBAL_SO_ENDPOINT} ${GLOBAL_MSO_STATUS_PATH}${request_id} auth=${auth} Search Service Instance [Arguments] ${service_instance_id} diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot index a0110a2b..cdcee11a 100644 --- a/robot/resources/vid/create_vid_vnf.robot +++ b/robot/resources/vid/create_vid_vnf.robot @@ -5,12 +5,11 @@ Library SeleniumLibrary 60 Library String Library DateTime Library RequestsLibrary - -Resource ../so_interface.robot +Resource ../global_properties.robot Resource vid_interface.robot +Library ONAPLibrary.SO WITH NAME SO *** Keywords *** - Create VID VNF [Documentation] Creates a VNF instance using VID for passed instance id with the passed service instance name [Arguments] ${service_instance_id} ${service_instance_name} ${product_family} ${lcp_region} ${tenant} ${vnf_type} ${customer} ${line_of_business}=LOB-Demonstration ${platform}=Platform-Demonstration @@ -84,7 +83,8 @@ Delete VID VNF ${response text}= Get Text xpath=//div[@ng-controller='deletionDialogController']//div[@ng-controller= 'msoCommitController']/pre[@class = 'log ng-binding'] ${request_id}= Parse Request Id ${response text} - Poll MSO Get Request ${GLOBAL_MSO_STATUS_PATH}${request_id} COMPLETE + ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${resp}= SO.Run Polling Get Request ${GLOBAL_SO_ENDPOINT} ${GLOBAL_MSO_STATUS_PATH}${request_id} auth=${auth} Create VID VNF module [Arguments] ${service_instance_id} ${vf_module_name} ${lcp_region} ${TENANT} ${VNF_TYPE} ${customer} ${vnf_name} @@ -124,7 +124,8 @@ Create VID VNF module ${instance_id}= Parse Instance Id ${response text} ${request_id}= Parse Request Id ${response text} - Poll MSO Get Request ${GLOBAL_MSO_STATUS_PATH}${request_id} COMPLETE + ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${resp}= SO.Run Polling Get Request ${GLOBAL_SO_ENDPOINT} ${GLOBAL_MSO_STATUS_PATH}${request_id} auth=${auth} [Return] ${instance_id} Wait For Add VF Module diff --git a/robot/resources/vid/teardown_vid.robot b/robot/resources/vid/teardown_vid.robot index f1b6daa8..706c3c44 100644 --- a/robot/resources/vid/teardown_vid.robot +++ b/robot/resources/vid/teardown_vid.robot @@ -3,6 +3,7 @@ Documentation The main interface for interacting with VID. It handles low le Library SeleniumLibrary Library Collections Library String +Library ONAPLibrary.SO WITH NAME SO Resource vid_interface.robot Resource create_vid_vnf.robot Resource create_service_instance.robot @@ -81,7 +82,8 @@ Delete Next VID Entity ${response text}= Get Text xpath=//div[@ng-controller='deletionDialogController']//div[@ng-controller= 'msoCommitController']/pre[@class = 'log ng-binding'] ${request_id}= Parse Request Id ${response text} Click Element xpath=//div[@class='ng-scope']/div[@class = 'buttonRow']/button[text() = 'Close'] - Poll MSO Get Request ${GLOBAL_MSO_STATUS_PATH}${request_id} COMPLETE + ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${resp}= SO.Run Polling Get Request ${GLOBAL_SO_ENDPOINT} ${GLOBAL_MSO_STATUS_PATH}${request_id} auth=${auth} [Return] ${teardown_status} ${vfmodule} Handle VID Alert |