Checking that no flows are provisioned on a disabled device
Change-Id: If715b330f934411aa4716742d734a757a053c8bf
diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index 0e697d1..4010aed 100755
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -274,24 +274,19 @@
Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate ONUs After OLT Disable
... ${num_onus} ${olt_serial_number}
# Verify ONOS Flows
- # Number of Access Flows on ONOS equals 4 * the Number of Active ONUs (2 for each downstream and upstream)
- ${onos_flows_count}= Evaluate 4 * ${num_onus}
+ # When we disable the device we shouldn't have any flows provisioned on it
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
... Verify Subscriber Access Flows Added Count DT ${ONOS_SSH_IP} ${ONOS_SSH_PORT}
- ... ${of_id} ${onos_flows_count}
+ ... ${of_id} 0
# Verify VOLTHA Flows
- # Number of per OLT Flows equals Twice the Number of Active ONUs (each for downstream and upstream) + 1 for LLDP
- ${olt_flows}= Evaluate 2 * ${num_onus} + 1
- # Number of per ONU Flows equals 2 (one each for downstream and upstream)
- ${onu_flows}= Set Variable 2
- Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Flows
- ... ${olt_flows} ${olt_device_id}
+ Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Flows 0
+ ... ${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}
Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate ONU Flows
- ... ${List_ONU_Serial} ${onu_flows}
+ ... ${List_ONU_Serial} 0
# 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
diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index 4cded53..8084f95 100755
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -139,28 +139,12 @@
Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate ONUs After OLT Disable
... ${num_onus} ${olt_serial_number}
# Verify ONOS Flows
- # 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
+ # When we disable the device we shouldn't have any flows provisioned on it
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}
- ... ${onos_flows_count}
+ ... Verify Added Flow Count for OLT TT ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} 0
# Verify VOLTHA Flows
- # 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}
+ Run Keyword Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Flows 0
... ${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