Adapt sw upgrade status in tests
Change-Id: I884b042fae357cb15c7dbb472bce6fc389ae97b0
diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index 629259b..f0e873a 100755
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -871,7 +871,7 @@
... voltctl -c ${VOLTCTL_CONFIG} device onuimage activate ${ver} ${commit} ${id} -o json
Log ${output}
Should Be Equal As Integers ${rc} 0
- Validate ONU Device Image ${output} ${ver} ${id} DOWNLOAD_STARTED NO_ERROR IMAGE_ACTIVATING
+ Validate ONU Device Image ${output} ${ver} ${id} DOWNLOAD_SUCCEEDED NO_ERROR IMAGE_ACTIVATING
Commit ONU Device Image
[Documentation] Commits the given ONU software image
@@ -880,7 +880,7 @@
... voltctl -c ${VOLTCTL_CONFIG} device onuimage commit ${ver} ${id} -o json
Log ${output}
Should Be Equal As Integers ${rc} 0
- Validate ONU Device Image ${output} ${ver} ${id} DOWNLOAD_STARTED NO_ERROR IMAGE_COMMITTING
+ Validate ONU Device Image ${output} ${ver} ${id} DOWNLOAD_SUCCEEDED NO_ERROR IMAGE_COMMITTING
Abort ONU Device Image
[Documentation] Aborts the given ONU software image
@@ -891,6 +891,13 @@
Should Be Equal As Integers ${rc} 0
Validate ONU Device Image ${output} ${ver} ${id} ${download_state} ${expected_reason} ${image_state}
+Remove Adapter Image
+ [Documentation] Aborts the upgrade processing for a given ONU software image and thus removes the image from adapter
+ [Arguments] ${ver} ${id}
+ ${rc} ${output}= Run and Return Rc and Output
+ ... voltctl -c ${VOLTCTL_CONFIG} device onuimage abort ${ver} ${id} -o json
+ Log ${output}
+
Verify ONU Device Image Status
[Documentation] Verfies the ONU device image state
[Arguments] ${image_version} ${dev_id} ${download_state} ${expected_reason} ${image_state}