[VOL-3147] Fixing possible issues from tests, restoring timers
Change-Id: I988e42bf217443a5e5791c6ba64ce4876cff4026
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 631365e..c47234d 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -262,9 +262,9 @@
[Documentation] Pre-test Setup
#test for empty device list
Test Empty Device List
- Run Keyword If ${has_dataplane} Wait Until Keyword Succeeds 120s 10s Openolt is Up
- ... ${olt_ip} ${olt_user} ${olt_pass}
- Run Keyword If ${has_dataplane} Sleep 60s
+ #Run Keyword If ${has_dataplane} Wait Until Keyword Succeeds 120s 10s Openolt is Up
+ #... ${olt_ip} ${olt_user} ${olt_pass}
+ Run Keyword If ${has_dataplane} Sleep 180s
#create/preprovision device
${olt_device_id}= Create Device ${olt_ip} ${OLT_PORT}
Set Suite Variable ${olt_device_id}
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 55d176d..d0090a4 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -261,7 +261,7 @@
Run Keyword And Continue On Failure Wait Until Keyword Succeeds 120s 2s
... Verify ONU Port Is Enabled ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${onu_port}
Disable Device ${onu_device_id}
- Sleep 30s
+ Sleep 10s
Wait Until Keyword Succeeds ${timeout} 2s Execute ONOS CLI Command ${ONOS_SSH_IP}
... ${ONOS_SSH_PORT} volt-remove-subscriber-access ${of_id} ${onu_port}
Run Keyword If ${has_dataplane} Run Keyword And Continue On Failure
@@ -280,7 +280,7 @@
... ${ONOS_SSH_PORT} ${onu_port}
Wait Until Keyword Succeeds ${timeout} 2s Execute ONOS CLI Command ${ONOS_SSH_IP}
... ${ONOS_SSH_PORT} volt-add-subscriber-access ${of_id} ${onu_port}
- Sleep 30s
+ Sleep 10s
# Verify subscriber access flows are added for the ONU port
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
... Verify Subscriber Access Flows Added For ONU ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id}