refresh_updates, stop and restart to aiohasupervisor

Author: mdegat01

homeassistant/components/hassio/__init__.py

@@ -468,9 +468,9 @@ async def update_info_data(_: datetime | None = None) -> None:
     async def _async_stop(hass: HomeAssistant, restart: bool) -> None:
         """Stop or restart home assistant."""
         if restart:
-            await hassio.restart_homeassistant()
+            await supervisor_client.homeassistant.restart()
         else:
-            await hassio.stop_homeassistant()
+            await supervisor_client.homeassistant.stop()
 
     # Set a custom handler for the homeassistant.restart and homeassistant.stop services
     async_set_stop_handler(hass, _async_stop)

homeassistant/components/hassio/coordinator.py

@@ -563,8 +563,8 @@ async def _async_refresh(
             # updates if this is not a scheduled refresh and
             # we are not doing the first refresh.
             try:
-                await self.hassio.refresh_updates()
-            except HassioAPIError as err:
+                await self.supervisor_client.refresh_updates()
+            except SupervisorError as err:
                 _LOGGER.warning("Error on Supervisor API: %s", err)
 
         await super()._async_refresh(

homeassistant/components/hassio/handler.py

@@ -245,30 +245,6 @@ def get_ingress_panels(self) -> Coroutine:
         """
         return self.send_command("/ingress/panels", method="get")
 
-    @_api_bool
-    def restart_homeassistant(self) -> Coroutine:
-        """Restart Home-Assistant container.
-
-        This method returns a coroutine.
-        """
-        return self.send_command("/homeassistant/restart")
-
-    @_api_bool
-    def stop_homeassistant(self) -> Coroutine:
-        """Stop Home-Assistant container.
-
-        This method returns a coroutine.
-        """
-        return self.send_command("/homeassistant/stop")
-
-    @_api_bool
-    def refresh_updates(self) -> Coroutine:
-        """Refresh available updates.
-
-        This method returns a coroutine.
-        """
-        return self.send_command("/refresh_updates", timeout=300)
-
     @api_data
     def get_resolution_info(self) -> Coroutine:
         """Return data for Supervisor resolution center.

tests/components/hassio/conftest.py

@@ -74,9 +74,6 @@ def hassio_stubs(
         patch(
             "homeassistant.components.hassio.issues.SupervisorIssues.setup",
         ),
-        patch(
-            "homeassistant.components.hassio.HassIO.refresh_updates",
-        ),
     ):
         hass.set_state(CoreState.starting)
         hass.loop.run_until_complete(async_setup_component(hass, "hassio", {}))
@@ -140,7 +137,6 @@ def all_setup_requests(
     )
 
     aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
-    aioclient_mock.get("http://127.0.0.1/supervisor/ping", json={"result": "ok"})
     aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -221,7 +217,6 @@ def all_setup_requests(
     aioclient_mock.get(
         "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
     )
-    aioclient_mock.post("http://127.0.0.1/refresh_updates", json={"result": "ok"})
 
     addon_installed.return_value.update_available = False
     addon_installed.return_value.version = "1.0.0"

tests/components/hassio/test_addon_panel.py

@@ -1,7 +1,7 @@
 """Test add-on panel."""
 
 from http import HTTPStatus
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 
@@ -13,10 +13,11 @@
 
 
 @pytest.fixture(autouse=True)
-def mock_all(aioclient_mock: AiohttpClientMocker) -> None:
+def mock_all(
+    aioclient_mock: AiohttpClientMocker, supervisor_is_connected: AsyncMock
+) -> None:
     """Mock all setup requests."""
     aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
-    aioclient_mock.get("http://127.0.0.1/supervisor/ping", json={"result": "ok"})
     aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
     aioclient_mock.get(
         "http://127.0.0.1/homeassistant/info",

tests/components/hassio/test_binary_sensor.py

@@ -28,7 +28,6 @@ def mock_all(
 ) -> None:
     """Mock all setup requests."""
     aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
-    aioclient_mock.get("http://127.0.0.1/supervisor/ping", json={"result": "ok"})
     aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -141,7 +140,6 @@ def mock_all(
     aioclient_mock.get(
         "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
     )
-    aioclient_mock.post("http://127.0.0.1/refresh_updates", json={"result": "ok"})
     aioclient_mock.get(
         "http://127.0.0.1/resolution/info",
         json={

tests/components/hassio/test_diagnostics.py

@@ -27,7 +27,6 @@ def mock_all(
 ) -> None:
     """Mock all setup requests."""
     aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
-    aioclient_mock.get("http://127.0.0.1/supervisor/ping", json={"result": "ok"})
     aioclient_mock.post("http://127.0.0.1/supervisor/options", json={"result": "ok"})
     aioclient_mock.get(
         "http://127.0.0.1/info",
@@ -144,7 +143,6 @@ def mock_all(
     aioclient_mock.get(
         "http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
     )
-    aioclient_mock.post("http://127.0.0.1/refresh_updates", json={"result": "ok"})
     aioclient_mock.get(
         "http://127.0.0.1/resolution/info",
         json={

tests/components/hassio/test_handler.py

@@ -150,26 +150,6 @@ async def test_api_core_info_error(
     assert aioclient_mock.call_count == 1
 
 
-async def test_api_homeassistant_stop(
-    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test setup with API Home Assistant stop."""
-    aioclient_mock.post("http://127.0.0.1/homeassistant/stop", json={"result": "ok"})
-
-    assert await hassio_handler.stop_homeassistant()
-    assert aioclient_mock.call_count == 1
-
-
-async def test_api_homeassistant_restart(
-    hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test setup with API Home Assistant restart."""
-    aioclient_mock.post("http://127.0.0.1/homeassistant/restart", json={"result": "ok"})
-
-    assert await hassio_handler.restart_homeassistant()
-    assert aioclient_mock.call_count == 1
-
-
 async def test_api_core_stats(
     hassio_handler: HassIO, aioclient_mock: AiohttpClientMocker
 ) -> None:
@@ -229,7 +209,6 @@ async def test_api_ingress_panels(
     ("api_call", "method", "payload"),
     [
         ("get_resolution_info", "GET", None),
-        ("refresh_updates", "POST", None),
         ("update_diagnostics", "POST", True),
     ],
 )