refactor: Restructure and rename bus provider modules and classes

Renamed and moved `BusProvider` and `BusProviderIo` to
`BusProviderMiddleware1` and `BusProviderIos1` respectively for better
clarity and modular organization. Updated all related imports and
references accordingly.

Signed-off-by: Sven Sager <s.sager@kunbus.com>

src/revpi_middleware/daemon.py

@@ -11,9 +11,9 @@ from typing import Union, List
 from dbus import SystemBus, SessionBus
 
 from . import proginit as pi
-from .dbus_middleware1.bus_provider import BusProvider
+from .dbus_ios1 import BusProviderIos1
+from .dbus_middleware1 import BusProviderMiddleware1
 from .helper import get_new_session_dbus_connection, get_new_system_dbus_connection
-from .ios1.bus_provider_io import BusProviderIo
 
 log = getLogger(__name__)
 
@@ -55,12 +55,12 @@ class MiddlewareDaemon:
 
         dbus_middleware1_running = self.bp_middleware1 and self.bp_middleware1.is_alive()
         if not dbus_middleware1_running:
-            self.bp_middleware1 = BusProvider(self._get_bus())
+            self.bp_middleware1 = BusProviderMiddleware1(self._get_bus())
             self.bp_middleware1.start()
 
         dbus_ios1_running = self.bp_ios1 and self.bp_ios1.is_alive()
         if not dbus_ios1_running:
-            self.bp_ios1 = BusProviderIo(self._get_bus())
+            self.bp_ios1 = BusProviderIos1(self._get_bus())
             self.bp_ios1.start()
 
         log.debug("leave MiddlewareDaemon.dbus_start")

src/revpi_middleware/dbus_ios1/__init__.py

@@ -4,3 +4,5 @@
 """D-Bus ios version 1 of revpi_middleware."""
 
 from .ios1_helper import REVPI_DBUS_BASE_PATH, REVPI_DBUS_NAME
+
+from .bus_provider_ios1 import BusProviderIos1

src/revpi_middleware/dbus_ios1/bus_provider_ios1.py

@@ -25,7 +25,7 @@ from .interface_ios import (
 log = getLogger(__name__)
 
 
-class BusProviderIo(Thread):
+class BusProviderIos1(Thread):
 
     def __init__(
         self,
@@ -33,7 +33,7 @@ class BusProviderIo(Thread):
         picontrol_device="/dev/piControl0",
         config_rsc="/etc/revpi/config.rsc",
     ):
-        log.debug("enter BusProviderIo.__init__")
+        log.debug("enter BusProviderIos1.__init__")
         super().__init__()
 
         self._bus = dbus
@@ -50,7 +50,7 @@ class BusProviderIo(Thread):
         self.config_rsc = config_rsc
 
     def run(self):
-        log.debug("enter BusProviderIo.run")
+        log.debug("enter BusProviderIos1.run")
 
         self._lst_device_interfaces.clear()
         self._lst_io_interfaces.clear()
@@ -100,12 +100,12 @@ class BusProviderIo(Thread):
 
         self._modio.cleanup()
 
-        log.debug("leave BusProviderIo.run")
+        log.debug("leave BusProviderIos1.run")
 
     def stop(self):
-        log.debug("enter BusProviderIo.stop")
+        log.debug("enter BusProviderIos1.stop")
         self._loop.quit()
-        log.debug("leave BusProviderIo.stop")
+        log.debug("leave BusProviderIos1.stop")
 
     @property
     def bus(self) -> Union[SystemBus, SessionBus]:

src/revpi_middleware/dbus_middleware1/__init__.py

@@ -6,4 +6,4 @@
 from .dbus_helper import REVPI_DBUS_BASE_PATH, REVPI_DBUS_NAME
 from .dbus_helper import extend_interface
 
-from .bus_provider import BusProvider
+from .bus_provider_middleware1 import BusProviderMiddleware1

src/revpi_middleware/dbus_middleware1/bus_provider_middleware1.py

@@ -17,7 +17,7 @@ from .system_config import InterfaceRevpiConfig, InterfaceSoftwareServices
 log = getLogger(__name__)
 
 
-class BusProvider(Thread):
+class BusProviderMiddleware1(Thread):
 
     def __init__(
         self,
@@ -25,7 +25,7 @@ class BusProvider(Thread):
         picontrol_device="/dev/piControl0",
         config_rsc="/etc/revpi/config.rsc",
     ):
-        log.debug("enter BusProvider.__init__")
+        log.debug("enter BusProviderMiddleware1.__init__")
         super().__init__()
 
         self._bus = dbus
@@ -35,7 +35,7 @@ class BusProvider(Thread):
         self.config_rsc = config_rsc
 
     def run(self):
-        log.debug("enter BusProvider.run")
+        log.debug("enter BusProviderMiddleware1.run")
 
         # The 2nd, 3rd, ... arguments can be objects or tuples of a path and an object
         #   Example(),
@@ -67,12 +67,12 @@ class BusProvider(Thread):
                 _, interface = interface
             interface.cleanup()
 
-        log.debug("leave BusProvider.run")
+        log.debug("leave BusProviderMiddleware1.run")
 
     def stop(self):
-        log.debug("enter BusProvider.stop")
+        log.debug("enter BusProviderMiddleware1.stop")
         self._loop.quit()
-        log.debug("leave BusProvider.stop")
+        log.debug("leave BusProviderMiddleware1.stop")
 
     @property
     def bus(self) -> Union[SystemBus, SessionBus]: