[VOL-3098] ONU Delete and Auto-Discovery

Change-Id: I752a47cb8452f8d5fe32b38b611788249ba2de11
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 19ffb88..8aa74c0 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -1074,15 +1074,14 @@
     #Run Keyword and Ignore Error    Get Logical Device Output from Voltha    ${logical_id}
     Get ONOS Status    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}
 
-Verify ping is succesful except for given device
-    [Arguments]    ${num_onus}    ${exceptional_onu_id}
+Verify ping is successful except for given device
+    [Arguments]    ${num_onus}    ${exceptional_onu}
     [Documentation]    Checks that ping for all the devices are successful except the given ONU.
     ${pingStatus}     Set Variable    True
     FOR    ${I}    IN RANGE    0    ${num_all_onus}
         ${src}=    Set Variable    ${hosts.src[${I}]}
         ${dst}=    Set Variable    ${hosts.dst[${I}]}
-        ${onu_device_id}=    Get Device ID From SN    ${src['onu']}
-        ${pingStatus}     Run Keyword If    '${onu_device_id}' == '${exceptional_onu_id}'    Set Variable     False
+        ${pingStatus}     Run Keyword If    '${src['onu']}' == '${exceptional_onu}'    Set Variable     False
         Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure
         ...    Wait Until Keyword Succeeds    60s    2s
         ...    Check Ping    ${pingStatus}    ${dst['dp_iface_ip_qinq']}    ${src['dp_iface_name']}