Allow ONU to be in either tech-profile-config-download-success or omci-flows-pushed state
Change-Id: I6a914b23eb9718fecf3100220f41338406ee2c8e
diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index 88541c7..1396285 100644
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -68,7 +68,7 @@
Should Be Equal As Integers ${rc2} 0
Validate Device
- [Arguments] ${serial_number} ${admin_state} ${oper_status} ${connect_status} ${onu_reason}=${EMPTY} ${onu}=False
+ [Arguments] ${serial_number} ${admin_state} ${oper_status} ${connect_status} ${onu_reasons}=${EMPTY} ${onu}=False
[Documentation] Parses the output of "voltctl device list" and inspects device ${serial_number}
... Arguments are matched for device states of: "admin_state", "oper_status", and "connect_status"
${output}= Run ${VOLTCTL_CONFIG}; voltctl device list -o json
@@ -87,7 +87,7 @@
Should Be Equal ${astate} ${admin_state} Device ${serial_number} admin_state != ENABLED values=False
Should Be Equal ${opstatus} ${oper_status} Device ${serial_number} oper_status != ACTIVE values=False
Should Be Equal ${cstatus} ${connect_status} Device ${serial_number} connect_status != REACHABLE values=False
- Run Keyword If '${onu}' == 'True' Should Be Equal ${mib_state} ${onu_reason} Device ${serial_number} mib_state incorrect values=False
+ Run Keyword If '${onu}' == 'True' Should Contain ${onu_reasons} ${mib_state} Device ${serial_number} mib_state incorrect values=False
Get Device ID From SN
[Arguments] ${serial_number}
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 1c6816d..1bb83c4 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -128,8 +128,9 @@
Enable Device ${olt_device_id}
Wait Until Keyword Succeeds ${timeout} 5s Validate Device ${olt_serial_number} ENABLED ACTIVE
... REACHABLE
+ ${onu_reasons}= Create List tech-profile-config-download-success omci-flows-pushed
Wait Until Keyword Succeeds ${timeout} 5s Validate Device ${onu_serial_number} ENABLED ACTIVE
- ... REACHABLE onu=True onu_reason=tech-profile-config-download-success
+ ... REACHABLE onu=True onu_reasons=${onu_reasons}
${onu_device_id}= Get Device ID From SN ${onu_serial_number}
Set Suite Variable ${onu_device_id}
${logical_id}= Get Logical Device ID From SN ${olt_serial_number}