fixing test bugs
Change-Id: Iab3615f300084676e99e4cab564b451e2400a5e5
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 1ecde32..9e59780 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -223,6 +223,7 @@
Delete Device and Verify
[Documentation] Disable -> Delete devices via voltctl and verify its removed
+ ${olt_device_id}= Get Device ID From SN ${olt_serial_number}
${rc} ${output}= Run and Return Rc and Output
... ${VOLTCTL_CONFIG}; voltctl device disable ${olt_device_id}
Should Be Equal As Integers ${rc} 0
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 76908b5..1fc6fe8 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -47,7 +47,7 @@
${timeout} 60s
${of_id} 0
${logical_id} 0
-${has_dataplane} False
+${has_dataplane} True
${external_libs} True
${teardown_device} False
${scripts} ../../scripts
@@ -55,7 +55,7 @@
*** Test Cases ***
Adding the same OLT before and after enabling the device
[Documentation] Create OLT, Create the same OLT again and Check for the Error message
- [Tags] VOL-2405 VOL-2406 AddSameOLT notready
+ [Tags] VOL-2405 VOL-2406 AddSameOLT functional
[Setup] None
[Teardown] None
${olt_device_id}= Create Device ${olt_ip} ${OLT_PORT}
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 1a18893..c24b683 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -331,7 +331,7 @@
... Disable and Delete the OLT
... Create/Enable the same OLT again
... Validate authentication/DHCP/E2E pings succeed for all the ONUs connected to the OLT
- [Tags] functional DeleteOLT notready
+ [Tags] functional DeleteOLT
[Setup] None
[Teardown] NONE
Run Keyword If ${has_dataplane} Clean Up Linux
@@ -344,7 +344,7 @@
Adding the same OLT after enabling the device
[Documentation] Create OLT, enable it, Create the same OLT again and Check for the Error message
- [Tags] VOL-2406 AddEnableOLT_AddTheSameOLTAgain functional
+ [Tags] VOL-2406 AddEnableOLT_AddTheSameOLTAgain notready
[Setup] Delete Device and Verify
[Teardown] None
Run Keyword If ${has_dataplane} Sleep 180s