[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

diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot
index 575863b..7fc497d 100644 (file)
--- 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 de4ba69..130e31e 100644 (file)
--- 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