diff options
| -rw-r--r-- | robot/resources/vid/create_service_instance.robot | 3 | ||||
| -rw-r--r-- | robot/resources/vid/vid_interface.robot | 20 |
2 files changed, 14 insertions, 9 deletions
diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot index 7cdafe0c..b6e72a29 100644 --- a/robot/resources/vid/create_service_instance.robot +++ b/robot/resources/vid/create_service_instance.robot @@ -15,7 +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} - Go To VID HOME + Go To VID Browse Service Models Wait Until Keyword Succeeds 300s 1s 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 @@ -37,7 +37,6 @@ 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} - Click Element partial link=Browse SDC Service 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_LONG} Input Text When Enabled //input[@ng-model='searchString'] ${service_model_type} diff --git a/robot/resources/vid/vid_interface.robot b/robot/resources/vid/vid_interface.robot index cb625d47..788df0aa 100644 --- a/robot/resources/vid/vid_interface.robot +++ b/robot/resources/vid/vid_interface.robot @@ -10,9 +10,10 @@ Resource ../browser_setup.robot *** Variables *** ${VID_ENV} /vid -${VID_LOGIN_URL} ${GLOBAL_VID_SERVER}${VID_ENV}/login_external.htm +${VID_LOGIN_URL} ${GLOBAL_VID_SERVER}${VID_ENV}/login.htm ${VID_HEALTHCHECK_PATH} ${VID_ENV}/api/v2/users -${VID_HOME_URL} ${GLOBAL_VID_SERVER}${VID_ENV}/vidhome.htm +${VID_HOME_URL} ${GLOBAL_VID_SERVER}${VID_ENV}/welcome.htm +${VID_SERVICE_MODELS_URL} ${GLOBAL_VID_SERVER}${VID_ENV}/serviceModels.htm#/models/services *** Keywords *** Run VID Health Check @@ -43,17 +44,22 @@ Login To VID GUI Set Browser Implicit Wait ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} Log Logging in to ${GLOBAL_VID_SERVER}${VID_ENV} Handle Proxy Warning - Title Should Be VID Login - Input Text xpath=//input[@ng-model='loginId'] ${GLOBAL_VID_USERNAME} - Input Password xpath=//input[@ng-model='password'] ${GLOBAL_VID_PASSWORD} + Title Should Be Login + Input Text xpath=//input[@id='loginId'] ${GLOBAL_VID_USERNAME} + Input Password xpath=//input[@id='password'] ${GLOBAL_VID_PASSWORD} Click Button xpath=//input[@id='loginBtn'] - Wait Until Page Contains Element xpath=//div[@class='applicationWindow'] ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} + Wait Until Page Contains Welcome to VID ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} Log Logged in to ${GLOBAL_VID_SERVER}${VID_ENV} Go To VID HOME [Documentation] Naviage to VID Home Go To ${VID_HOME_URL} - Wait Until Page Contains Element xpath=//div[@class='applicationWindow'] ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} + Wait Until Page Contains Welcome to VID ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} + +Go To VID Browse Service Models + [Documentation] Naviage to VID Browse Service Models + Go To ${VID_SERVICE_MODELS_URL} + Wait Until Page Contains Browse SDC Service Models ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} Click On Button When Enabled [Arguments] ${xpath} ${timeout}=${GLOBAL_VID_UI_TIMEOUT_MEDIUM} |