VOL-2815 voltctl return code changed
Change-Id: I456dda8b485d7e879313c23a0fc82d0b239ebd80
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 6890abc..1d57365 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -168,11 +168,11 @@
[Tags] functional DisablePreprovisionedOLTCheck
[Setup] Run Keywords Announce Message START TEST DisablePreprovisionedOLTCheck
... AND Start Logging DisablePreprovisionedOLTCheck
- ... AND Delete Device and Verify
+ ... AND Delete All Devices and Verify
[Teardown] Run Keywords Collect Logs
... AND Stop Logging DisablePreprovisionedOLTCheck
... AND Announce Message END TEST DisablePreprovisionedOLTCheck
- Run Keyword If ${has_dataplane} Sleep 180s
+ Sleep 180s
Run Keyword and Ignore Error Collect Logs
#create/preprovision device
${olt_device_id}= Create Device ${olt_ip} ${OLT_PORT}
@@ -182,7 +182,7 @@
... ${olt_device_id}
#Try disabling pre-provisioned OLT
${rc} ${output}= Run and Return Rc and Output ${VOLTCTL_CONFIG}; voltctl device disable ${olt_device_id}
- Should Be Equal As Integers ${rc} 0
+ Should Not Be Equal As Integers ${rc} 0
Log ${output}
Should Contain ${output} invalid-admin-state:PREPROVISIONED
#Enable OLT
@@ -206,7 +206,7 @@
[Tags] functional DisableDelete_LogicalDevice
[Setup] Run Keywords Announce Message START TEST DisableDelete_LogicalDevice
... AND Start Logging DisableDelete_LogicalDevice
- ... AND Delete Device and Verify
+ ... AND Delete All Devices and Verify
[Teardown] Run Keywords Collect Logs
... AND Stop Logging DisableDelete_LogicalDevice
... AND Announce Message END TEST DisableDelete_LogicalDevice
@@ -230,12 +230,12 @@
Should Not Be Empty ${logical_id}
${rc} ${output}= Run and Return Rc and Output
... ${VOLTCTL_CONFIG}; voltctl logicaldevice disable ${logical_id}
- Should Be Equal As Integers ${rc} 0
+ Should Not Be Equal As Integers ${rc} 0
Log ${output}
Should Contain '${output}' Unknown command
${rc} ${output1}= Run and Return Rc and Output
... ${VOLTCTL_CONFIG}; voltctl logicaldevice delete ${logical_id}
- Should Be Equal As Integers ${rc} 0
+ Should Not Be Equal As Integers ${rc} 0
Log ${output1}
Should Contain '${output1}' Unknown command
@@ -249,7 +249,7 @@
[Teardown] Run Keywords Collect Logs
... AND Stop Logging LogicalDeviceCheck
... AND Announce Message END TEST LogicalDeviceCheck
- Delete Device and Verify
+ Delete All Devices and Verify
${logical_id}= Get Logical Device ID From SN ${olt_serial_number}
Should Be Empty ${logical_id}
Run Keyword If ${has_dataplane} Sleep 180s