Move on_reconnect to client level (#2111)

Author: janiversen

pymodbus/client/base.py

@@ -188,6 +188,8 @@ def callback_new_connection(self):
 
     def callback_connected(self) -> None:
         """Call when connection is succcesfull."""
+        if self.on_reconnect_callback:
+            self.on_reconnect_callback()
 
     def callback_disconnected(self, exc: Exception | None) -> None:
         """Call when connection is lost."""
@@ -311,7 +313,6 @@ def __init__(
         broadcast_enable: bool = False,
         reconnect_delay: float = 0.1,
         reconnect_delay_max: float = 300.0,
-        on_reconnect_callback: Callable[[], None] | None = None,
         no_resend_on_retry: bool = False,
         **kwargs: Any,
     ) -> None:
@@ -332,7 +333,6 @@ def __init__(
             parity=kwargs.get("parity", None),
             stopbits=kwargs.get("stopbits", None),
             handle_local_echo=kwargs.get("handle_local_echo", False),
-            on_reconnect_callback=on_reconnect_callback,
         )
         self.params = self._params()
         self.params.retries = int(retries)

pymodbus/transport/transport.py

@@ -87,7 +87,6 @@ class CommParams:
     port: int = 0
     source_address: tuple[str, int] | None = None
     handle_local_echo: bool = False
-    on_reconnect_callback: Callable[[], None] | None = None
 
     # tls
     sslctx: ssl.SSLContext | None = None
@@ -471,8 +470,6 @@ async def do_reconnect(self) -> None:
                     self.reconnect_delay_current * 1000,
                 )
                 await asyncio.sleep(self.reconnect_delay_current)
-                if self.comm_params.on_reconnect_callback:
-                    self.comm_params.on_reconnect_callback()
                 if await self.connect():
                     break
                 self.reconnect_delay_current = min(

test/transport/test_protocol.py

@@ -301,7 +301,6 @@ async def test_do_reconnect(self, client):
         assert client.reconnect_delay_current == client.comm_params.reconnect_delay * 2
         assert not client.reconnect_task
         client.connect.side_effect = asyncio.CancelledError("stop loop")
-        client.comm_params.on_reconnect_callback = mock.Mock()
         await client.do_reconnect()
         assert client.reconnect_delay_current == client.comm_params.reconnect_delay
         assert not client.reconnect_task

test/transport/test_reconnect.py

@@ -28,7 +28,6 @@ async def test_no_reconnect_call(self, client):
 
     async def test_reconnect_call(self, client):
         """Test connection_lost()."""
-        client.comm_params.on_reconnect_callback = mock.MagicMock()
         client.loop = asyncio.get_running_loop()
         client.call_create = mock.AsyncMock(return_value=(None, None))
         await client.connect()
@@ -39,7 +38,6 @@ async def test_reconnect_call(self, client):
         assert client.reconnect_task
         assert client.call_create.call_count == 2
         assert client.reconnect_delay_current == client.comm_params.reconnect_delay * 2
-        assert client.comm_params.on_reconnect_callback.called
         client.close()
 
     async def test_multi_reconnect_call(self, client):