diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index 869d7ac..14c759f 100644
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -600,37 +600,13 @@
     ...    Assuming that all the ONUs are DHCP/pingable (i.e. assuming sanityDt test was executed)
     ...    Perform disable on the OLT PON Port and validate that the pings do not succeed
     ...    Perform enable on the OLT PON Port and validate that the pings are successful
-    [Tags]    functionalDt    DisableEnableOltPonPortDt    VOL-2577    notready
+    [Tags]    functionalDt    DisableEnableOltPonPortDt    VOL-2577
     [Setup]    Start Logging    DisableEnableOltPonPortDt
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    DisableEnableOltPonPortDt
-    TODO: Fix the keywords and test later
-    ${olt_pon_port_list}=    Retrieve OLT PON Ports    ${olt_device_id}
-    ${olt_pon_port_list_len}=    Get Length    ${olt_pon_port_list}
-    FOR    ${INDEX0}    IN RANGE    0    ${olt_pon_port_list_len}
-        ${olt_pon_port}=    Get From List    ${olt_pon_port_list}    ${INDEX0}
-        ${olt_peer_list}=    Retrieve Peer List From OLT PON Port    ${olt_device_id}    ${olt_pon_port}
-        # Disable the OLT PON Port and Validate OLT Device
-        DisableOrEnable OLT PON Port    disable    ${olt_device_id}    ${olt_pon_port}
-        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s
-        ...    Validate OLT PON Port Status    ${olt_device_id}    ${olt_pon_port}
-        ...    DISABLED    DISCOVERED
-        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s
-        ...    Validate OLT Device    ENABLED    ACTIVE    REACHABLE
-        ...    ${olt_serial_number}
-        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s
-        ...    Validate ONUs for PON OLT Disable DT    ${olt_peer_list}
-        Sleep    15s
-        # Enable the OLT PON Port back, and check ONU status are back to "ACTIVE"
-        DisableOrEnable OLT PON Port    enable    ${olt_device_id}    ${olt_pon_port}
-        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s
-        ...    Validate OLT PON Port Status    ${olt_device_id}    ${olt_pon_port}
-        ...    ENABLED    ACTIVE
-        # Waiting extra time for the ONUs to come up
-        Sleep    60s
-        ${olt_peer_list_new}=    Retrieve Peer List From OLT PON Port    ${olt_device_id}    ${olt_pon_port}
-        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s
-        ...    Validate ONUs for PON OLT Enable DT    ${olt_peer_list_new}
+    FOR   ${I}    IN RANGE    0    ${olt_count}
+        ${olt_serial_number}=    Get From Dictionary    ${olt_ids}[${I}]    sn
+        Disable Enable PON Port Per OLT DT    ${olt_serial_number}
     END
 
 *** Keywords ***
@@ -649,4 +625,3 @@
     Delete All Devices and Verify
     # Execute normal test Setup Keyword
     Setup
-