Revert "Checking that no flows are provisioned on a disabled device"
This reverts commit 8b6dc263eca0b35d595f21a1ae62d74e879e95fc.
Revert "fix disable onu reason for all workflows"
This reverts commit 0ec95eb9e0142bc7298133c1334082ce772d184a.
Revert no flows provisioned on disabled device
Change-Id: I96ea99b6ce977d3902216780bcfe01ddcbcfd460
diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index 28d4e5f..4d57cb9 100755
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -146,12 +146,28 @@
Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate ONUs After OLT Disable
... ${num_onus} ${olt_serial_number}
# Verify ONOS Flows
- # When we disable the device should only have 3 default flows LLDP, IGMP and DHCP
+ # Number of Access Flows on ONOS equals 16 * the Number of Active ONUs + 3 for default LLDP, IGMP and DHCP
+ ${onos_flows_count}= Run Keyword If ${has_dataplane} Evaluate 16 * ${num_of_provisioned_onus} + 3
+ ... ELSE Evaluate 15 * ${num_of_provisioned_onus} + 3
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
- ... Verify Added Flow Count for OLT TT ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} 3
+ ... Verify Added Flow Count for OLT TT ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id}
+ ... ${onos_flows_count}
# Verify VOLTHA Flows
- Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Flows 3
+ # Number of per OLT Flows equals 10 * Number of Active ONUs + 3 for default LLDP, IGMP and DHCP
+ ${olt_flows}= Run Keyword If ${has_dataplane} Evaluate 10 * ${num_of_provisioned_onus} + 3
+ ... ELSE Evaluate 9 * ${num_of_provisioned_onus} + 3
+ # Number of per ONU Flows equals 6 for 3play service data plane + 4 for Trap to Host Flows
+ ${onu_flows}= Run Keyword If ${has_dataplane} Set Variable 10
+ ... ELSE Set Variable 9
+ Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Flows ${olt_flows}
... ${olt_device_id}
+ ${List_ONU_Serial} Create List
+ Set Suite Variable ${List_ONU_Serial}
+ Build ONU SN List ${List_ONU_Serial} ${olt_serial_number} ${num_onus}
+ Log ${List_ONU_Serial}
+ # TODO: Fix ${onu_flows} calculations based on UNIs provisioned
+ # Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate ONU Flows
+ # ... ${List_ONU_Serial} ${onu_flows}
# Delete OLT and Validate Empty Device List
Delete Device ${olt_device_id}
# Check that the OLT and the ONUs are actually removed from the system
@@ -248,7 +264,7 @@
Disable Device ${onu_device_id}
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
... Validate Device DISABLED UNKNOWN
- ... REACHABLE ${src['onu']} onu=True onu_reason=tech-profile-config-delete-success
+ ... REACHABLE ${src['onu']} onu=True onu_reason=omci-admin-lock
Wait For All UNI Ports Are Disabled per ONU ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${src['onu']}
Run Keyword If ${has_dataplane} Run Keyword And Continue On Failure
... Wait Until Keyword Succeeds ${timeout} 2s