Customizable timeout for test operations
Change-Id: Ic01245ca43ad0fa07d656e38175ca2315c4cab56
diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index f8c4fb0..7538874 100755
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -826,9 +826,9 @@
Should Be Equal As Integers ${devices} ${count}
Wait for ONUs in VOLTHA
- [Arguments] ${count}
+ [Arguments] ${count} ${timeout}=10m
[Documentation] Waits until a certain number of devices reached the ACTIVE/ENABLE state
- Wait Until Keyword Succeeds 10m 5s Assert ONUs In Voltha ${count}
+ Wait Until Keyword Succeeds ${timeout} 5s Assert ONUs In Voltha ${count}
Count Logical Devices flows
[Documentation] Count the flows across logical devices in VOLTHA
@@ -850,12 +850,12 @@
Wait for Logical Devices flows
[Documentation] Waits until the flows have been provisioned in the logical device
[Arguments] ${workflow} ${uni_count} ${olt_count} ${provisioned}
- ... ${withEapol} ${withDhcp} ${withIgmp} ${withLldp}
+ ... ${withEapol} ${withDhcp} ${withIgmp} ${withLldp} ${timeout}=10m
${targetFlows}= Calculate flows by workflow ${workflow} ${uni_count} ${olt_count} ${provisioned}
... ${withEapol} ${withDhcp} ${withIgmp} ${withLldp}
Log ${targetFlows}
# TODO extend Validate Logical Device Flows to check the correct number of flows
- Wait Until Keyword Succeeds 10m 5s Count Logical Devices flows ${targetFlows}
+ Wait Until Keyword Succeeds ${timeout} 5s Count Logical Devices flows ${targetFlows}
Count OpenOLT Device Flows
[Documentation] Count the flows across openolt devices in VOLTHA
diff --git a/tests/scale/Voltha_Scale_Tests.robot b/tests/scale/Voltha_Scale_Tests.robot
index 67fe2b8..3034e70 100755
--- a/tests/scale/Voltha_Scale_Tests.robot
+++ b/tests/scale/Voltha_Scale_Tests.robot
@@ -119,7 +119,7 @@
Onu Activation in VOLTHA
[Documentation] Check that all ONUs reach the ACTIVE/ENABLED state in VOLTHA
[Tags] activation plot-voltha-onus
- Wait For ONUs In VOLTHA ${total_onus}
+ Wait For ONUs In VOLTHA ${total_onus} ${timeout}
Port Discovery in ONOS
[Documentation] Check that all the UNI ports show up in ONOS
@@ -135,7 +135,7 @@
# NOTE fail the test immediately if we're trying to check flows without provisioning them
Should Be Equal ${enableFlowProvisioning} true
Wait for Logical Devices flows ${workflow} ${total_onus} ${olt} false
- ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP}
+ ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP} ${timeout}
Flows validation in VOLTHA Adapters before subscriber provisioning
[Documentation] Check that all flows has been store in devices of type openolt
@@ -247,7 +247,7 @@
Should Be Equal ${enableFlowProvisioning} true
Wait for Logical Devices flows ${workflow} ${total_onus} ${olt} true
- ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP}
+ ... ${withEapol} ${withDhcp} ${withIgmp} ${withLLDP} ${timeout}
Flows validation in VOLTHA Adapters after subscriber provisioning
[Documentation] Check that all flows has been store in devices of type openolt