Add Retry to Distribution

Issue-ID: AAI-1181
Change-Id: I47fcf5d69caa20d098c2a2b4e056bb669cbd0284
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 0f9c76a..c4c79ca 100644 (file)
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -68,11 +68,23 @@ Distribute Model From ASDC
     # on certify it gets a new id
     ${catalog_service_id}=    Certify ASDC Catalog Service    ${catalog_service_id}
     Approve ASDC Catalog Service    ${catalog_service_id}
-       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
-       Wait Until Keyword Succeeds   180   15    Check Catalog Service Distributed    ${catalog_service_resp['uuid']}
+        : FOR   ${DIST_INDEX}    IN RANGE   1     3
+        \   Log     Distribution Attempt ${DIST_INDEX}
+        \   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
+        \   ${status}   Loop Over Check Catalog Service Distributed       ${catalog_service_resp['uuid']}
+       \   Exit For Loop If   ${status}
     [Return]    ${catalog_service_resp['name']}    ${loop_catalog_resource_resp['name']}    ${vf_module}   ${catalog_resource_ids}    ${catalog_service_id}   ${catalog_resources}
+
+Loop Over Check Catalog Service Distributed
+    [Arguments]    ${catalog_service_id} 
+    : FOR     ${CHECK_INDEX}  IN RANGE   1   7  
+    \   ${status}     Run Keyword And Ignore Error     Check Catalog Service Distributed    ${catalog_service_id}   
+    \   Sleep     15s  
+    \   Exit For Loop if   ${status}
+    [Return]   ${status}
+
 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}