main: refactor loading and configuration of configured sub-systems

Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
siemens · Nov 19, 2023 · fc14036 · fc14036
1 parent 20b795a
commit fc14036
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 212 deletions.
diff --git a/mtda/console/docker.py b/mtda/console/docker.py
@@ -24,7 +24,7 @@ class DockerConsole(ConsoleInterface):
 
     def __init__(self, mtda):
         self.mtda = mtda
-        self.docker = mtda.power_controller
+        self.docker = mtda.power
         self._fd = None
         self._opened = False
         self._socket = None

diff --git a/mtda/console/logger.py b/mtda/console/logger.py
@@ -20,12 +20,12 @@
 class ConsoleLogger:
 
     def __init__(self, mtda, console, socket=None,
-                 power_controller=None, topic=b'CON',
+                 power=None, topic=b'CON',
                  www=None):
         self.mtda = mtda
         self.console = console
         self._prompt = "=> "
-        self.power_controller = power_controller
+        self.power = power
         self.prints = True
         self.rx_active = threading.Event()
         self.rx_alive = False

diff --git a/mtda/console/qemu.py b/mtda/console/qemu.py
@@ -22,7 +22,7 @@ class QemuConsole(ConsoleInterface):
 
     def __init__(self, mtda):
         self.mtda = mtda
-        self.qemu = mtda.power_controller
+        self.qemu = mtda.power
         self.opened = False
 
     """ Configure this console from the provided configuration"""

diff --git a/mtda/keyboard/qemu.py b/mtda/keyboard/qemu.py
@@ -20,7 +20,7 @@ class QemuController(KeyboardController):
 
     def __init__(self, mtda):
         self.mtda = mtda
-        self.qemu = mtda.power_controller
+        self.qemu = mtda.power
 
     def configure(self, conf):
         self.mtda.debug(3, "keyboard.qemu.configure()")