Home-Assistant/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2026-02-15 07:27:13 +00:00
Code Activity

Migrate network interactions to aiodocker (#6505)

Browse Source
This commit is contained in:
Mike Degatano
2026-01-30 09:34:12 -05:00
committed by GitHub
parent 2a4890e2b0
commit a5c3781f9d
6 changed files with 407 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/conftest.py
View File

@@ -12,6 +12,7 @@ from uuid import uuid4
from aiodocker.containers import DockerContainer, DockerContainers
from aiodocker.docker import DockerImages
from aiodocker.execs import Exec
from aiodocker.networks import DockerNetwork, DockerNetworks
from aiohttp import ClientSession, web
from aiohttp.test_utils import TestClient
from awesomeversion import AwesomeVersion
@@ -125,26 +126,53 @@ async def docker() -> DockerAPI:
"State": {"ExitCode": 0, "Status": "stopped", "Running": False},
"Image": "abc123",
}
network_inspect = {
"Name": "hassio",
"Id": "hassio123",
"EnableIPv4": True,
"EnableIPv6": False,
"IPAM": {
"Driver": "default",
"Options": None,
"Config": [
{
"Subnet": "172.30.32.0/23",
"IPRange": "172.30.33.0/24",
"Gateway": "172.30.32.1",
}
],
},
"Containers": {},
}
with (
patch("supervisor.docker.manager.DockerClient", return_value=MagicMock()),
patch("supervisor.docker.manager.DockerAPI.api", return_value=MagicMock()),
patch("supervisor.docker.manager.DockerAPI.info", return_value=MagicMock()),
patch("supervisor.docker.manager.DockerAPI.unload"),
patch("supervisor.docker.manager.aiodocker.Docker", return_value=MagicMock()),
patch(
"supervisor.docker.manager.aiodocker.Docker",
return_value=(
docker_client := MagicMock(
networks=MagicMock(spec=DockerNetworks),
images=(docker_images := MagicMock(spec=DockerImages)),
containers=(docker_containers := MagicMock(spec=DockerContainers)),
)
),
),
patch(
"supervisor.docker.manager.DockerAPI.images",
new=PropertyMock(
return_value=(docker_images := MagicMock(spec=DockerImages))
),
new=PropertyMock(return_value=docker_images),
),
patch(
"supervisor.docker.manager.DockerAPI.containers",
new=PropertyMock(
return_value=(docker_containers := MagicMock(spec=DockerContainers))
),
new=PropertyMock(return_value=docker_containers),
),
):
docker_client.networks.get.return_value = docker_network = MagicMock(
spec=DockerNetwork
)
docker_network.show.return_value = network_inspect
docker_obj = await DockerAPI(MagicMock()).post_init()
docker_obj.config._data = {"registries": {}}
with patch("supervisor.docker.monitor.DockerMonitor.load"):