summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstark, steven <steven.stark@att.com>2019-09-16 16:09:17 -0700
committerstark, steven <steven.stark@att.com>2019-09-16 16:14:40 -0700
commitb721c30484849bed5e2aa4af73d4fb8f8f7cdb56 (patch)
treef8c0f45daf257e52db8ab196ed74f9115af9fd3a
parent36b433cedc9da67701c731e8a80441f16bf6cdb1 (diff)
[INT] adding back cloud owner convert to upper case
Cloud owner convert to upper case was removed accidentally in change https://gerrit.onap.org/r/c/testsuite/+/94485 Also fixing import for vvp validation Issue-ID: INT-1197 Signed-off-by: stark, steven <steven.stark@att.com> Change-Id: I94dd90c30a91643bb605b8ad6a4c45235ba099ed
-rw-r--r--robot/resources/vid/create_vid_vnf.robot3
-rw-r--r--robot/resources/vvp_validation.robot2
2 files changed, 4 insertions, 1 deletions
diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot
index 575863bd..7fc497d3 100644
--- a/robot/resources/vid/create_vid_vnf.robot
+++ b/robot/resources/vid/create_vid_vnf.robot
@@ -39,6 +39,7 @@ Create VID VNF
Input Text xpath=//input[@parameter-id='instanceName'] ${service_instance_name}
Select From List By Label xpath=//select[@parameter-id='productFamily'] ${product_family}
# Fix for Dublin
+ ${cloud_owner_uc}= Convert To Uppercase ${cloud_owner_uc}
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}
Select From List When Enabled //select[@parameter-id='lineOfBusiness'] ${line_of_business}
@@ -69,6 +70,7 @@ 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}
+ ${cloud_owner_uc}= Convert To Uppercase ${cloud_owner_uc}
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']
@@ -131,6 +133,7 @@ Fill Module Form And Submit
## Wait Until Angular Ready just sleeps for its timeout value
Sleep 10s
Input Text xpath=//input[@parameter-id='instanceName'] ${vf_module_name}
+ ${cloud_owner_uc}= Convert To Uppercase ${cloud_owner_uc}
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}
diff --git a/robot/resources/vvp_validation.robot b/robot/resources/vvp_validation.robot
index de4ba69a..130e31e9 100644
--- a/robot/resources/vvp_validation.robot
+++ b/robot/resources/vvp_validation.robot
@@ -3,7 +3,7 @@ Documentation The main interface for interacting with SDC. It handles low le
Library OperatingSystem
Library ONAPLibrary.SO WITH NAME SO
Library ONAPLibrary.HeatVNFValidation WITH NAME HeatVNFValidation
-Library ONAPLibrary.VVPValidation WITH NAME VVPValidation
+Library ONAPLibrary.VVPValidation.HeatValidationScripts WITH NAME VVPValidation
*** Variables ***
${CLOUD_CONFIG_PATH} /cloudSite