WIP: Network docker hassio (#159)

* Create hassio network layer / allow linking

* rename docker

* fix lint

* fix lint p2

* Set network options

* First version of network code

* Finish network layer

* Remove old api_endpoint stuff

* Add DNS forwarding

* Fix DNS recorder

* Fix lint p1

* Fix lint p2

* Fix lint p3

* Fix spell

* Fix ipam struct

* Fix ip to str

* Fix ip to str v2

* Fix spell

* Fix hass on host

* Fix host attach to network

* Cleanup network code

* Fix lint & add debug

* fix link

* Remove log

* Fix network

* fix reattach of supervisor

* set options

* Fix containers

* Fix remapping & add a test

* Fix dict bug

* Fix prop

* Test with run container

* Fix problem

hassio/dock/homeassistant.py

@@ -1,22 +1,19 @@
 """Init file for HassIO docker object."""
-from contextlib import suppress
 import logging
 
-import docker
-
-from . import DockerBase
+from .interface import DockerInterface
 
 _LOGGER = logging.getLogger(__name__)
 
 HASS_DOCKER_NAME = 'homeassistant'
 
 
-class DockerHomeAssistant(DockerBase):
+class DockerHomeAssistant(DockerInterface):
     """Docker hassio wrapper for HomeAssistant."""
 
-    def __init__(self, config, loop, dock, data):
+    def __init__(self, config, loop, api, data):
         """Initialize docker homeassistant wrapper."""
-        super().__init__(config, loop, dock, image=data.image)
+        super().__init__(config, loop, api, image=data.image)
         self.data = data
 
     @property
@@ -47,71 +44,52 @@ class DockerHomeAssistant(DockerBase):
         # cleanup
         self._stop()
 
-        try:
-            self.dock.containers.run(
-                self.image,
-                name=self.name,
-                hostname=self.name,
-                detach=True,
-                privileged=True,
-                devices=self.devices,
-                network_mode='host',
-                environment={
-                    'HASSIO': self.config.api_endpoint,
-                    'TZ': self.config.timezone,
-                },
-                volumes={
-                    str(self.config.path_extern_config):
-                        {'bind': '/config', 'mode': 'rw'},
-                    str(self.config.path_extern_ssl):
-                        {'bind': '/ssl', 'mode': 'ro'},
-                    str(self.config.path_extern_share):
-                        {'bind': '/share', 'mode': 'rw'},
-                }
-            )
+        ret = self.docker.run(
+            self.image,
+            name=self.name,
+            hostname=self.name,
+            detach=True,
+            privileged=True,
+            devices=self.devices,
+            network_mode='host',
+            environment={
+                'HASSIO': self.docker.network.supervisor,
+                'TZ': self.config.timezone,
+            },
+            volumes={
+                str(self.config.path_extern_config):
+                    {'bind': '/config', 'mode': 'rw'},
+                str(self.config.path_extern_ssl):
+                    {'bind': '/ssl', 'mode': 'ro'},
+                str(self.config.path_extern_share):
+                    {'bind': '/share', 'mode': 'rw'},
+            }
+        )
 
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't run %s -> %s", self.image, err)
-            return False
+        if ret:
+            _LOGGER.info("Start homeassistant %s with version %s",
+                         self.image, self.version)
 
-        _LOGGER.info(
-            "Start homeassistant %s with version %s", self.image, self.version)
-        return True
+        return ret
 
     def _execute_command(self, command):
         """Create a temporary container and run command.
 
         Need run inside executor.
         """
-        _LOGGER.info("Run command '%s' on %s", command, self.image)
-        try:
-            container = self.dock.containers.run(
-                self.image,
-                command=command,
-                detach=True,
-                stdout=True,
-                stderr=True,
-                environment={
-                    'TZ': self.config.timezone,
-                },
-                volumes={
-                    str(self.config.path_extern_config):
-                        {'bind': '/config', 'mode': 'ro'},
-                    str(self.config.path_extern_ssl):
-                        {'bind': '/ssl', 'mode': 'ro'},
-                }
-            )
-
-            # wait until command is done
-            exit_code = container.wait()
-            output = container.logs()
-
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't execute command -> %s", err)
-            return (None, b"")
-
-        # cleanup container
-        with suppress(docker.errors.DockerException):
-            container.remove(force=True)
-
-        return (exit_code, output)
+        return self.docker.run_command(
+            self.image,
+            command,
+            detach=True,
+            stdout=True,
+            stderr=True,
+            environment={
+                'TZ': self.config.timezone,
+            },
+            volumes={
+                str(self.config.path_extern_config):
+                    {'bind': '/config', 'mode': 'ro'},
+                str(self.config.path_extern_ssl):
+                    {'bind': '/ssl', 'mode': 'ro'},
+            }
+        )