User defined wait on BMC or host activation completion
Added "wait" argument so that user can decide if it needs to wait
for activation to complete. This is needed for other use cases in
code update where it doesn't need to wait.
Change-Id: I076431616c39594b3317292c6e997ff3ab745aa1
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/lib/code_update_utils.robot b/lib/code_update_utils.robot
index 2346147..82fbc94 100644
--- a/lib/code_update_utils.robot
+++ b/lib/code_update_utils.robot
@@ -136,10 +136,12 @@
Upload And Activate Image
[Documentation] Upload an image to the BMC and activate it with REST.
- [Arguments] ${image_file_path}
+ [Arguments] ${image_file_path} ${wait}=${1}
# Description of argument(s):
- # image_file_path The path to the image tarball to upload and activate.
+ # image_file_path The path to the image tarball to upload and activate.
+ # wait Indicates that this keyword should wait for host or
+ # BMC activation is completed.
OperatingSystem.File Should Exist ${image_file_path}
${image_version}= Get Version Tar ${image_file_path}
@@ -161,6 +163,9 @@
Should Be Equal As Strings &{software_state}[RequestedActivation]
... ${REQUESTED_ACTIVE}
+ # Does caller want to wait for activation to complete?
+ Run Keyword If '${wait}' == '${0}' Return From Keyword
+
# Verify code update was successful and Activation state is Active.
Wait For Activation State Change ${version_id} ${ACTIVATING}
${software_state}= Read Properties ${SOFTWARE_VERSION_URI}${version_id}