diff options
| author |   Jerry Flood <jf9860@att.com> | 2017-11-22 17:32:18 -0500 |
|---|---|---|
| committer | Jerry Flood <jf9860@att.com> | 2017-11-22 17:37:07 -0500 |
| commit | fe79d7f26a5e211984504dc15ec042d052e65ff8 (patch) | |
| tree | 649bf16ee9f2e038eec8292d85976493cbf15ae8 /robot/resources/vid/teardown_vid.robot | |
| parent | 81d33fb58ca4b7f6dc58fde0324df7fd6ca5bc61 (diff) | |
Report test failure when Delete VNF fails1.0.0-ONAP1.0.0-Amsterdam
Issue-ID: TEST-54
Change-Id: Id92f2bbdcc967f44024c8f3aa53d45f82616ea9f
Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot/resources/vid/teardown_vid.robot')
| -rw-r--r-- | robot/resources/vid/teardown_vid.robot | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/robot/resources/vid/teardown_vid.robot b/robot/resources/vid/teardown_vid.robot index df40b9ea..3a0697ec 100644 --- a/robot/resources/vid/teardown_vid.robot +++ b/robot/resources/vid/teardown_vid.robot @@ -12,24 +12,29 @@ Resource create_service_instance.robot *** Variables *** ${VID_ENV} /vid ${VID_SERVICE_MODELS_SEARCH_URL} ${GLOBAL_VID_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VID_IP_ADDR}:${GLOBAL_VID_SERVER_PORT}${VID_ENV}/serviceModels.htm#/instances/services +${TEARDOWN_STATUS} FAIL + *** Keywords *** Teardown VID [Documentation] Teardown the VID This assumes that the any runnign stacks have been torn down - [Arguments] ${service_instance_id} ${lcp_region} ${tenant} + [Arguments] ${service_instance_id} ${lcp_region} ${tenant} ${customer} Return From Keyword If len('${service_instance_id}') == 0 # Keep going to the VID service instance until we get the pop-up alert that there is no service instance - Wait Until Keyword Succeeds 300s 1s Delete VID ${service_instance_id} ${lcp_region} ${tenant} + Set Test Variable ${TEARDOWN_STATUS} FAIL + Wait Until Keyword Succeeds 300s 1s Delete VID ${service_instance_id} ${lcp_region} ${tenant} ${customer} + Return From Keyword If '${TEARDOWN_STATUS}' == 'PASS' + Fail ${TEARDOWN_STATUS} Delete VID [Documentation] Teardown the next VID entity that has a Remove icon. - [Arguments] ${service_instance_id} ${lcp_region} ${tenant} + [Arguments] ${service_instance_id} ${lcp_region} ${tenant} ${customer} # For vLB closed loop, we may have 2 vf modules and the vDNS one needs to be removed first. ${remove_order}= Create List vDNS_Ete Vfmodule_Ete # FAIL status is returned in ${vfmodule} because FAIL are ignored during teardown - ${status} ${vfmodule}= Run Keyword and Ignore Error Delete Next VID Entity ${service_instance_id} ${lcp_region} ${tenant} ${remove_order} + ${status} ${vfmodule}= Run Keyword and Ignore Error Delete Next VID Entity ${service_instance_id} ${lcp_region} ${tenant} ${remove_order} ${customer} Return From Keyword If '${status}' == 'FAIL' Return From Keyword If '${vfmodule}' == 'FAIL' # After tearing down a VF module, execute the reverse HB for it to remove the references from A&AI @@ -38,7 +43,7 @@ Delete VID Delete Next VID Entity [Documentation] Teardown the next VID entity that has a Remove icon. - [Arguments] ${service_instance_id} ${lcp_region} ${tenant} ${remove_order} + [Arguments] ${service_instance_id} ${lcp_region} ${tenant} ${remove_order} ${customer} ${vfmodule}= Catenate Go To ${VID_SERVICE_MODELS_SEARCH_URL} Wait Until Page Contains Please search by timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM} @@ -46,14 +51,17 @@ Delete Next VID Entity Wait Until Element Is Not Visible xpath=//div[@class='statusLine aaiHidden'] timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM} # If we don't wait for this control to be enabled, the submit results in a 'not found' pop-up (UnexpectedAlertPresentException) - Input Text When Enabled //input[@name='selectedServiceInstance'] ${service_instance_id} + Select From List By Label //select[@ng-model='selectedCustomer'] ${customer} + Click Button button=Submit # When Handle alert detects a pop-up. it will return FAIL and we are done # Return from Keyword is required because FAIL is inored during teardown + Set Test Variable ${TEARDOWN_STATUS} PASS ${status} ${value} Run Keyword And Ignore Error Handle Alert Return From Keyword If '${status}' == 'FAIL' ${status} ${status} ${value} Run Keyword And Ignore Error Wait Until Page Contains Element link=View/Edit timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM} Return From Keyword If '${status}' == 'FAIL' ${status} + Set Test Variable ${TEARDOWN_STATUS} FAIL Click Element link=View/Edit |