commit 6fd3caed37f6059eeb12888d06d7fce656a3fb4a
author Hardik Windlass <hardik@opennetworking.org> Thu Mar 03 08:35:33 2022 +0000
committer Hardik Windlass <hardik@opennetworking.org> Fri Mar 04 07:59:35 2022 +0000
tree ff2911abe080204e42f0ce72885252e180c69de1
parent 8adefc2a0ff39c3f8bbf644965148726205e3fef

[VOL-4645] Updated onu-upgrade scale test to bulk verify onu image status

Change-Id: Ibd3575303279e690d704509e9cfa51ba4075b9ef

tests/scale/Voltha_Scale_Tests.robot

diff --git a/tests/scale/Voltha_Scale_Tests.robot b/tests/scale/Voltha_Scale_Tests.robot
index 3034e70..e2ef26e 100755
--- a/tests/scale/Voltha_Scale_Tests.robot
+++ b/tests/scale/Voltha_Scale_Tests.robot
@@ -186,8 +186,8 @@
     ${activated}=    Set Variable If    '${image_activate_on_success}'=='true'    True    False
     ${committed}=    Set Variable If    '${image_activate_on_success}'=='true' and '${image_commit_on_success}'=='true'
     ...    True    False
-    Wait Until Keyword Succeeds    ${timeout}    10s    Verify ONU Device Image Status    ${image_version}
-    ...    ${onu_device_id_str}    DOWNLOAD_SUCCEEDED    NO_ERROR    ${imageState}
+    Wait for ONUs Image Status in VOLTHA    ${total_onus}    ${image_version}    DOWNLOAD_SUCCEEDED    NO_ERROR    ${imageState}
+    ...    ${timeout}
     FOR    ${onu_device_id}    IN    @{list_onu_device_id}
         Wait Until Keyword Succeeds    ${timeout}    10s    Verify ONU Device Image List    ${onu_device_id}
         ...    ${image_version}    ${committed}    ${activated}    True
@@ -206,8 +206,8 @@
     Activate ONU Device Image    ${image_version}    ${image_commit_on_success}    ${onu_device_id_str}
     ${imageState}=    Set Variable If    '${image_commit_on_success}'=='true'    IMAGE_COMMITTED    IMAGE_ACTIVE
     ${committed}=    Set Variable If    '${image_commit_on_success}'=='true'    True    False
-    Wait Until Keyword Succeeds    ${timeout}    10s    Verify ONU Device Image Status    ${image_version}
-    ...    ${onu_device_id_str}    DOWNLOAD_SUCCEEDED    NO_ERROR    ${imageState}
+    Wait for ONUs Image Status in VOLTHA    ${total_onus}    ${image_version}    DOWNLOAD_SUCCEEDED    NO_ERROR    ${imageState}
+    ...    ${timeout}
     FOR    ${onu_device_id}    IN    @{list_onu_device_id}
         Wait Until Keyword Succeeds    ${timeout}    10s    Verify ONU Device Image List    ${onu_device_id}
         ...    ${image_version}    ${committed}    True    True
@@ -224,8 +224,8 @@
     ${list_onu_device_id}=    Get ONUs Device IDs from Voltha
     ${onu_device_id_str}=    Catenate    @{list_onu_device_id}
     Commit ONU Device Image    ${image_version}    ${onu_device_id_str}
-    Wait Until Keyword Succeeds    ${timeout}    10s    Verify ONU Device Image Status    ${image_version}
-    ...    ${onu_device_id_str}    DOWNLOAD_SUCCEEDED    NO_ERROR    IMAGE_COMMITTED
+    Wait for ONUs Image Status in VOLTHA    ${total_onus}    ${image_version}    DOWNLOAD_SUCCEEDED    NO_ERROR    IMAGE_COMMITTED
+    ...    ${timeout}
     FOR    ${onu_device_id}    IN    @{list_onu_device_id}
         Wait Until Keyword Succeeds    ${timeout}    10s    Verify ONU Device Image List    ${onu_device_id}
         ...    ${image_version}    True    True    True