From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 9 Mar 2020 13:41:23 +0000 (+0200)
Subject: VID: Fix newVNFChange by being more graceful before clicking
X-Git-Tag: 6.0.0-ONAP~48^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=integration%2Fcsit.git;a=commitdiff_plain;h=ce7e0704a1df1e17623b556fcb03ac77d7570ed4

VID: Fix newVNFChange by being more graceful before clicking

Issue-ID: VID-532

Change-Id: Ie0769c774a4f6b9f91d5bb6bd6bc81ef17448243
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---

diff --git a/tests/vid/newVNFChange/test1.robot b/tests/vid/newVNFChange/test1.robot
index b2093451..4c3e2a68 100644
--- a/tests/vid/newVNFChange/test1.robot
+++ b/tests/vid/newVNFChange/test1.robot
@@ -14,7 +14,6 @@ ${body}=  {"workflowsDetails":[{"workflowName":"VNF In Place Software Update","v
 
 *** Test Cases ***
 add new VNF Change in VID GUI From Local worfkow
-    [Documentation]   Logs in to VID GUI
     Setup Browser
     Go To    ${VID_LOGIN_URL}
 
@@ -38,24 +37,25 @@ add new VNF Change in VID GUI From Local worfkow
     ${headers}=    Create Dictionary    Accept-Encoding=gzip  Accept-Encoding=deflate    Content-Type=application/json
     ${response}=  Post Request    vid    /vid/change-management/vnf_workflow_relation    headers=${headers}  data=${body}
 
+    Wait Until Element Is Visible     xpath=//div[@heading='VNF Changes']//a[1]
     Click Element    xpath=//div[@heading='VNF Changes']//a[1]
 
     Click Element    xpath=//div[@ng-click='vm.createNewChange()']
 
     Wait Until Page Contains    New VNF Change    ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
 
-    Select From List  xpath=//select[@name='subscriber']  CAR_2020_ER
+    Select From List By Label  xpath=//select[@name='subscriber']  CAR_2020_ER
 
-    Select From List  xpath=//select[@name='serviceType']  gNB
+    Select From List By Label  xpath=//select[@name='serviceType']  gNB
 
-    Select From List  xpath=//select[@name='vnfType']  vLBMS
+    Select From List By Label  xpath=//select[@name='vnfType']  vLBMS
 
-    Select From List  xpath=//select[@name='fromVNFVersion']  3.0
+    Select From List By Label  xpath=//select[@name='fromVNFVersion']  3.0
 
     Click Element   xpath=//multiselect[@name='vnfName']
     Click Element   xpath=//a[contains(text(),'vnf-ws')]
 
-    Select From List  xpath=//select[@name='workflow']  VNF In Place Software Update
+    Select From List By Label  xpath=//select[@name='workflow']  VNF In Place Software Update
 
     Wait Until Page Contains    Operations timeout    ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
     Input Text    xpath=//input[@id='internal-workflow-parameter-text-2-operations-timeout']    10
diff --git a/tests/vid/newVNFChange/test2.robot b/tests/vid/newVNFChange/test2.robot
index b1dfcd7d..6ff17f64 100644
--- a/tests/vid/newVNFChange/test2.robot
+++ b/tests/vid/newVNFChange/test2.robot
@@ -17,8 +17,8 @@ add new VNF Change in VID GUI From SO NATIVE worfkow
 
     Run Process  ${CURDIR}/../resources/scripts/SetFeatureFlag.sh FLAG_HANDLE_SO_WORKFLOWS true  shell=True  cwd=${CURDIR}/../resources/scripts/
     Reload Page
-    Wait Until Page Contains  VNF Changes    ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
 
+    Wait Until Element Is Visible     xpath=//div[@heading='VNF Changes']//a[1]
     Click Element    xpath=//div[@heading='VNF Changes']//a[1]
 
     Click Element    xpath=//div[@ng-click='vm.createNewChange()']
diff --git a/tests/vid/newVNFChange/test3.robot b/tests/vid/newVNFChange/test3.robot
index 30244f99..443c4802 100644
--- a/tests/vid/newVNFChange/test3.robot
+++ b/tests/vid/newVNFChange/test3.robot
@@ -16,6 +16,7 @@ Resource    ../resources/keywords/login_vid_keywords.robot
 add new VNF Change in VID GUI From SO SDC worfkow
     [Documentation]   create VNF Change from SO SDC workflows
 
+    Wait Until Element Is Visible     xpath=//div[@heading='VNF Changes']//a[1]
     Click Element    xpath=//div[@heading='VNF Changes']//a[1]
 
     Click Element    xpath=//div[@ng-click='vm.createNewChange()']