diff --git a/homeassistant/components/unifi/controller.py b/homeassistant/components/unifi/controller.py index c1ffa0aa57d..59cbbb5b7fd 100644 --- a/homeassistant/components/unifi/controller.py +++ b/homeassistant/components/unifi/controller.py @@ -10,6 +10,7 @@ from typing import Any from aiohttp import CookieJar import aiounifi from aiounifi.interfaces.api_handlers import ItemEvent +from aiounifi.models.configuration import Configuration from aiounifi.websocket import WebsocketState from homeassistant.config_entries import ConfigEntry @@ -409,18 +410,19 @@ async def get_unifi_controller( ) controller = aiounifi.Controller( - host=config[CONF_HOST], - username=config[CONF_USERNAME], - password=config[CONF_PASSWORD], - port=config[CONF_PORT], - site=config[CONF_SITE_ID], - websession=session, - ssl_context=ssl_context, + Configuration( + session, + host=config[CONF_HOST], + username=config[CONF_USERNAME], + password=config[CONF_PASSWORD], + port=config[CONF_PORT], + site=config[CONF_SITE_ID], + ssl_context=ssl_context, + ) ) try: async with asyncio.timeout(10): - await controller.check_unifi_os() await controller.login() return controller diff --git a/homeassistant/components/unifi/manifest.json b/homeassistant/components/unifi/manifest.json index 579e64c5862..363313bf878 100644 --- a/homeassistant/components/unifi/manifest.json +++ b/homeassistant/components/unifi/manifest.json @@ -8,7 +8,7 @@ "iot_class": "local_push", "loggers": ["aiounifi"], "quality_scale": "platinum", - "requirements": ["aiounifi==55"], + "requirements": ["aiounifi==58"], "ssdp": [ { "manufacturer": "Ubiquiti Networks", diff --git a/requirements_all.txt b/requirements_all.txt index d8d3890bbc6..ce37e1f72f1 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -360,7 +360,7 @@ aiosyncthing==0.5.1 aiotractive==0.5.5 # homeassistant.components.unifi -aiounifi==55 +aiounifi==58 # homeassistant.components.vlc_telnet aiovlc==0.1.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index dc7358f8811..9c319ef31f0 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -335,7 +335,7 @@ aiosyncthing==0.5.1 aiotractive==0.5.5 # homeassistant.components.unifi -aiounifi==55 +aiounifi==58 # homeassistant.components.vlc_telnet aiovlc==0.1.0 diff --git a/tests/components/unifi/test_controller.py b/tests/components/unifi/test_controller.py index a2be388af4c..18fe92e6d64 100644 --- a/tests/components/unifi/test_controller.py +++ b/tests/components/unifi/test_controller.py @@ -395,9 +395,7 @@ async def test_reconnect_mechanism( await setup_unifi_integration(hass, aioclient_mock) aioclient_mock.clear_requests() - aioclient_mock.post( - f"https://{DEFAULT_HOST}:1234/api/login", status=HTTPStatus.BAD_GATEWAY - ) + aioclient_mock.get(f"https://{DEFAULT_HOST}:1234/", status=HTTPStatus.BAD_GATEWAY) mock_unifi_websocket(state=WebsocketState.DISCONNECTED) await hass.async_block_till_done() @@ -448,9 +446,7 @@ async def test_reconnect_mechanism_exceptions( async def test_get_unifi_controller(hass: HomeAssistant) -> None: """Successful call.""" - with patch("aiounifi.Controller.check_unifi_os", return_value=True), patch( - "aiounifi.Controller.login", return_value=True - ): + with patch("aiounifi.Controller.login", return_value=True): assert await get_unifi_controller(hass, ENTRY_CONFIG) @@ -458,9 +454,7 @@ async def test_get_unifi_controller_verify_ssl_false(hass: HomeAssistant) -> Non """Successful call with verify ssl set to false.""" controller_data = dict(ENTRY_CONFIG) controller_data[CONF_VERIFY_SSL] = False - with patch("aiounifi.Controller.check_unifi_os", return_value=True), patch( - "aiounifi.Controller.login", return_value=True - ): + with patch("aiounifi.Controller.login", return_value=True): assert await get_unifi_controller(hass, controller_data) @@ -481,7 +475,7 @@ async def test_get_unifi_controller_fails_to_connect( hass: HomeAssistant, side_effect, raised_exception ) -> None: """Check that get_unifi_controller can handle controller being unavailable.""" - with patch("aiounifi.Controller.check_unifi_os", return_value=True), patch( - "aiounifi.Controller.login", side_effect=side_effect - ), pytest.raises(raised_exception): + with patch("aiounifi.Controller.login", side_effect=side_effect), pytest.raises( + raised_exception + ): await get_unifi_controller(hass, ENTRY_CONFIG)