diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-03-18 16:55:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-18 16:55:14 +0000 |
| commit | 2c0558d9c185638a071666e459bab50dd010f0ed (patch) | |
| tree | 1b16e7869210e7d05072ba580cb63a7cd8b682c5 /robot/resources | |
| parent | 9204b9622322634a520fc2fbee81f503ce304589 (diff) | |
| parent | dcdc7857c1ebb5ba617afe971a95209ec4225aa9 (diff) | |
Merge "Match Dublin VID & Fix DEPLOY Wait"
Diffstat (limited to 'robot/resources')
| -rw-r--r-- | robot/resources/vid/create_service_instance.robot | 6 | ||||
| -rw-r--r-- | robot/resources/vid/create_vid_vnf.robot | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot index 76597260..719b85d6 100644 --- a/robot/resources/vid/create_service_instance.robot +++ b/robot/resources/vid/create_service_instance.robot @@ -15,8 +15,7 @@ Resource vid_interface.robot Create VID Service Instance [Documentation] Creates a service instance using VID [Arguments] ${customer_name} ${service_model_type} ${service_type} ${service_name} ${project_name} ${owning_entity} - Go To VID Browse Service Models - Wait Until Keyword Succeeds 180s 5s Wait For Model ${service_model_type} + Wait Until Keyword Succeeds 180s 15s Wait For Model ${service_model_type} Press Key xpath=//tr[td/span/text() = '${service_model_type}']/td/button[text() = 'Deploy' and not(@disabled)] \\13 ${uuid}= Generate UUID Wait Until Page Contains Element xpath=//input[@parameter-name='Instance Name'] ${GLOBAL_VID_UI_TIMEOUT_LONG} @@ -44,6 +43,9 @@ Create VID Service Instance Wait For Model [Documentation] Distributed model may not yet be available. Kepp trying until it shows up. [Arguments] ${service_model_type} + # Need to refresh browser json data Home -> Browse Service Models cycle does that + Go To VID Home + Go To VID Browse Service Models Page Should Contain Element xpath=//div/h1[text() = 'Browse SDC Service Models'] Wait Until Page Contains Element xpath=//button[text() = 'Deploy'] ${GLOBAL_VID_UI_TIMEOUT_MEDIUM} Input Text When Enabled //input[@ng-model='searchString'] ${service_model_type} diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot index fe0d3e15..eaca637d 100644 --- a/robot/resources/vid/create_vid_vnf.robot +++ b/robot/resources/vid/create_vid_vnf.robot @@ -40,7 +40,9 @@ Create VID VNF Sleep 10s Input Text xpath=//input[@parameter-id='instanceName'] ${service_instance_name} Select From List By Label xpath=//select[@parameter-id='productFamily'] ${product_family} - Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} + # Fix for Dublin + ${cloud_owner_uc}= Convert To Uppercase ${GLOBAL_AAI_CLOUD_OWNER} + Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} (${cloud_owner_uc}) Select From List By Label xpath=//select[@parameter-id='tenant'] ${tenant} Sleep 5s Click Element xpath=//multiselect[@parameter-id='lineOfBusiness'] @@ -73,7 +75,8 @@ Delete VID VNF Wait Until Page Contains Element xpath=//div[@class='statusLine'] timeout=${GLOBAL_VID_UI_TIMEOUT_LONG} Wait Until Element Is Not Visible xpath=//div[@class='statusLine aaiHidden'] timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM} Click On Element When Visible xpath=//li/div[contains(.,'${vnf_instance_id}')]/a/span[@class='glyphicon glyphicon-remove'] timeout=${GLOBAL_VID_UI_TIMEOUT_LONG} - Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} + ${cloud_owner_uc}= Convert To Uppercase ${GLOBAL_AAI_CLOUD_OWNER} + Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} (${cloud_owner_uc}) Select From List By Label xpath=//select[@parameter-id='tenant'] ${tenant} Click Element xpath=//div[@class='buttonRow']/button[@ngx-enabled='true'] #//*[@id="mContent"]/div/div/div/div/table/tbody/tr/td/div/div[2]/div/div[1]/div[5]/button[1] @@ -107,7 +110,8 @@ Create VID VNF module ## Wait Until Angular Ready just sleeps for its timeout value Sleep 10s Input Text xpath=//input[@parameter-id='instanceName'] ${vf_module_name} - Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} + ${cloud_owner_uc}= Convert To Uppercase ${GLOBAL_AAI_CLOUD_OWNER} + Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} (${cloud_owner_uc}) Select From List By Label xpath=//select[@parameter-id='tenant'] ${tenant} Wait Until Element Is Visible xpath=//input[@parameter-id='sdncPreload'] ${GLOBAL_VID_UI_TIMEOUT_SHORT} Wait Until Element Is Enabled xpath=//input[@parameter-id='sdncPreload'] ${GLOBAL_VID_UI_TIMEOUT_SHORT} |