bringing robot up to date with 1.1

[oom.git] / kubernetes / config / docker / init / src / config / robot / robot / resources / asdc_interface.robot

diff --git a/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot b/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot
index 72407de..3020603 100644 (file)
--- a/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot
+++ b/kubernetes/config/docker/init/src/config/robot/robot/resources/asdc_interface.robot
@@ -68,8 +68,9 @@ Distribute Model From ASDC
        Distribute ASDC Catalog Service    ${catalog_service_id}
        ${catalog_service_resp}=    Get ASDC Catalog Service    ${catalog_service_id}
        ${vf_module}=    Find Element In Array    ${loop_catalog_resource_resp['groups']}    type    org.openecomp.groups.VfModule
-    [Return]    ${catalog_service_resp['name']}    ${loop_catalog_resource_resp['name']}    ${vf_module}   ${catalog_resource_ids}    ${catalog_service_id}
        Check Catalog Service Distributed    ${catalog_service_resp['uuid']}
+    [Return]    ${catalog_service_resp['name']}    ${loop_catalog_resource_resp['name']}    ${vf_module}   ${catalog_resource_ids}    ${catalog_service_id}
+    
 Setup ASDC Catalog Resource
     [Documentation]    Creates all the steps a vf needs for an asdc catalog resource and returns the id
     [Arguments]    ${model_zip_path}
@@ -289,13 +290,15 @@ Certify ASDC Catalog Resource
     ${resp}=    Run ASDC Post Request    ${ASDC_CATALOG_RESOURCES_PATH}/${catalog_resource_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify    ${data}    ${ASDC_TESTER_USER_ID}
     Should Be Equal As Strings         ${resp.status_code}     200
     [Return]    ${resp.json()['uniqueId']}
+
 Upload ASDC Heat Package
     [Documentation]    Creates an asdc Software Product and returns its id
     [Arguments]    ${software_product_id}    ${file_path}   ${version_id}=0.1
-    ${file}=    Get Binary File     ${file_path}
-    ${files}=     Create Dictionary     upload=${file}
+     ${files}=     Create Dictionary
+     Create Multi Part     ${files}  upload  ${file_path}    contentType=application/zip
     ${resp}=    Run ASDC Post Files Request    ${ASDC_VENDOR_SOFTWARE_PRODUCT_PATH}/${software_product_id}/versions/${version_id}${ASDC_VENDOR_SOFTWARE_UPLOAD_PATH}     ${files}    ${ASDC_DESIGNER_USER_ID}
        Should Be Equal As Strings      ${resp.status_code}     200
+
 Add ASDC Catalog Service
     [Documentation]    Creates an asdc Catalog Service and returns its id
     [Arguments]   ${catalog_service_name}
@@ -431,6 +434,7 @@ Run ASDC Put Request
     ${resp}=   Put Request     asdc    ${data_path}     data=${data}    headers=${headers}
     Log    Received response from asdc ${resp.text}
     [Return]    ${resp}
+
 Run ASDC Post Files Request
     [Documentation]    Runs an ASDC post request
     [Arguments]    ${data_path}    ${files}    ${user}=${ASDC_DESIGNER_USER_ID}
@@ -442,6 +446,7 @@ Run ASDC Post Files Request
     ${resp}=   Post Request    asdc    ${data_path}     files=${files}    headers=${headers}
     Log    Received response from asdc ${resp.text}
     [Return]    ${resp}
+
 Run ASDC Post Request
     [Documentation]    Runs an ASDC post request
     [Arguments]    ${data_path}    ${data}    ${user}=${ASDC_DESIGNER_USER_ID}
@@ -471,9 +476,17 @@ Open ASDC GUI
     ##Setup Browser
     Go To    ${ASDC_FE_ENDPOINT}${PATH}
     Maximize Browser Window
-    Set Selenium Speed    ${GLOBAL_SELENIUM_DELAY}
+
     Set Browser Implicit Wait    ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}
     Log    Logging in to ${ASDC_FE_ENDPOINT}${PATH}
     Title Should Be    ASDC
     Wait Until Page Contains Element    xpath=//div/a[text()='SDC']    ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
     Log    Logged in to ${ASDC_FE_ENDPOINT}${PATH}
+
+
+Create Multi Part
+   [Arguments]  ${addTo}  ${partName}  ${filePath}  ${contentType}=${None}
+   ${fileData}=   Get Binary File  ${filePath}
+   ${fileDir}  ${fileName}=  Split Path  ${filePath}
+   ${partData}=  Create List  ${fileName}  ${fileData}  ${contentType}
+   Set To Dictionary  ${addTo}  ${partName}=${partData}