-| Find ODL client on node
-| | [Arguments] | ${node}
-| | ${odl_present}= | Find ODL Client | ${node}
-| | Return from keyword | ${odl_present}
-
-| Start ODL client on node
-| | [Arguments] | ${node}
-| | Start ODL client | ${node}
-| | Wait until keyword succeeds | 4min | 20sec
+| Setup ODL Client Service On DUT
+| | [Arguments] | ${node} | ${odl_name}
+| | Setup ODL client | ${node} | ${odl_name}
+| | Wait until keyword succeeds | 4min | 16sec