From 542eae1cf3ee92c9b9066f406291baeb3ecabcc5 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Thu, 9 Jun 2022 16:09:00 +0200 Subject: [PATCH] Add additional board types to hassio (#73267) * Add additional board types to hassio * Remove unsupported boards * Add rpi2 back --- homeassistant/components/hassio/__init__.py | 10 ++++++- tests/components/hassio/test_init.py | 31 +++++++++++++-------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py index cab17c94f0c..0df29a6153b 100644 --- a/homeassistant/components/hassio/__init__.py +++ b/homeassistant/components/hassio/__init__.py @@ -206,7 +206,15 @@ MAP_SERVICE_API = { } HARDWARE_INTEGRATIONS = { - "rpi": "raspberry_pi", + "odroid-c2": "hardkernel", + "odroid-c4": "hardkernel", + "odroid-n2": "hardkernel", + "odroid-xu4": "hardkernel", + "rpi2": "raspberry_pi", + "rpi3": "raspberry_pi", + "rpi3-64": "raspberry_pi", + "rpi4": "raspberry_pi", + "rpi4-64": "raspberry_pi", } diff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py index c47b3bfbeca..1569e834562 100644 --- a/tests/components/hassio/test_init.py +++ b/tests/components/hassio/test_init.py @@ -21,12 +21,18 @@ MOCK_ENVIRON = {"SUPERVISOR": "127.0.0.1", "SUPERVISOR_TOKEN": "abcdefgh"} @pytest.fixture() -def os_info(): +def extra_os_info(): + """Extra os/info.""" + return {} + + +@pytest.fixture() +def os_info(extra_os_info): """Mock os/info.""" return { "json": { "result": "ok", - "data": {"version_latest": "1.0.0", "version": "1.0.0"}, + "data": {"version_latest": "1.0.0", "version": "1.0.0", **extra_os_info}, } } @@ -715,21 +721,24 @@ async def test_coordinator_updates(hass, caplog): @pytest.mark.parametrize( - "os_info", + "extra_os_info, integration", [ - { - "json": { - "result": "ok", - "data": {"version_latest": "1.0.0", "version": "1.0.0", "board": "rpi"}, - } - } + ({"board": "odroid-c2"}, "hardkernel"), + ({"board": "odroid-c4"}, "hardkernel"), + ({"board": "odroid-n2"}, "hardkernel"), + ({"board": "odroid-xu4"}, "hardkernel"), + ({"board": "rpi2"}, "raspberry_pi"), + ({"board": "rpi3"}, "raspberry_pi"), + ({"board": "rpi3-64"}, "raspberry_pi"), + ({"board": "rpi4"}, "raspberry_pi"), + ({"board": "rpi4-64"}, "raspberry_pi"), ], ) -async def test_setup_hardware_integration(hass, aioclient_mock): +async def test_setup_hardware_integration(hass, aioclient_mock, integration): """Test setup initiates hardware integration.""" with patch.dict(os.environ, MOCK_ENVIRON), patch( - "homeassistant.components.raspberry_pi.async_setup_entry", + f"homeassistant.components.{integration}.async_setup_entry", return_value=True, ) as mock_setup_entry: result = await async_setup_component(hass, "hassio", {"hassio": {}})