diff --git a/libraries/onos.robot b/libraries/onos.robot
index 3137373..fefa21a 100755
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -583,13 +583,13 @@
     Should Not Be Empty    ${allocations}    ONU port ${onu_port} not found in dhcpl2relay-allocations
 
 Device Is Available In ONOS
-    [Arguments]    ${url}    ${dpid}
-    [Documentation]    Validates the device exists and it available in ONOS
+    [Arguments]    ${url}    ${dpid}    ${available}=true
+    [Documentation]    Validates the device exists and it has the expected availability in ONOS
     ${rc}    ${json}    Run And Return Rc And Output    curl --fail -sSL ${url}/onos/v1/devices/${dpid}
     Should Be Equal As Integers    0    ${rc}
     ${rc}    ${value}    Run And Return Rc And Output    echo '${json}' | jq -r .available
     Should Be Equal As Integers    0    ${rc}
-    Should Be Equal    'true'    '${value}'
+    Should Be Equal    ${available}    ${value}
 
 Remove All Devices From ONOS
     [Arguments]    ${url}