[VOL-2994] Checking DHCP flows correctly
Change-Id: Ie1bead8bac28b33034e4f49805960dddc0ecc3ad
diff --git a/libraries/onos.robot b/libraries/onos.robot
index 472d56a..3d61332 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -136,17 +136,20 @@
Should Not Be Empty ${downstream_flow_1_added}
# Verify ipv4 dhcp upstream flow
${upstream_flow_ipv4_cmd}= Catenate SEPARATOR=
- ... flows -s ADDED ${olt_of_id} | grep IN_PORT:${onu_port} | grep ETH_TYPE=ipv4 |
- ... grep VLAN_VID:${c_tag} | grep OUTPUT:CONTROLLER
+ ... flows -s ADDED ${olt_of_id} | grep IN_PORT:${onu_port} | grep ETH_TYPE:ipv4 |
+ ... grep IP_PROTO:17 | grep UDP_SRC:68 | grep UDP_DST:67 | grep VLAN_VID:${c_tag} |
+ ... grep OUTPUT:CONTROLLER
${upstream_flow_ipv4_added}= Execute ONOS CLI Command ${ip} ${port}
... ${upstream_flow_ipv4_cmd}
+ Should Not Be Empty ${upstream_flow_ipv4_added}
# Verify ipv4 dhcp downstream flow
# Note: This flow will be one per nni per olt
${downstream_flow_ipv4_cmd}= Catenate SEPARATOR=
- ... flows -s ADDED ${olt_of_id} | grep IN_PORT:${nni_port} | grep ETH_TYPE=ipv4 |
- ... grep OUTPUT:CONTROLLER
+ ... flows -s ADDED ${olt_of_id} | grep IN_PORT:${nni_port} | grep ETH_TYPE:ipv4 |
+ ... grep IP_PROTO:17 | grep UDP_SRC:67 | grep UDP_DST:68 | grep OUTPUT:CONTROLLER
${downstream_flow_ipv4_added}= Execute ONOS CLI Command ${ip} ${port}
... ${downstream_flow_ipv4_cmd}
+ Should Not Be Empty ${downstream_flow_ipv4_added}
Verify Subscriber Access Flows Added for ONU DT
[Arguments] ${ip} ${port} ${olt_of_id} ${onu_port} ${nni_port} ${s_tag}
diff --git a/tests/dt-workflow/Voltha_DT_FailureScenarios.robot b/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
index 6e8a21e..9b9223f 100644
--- a/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
+++ b/tests/dt-workflow/Voltha_DT_FailureScenarios.robot
@@ -90,7 +90,7 @@
# Verify ONU state in voltha
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s Validate Device
... ENABLED ACTIVE REACHABLE
- ... ${src['onu']} onu=True onu_reason=omci-flows-pushed
+ ... ${src['onu']} onu=True onu_reason=discovery-mibsync-complete
# 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 DT ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id}