[OMCProcessDocker*] move content to OMCProcessDockerHelper

Author: syntron

OMPython/OMCSession.py

@@ -601,14 +601,24 @@ def _omc_port_get(self) -> str:
 
 class OMCProcessDockerHelper(OMCProcess):
 
-    def __init__(self, **kwargs) -> None:
-        super().__init__(**kwargs)
+    def __init__(
+            self,
+            timeout: float = 10.00,
+            dockerExtraArgs: Optional[list] = None,
+            dockerOpenModelicaPath: str = "omc",
+            dockerNetwork: Optional[str] = None,
+            port: Optional[int] = None,
+    ) -> None:
+        super().__init__(timeout=timeout)
 
-        self._dockerExtraArgs: list = []
-        self._dockerOpenModelicaPath: Optional[str] = None
-        self._dockerNetwork: Optional[str] = None
+        if dockerExtraArgs is None:
+            dockerExtraArgs = []
+
+        self._dockerExtraArgs = dockerExtraArgs
+        self._dockerOpenModelicaPath = dockerOpenModelicaPath
+        self._dockerNetwork = dockerNetwork
 
-        self._interactivePort: Optional[int] = None
+        self._interactivePort = port
 
         self._dockerCid: Optional[str] = None
         self._docker_process: Optional[DummyPopen] = None
@@ -696,22 +706,19 @@ def __init__(
             port: Optional[int] = None,
     ) -> None:
 
-        super().__init__(timeout=timeout)
+        super().__init__(
+            timeout=timeout,
+            dockerExtraArgs=dockerExtraArgs,
+            dockerOpenModelicaPath=dockerOpenModelicaPath,
+            dockerNetwork=dockerNetwork,
+            port=port,
+        )
 
         if docker is None:
             raise OMCSessionException("Argument docker must be set!")
 
         self._docker = docker
 
-        if dockerExtraArgs is None:
-            dockerExtraArgs = []
-
-        self._dockerExtraArgs = dockerExtraArgs
-        self._dockerOpenModelicaPath = dockerOpenModelicaPath
-        self._dockerNetwork = dockerNetwork
-
-        self._interactivePort = port
-
         # start up omc executable in docker container waiting for the ZMQ connection
         self._omc_process, self._docker_process, self._dockerCid = self._docker_omc_start()
         # connect to the running omc instance using ZMQ
@@ -839,22 +846,19 @@ def __init__(
             port: Optional[int] = None,
     ) -> None:
 
-        super().__init__(timeout=timeout)
+        super().__init__(
+            timeout=timeout,
+            dockerExtraArgs=dockerExtraArgs,
+            dockerOpenModelicaPath=dockerOpenModelicaPath,
+            dockerNetwork=dockerNetwork,
+            port=port,
+        )
 
         if not isinstance(dockerContainer, str):
             raise OMCSessionException("Argument dockerContainer must be set!")
 
         self._dockerCid = dockerContainer
 
-        if dockerExtraArgs is None:
-            dockerExtraArgs = []
-
-        self._dockerExtraArgs = dockerExtraArgs
-        self._dockerOpenModelicaPath = dockerOpenModelicaPath
-        self._dockerNetwork = dockerNetwork
-
-        self._interactivePort = port
-
         # start up omc executable in docker container waiting for the ZMQ connection
         self._omc_process, self._docker_process = self._docker_omc_start()
         # connect to the running omc instance using ZMQ