diff --git a/homeassistant/components/tplink_omada/__init__.py b/homeassistant/components/tplink_omada/__init__.py index 1367f8757af..e2daa903bbc 100644 --- a/homeassistant/components/tplink_omada/__init__.py +++ b/homeassistant/components/tplink_omada/__init__.py @@ -1,13 +1,13 @@ """The TP-Link Omada integration.""" from __future__ import annotations +from tplink_omada_client import OmadaSite from tplink_omada_client.exceptions import ( ConnectionFailed, LoginFailed, OmadaClientException, UnsupportedControllerVersion, ) -from tplink_omada_client.omadaclient import OmadaSite from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform diff --git a/homeassistant/components/tplink_omada/binary_sensor.py b/homeassistant/components/tplink_omada/binary_sensor.py index caaae3465b7..d2679b8b8d4 100644 --- a/homeassistant/components/tplink_omada/binary_sensor.py +++ b/homeassistant/components/tplink_omada/binary_sensor.py @@ -5,7 +5,11 @@ from collections.abc import Callable, Generator from attr import dataclass from tplink_omada_client.definitions import GatewayPortMode, LinkStatus -from tplink_omada_client.devices import OmadaDevice, OmadaGateway, OmadaGatewayPort +from tplink_omada_client.devices import ( + OmadaDevice, + OmadaGateway, + OmadaGatewayPortStatus, +) from homeassistant.components.binary_sensor import ( BinarySensorDeviceClass, @@ -81,7 +85,7 @@ class GatewayPortBinarySensorConfig: id_suffix: str name_suffix: str device_class: BinarySensorDeviceClass - update_func: Callable[[OmadaGatewayPort], bool] + update_func: Callable[[OmadaGatewayPortStatus], bool] class OmadaGatewayPortBinarySensor(OmadaDeviceEntity[OmadaGateway], BinarySensorEntity): diff --git a/homeassistant/components/tplink_omada/config_flow.py b/homeassistant/components/tplink_omada/config_flow.py index 3f27417894d..e49e8ccf657 100644 --- a/homeassistant/components/tplink_omada/config_flow.py +++ b/homeassistant/components/tplink_omada/config_flow.py @@ -9,13 +9,13 @@ from typing import Any, NamedTuple from urllib.parse import urlsplit from aiohttp import CookieJar +from tplink_omada_client import OmadaClient, OmadaSite from tplink_omada_client.exceptions import ( ConnectionFailed, LoginFailed, OmadaClientException, UnsupportedControllerVersion, ) -from tplink_omada_client.omadaclient import OmadaClient, OmadaSite import voluptuous as vol from homeassistant import config_entries diff --git a/homeassistant/components/tplink_omada/controller.py b/homeassistant/components/tplink_omada/controller.py index be9e875037e..c9842f93a5a 100644 --- a/homeassistant/components/tplink_omada/controller.py +++ b/homeassistant/components/tplink_omada/controller.py @@ -1,11 +1,11 @@ """Controller for sharing Omada API coordinators between platforms.""" +from tplink_omada_client import OmadaSiteClient from tplink_omada_client.devices import ( OmadaGateway, OmadaSwitch, OmadaSwitchPortDetails, ) -from tplink_omada_client.omadasiteclient import OmadaSiteClient from homeassistant.core import HomeAssistant diff --git a/homeassistant/components/tplink_omada/coordinator.py b/homeassistant/components/tplink_omada/coordinator.py index e9048a678ca..a0f3e6ff9b3 100644 --- a/homeassistant/components/tplink_omada/coordinator.py +++ b/homeassistant/components/tplink_omada/coordinator.py @@ -4,8 +4,8 @@ from datetime import timedelta import logging from typing import Generic, TypeVar +from tplink_omada_client import OmadaSiteClient from tplink_omada_client.exceptions import OmadaClientException -from tplink_omada_client.omadaclient import OmadaSiteClient from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed diff --git a/homeassistant/components/tplink_omada/manifest.json b/homeassistant/components/tplink_omada/manifest.json index 3215a9ba77d..33fc85d7c79 100644 --- a/homeassistant/components/tplink_omada/manifest.json +++ b/homeassistant/components/tplink_omada/manifest.json @@ -6,5 +6,5 @@ "documentation": "https://www.home-assistant.io/integrations/tplink_omada", "integration_type": "hub", "iot_class": "local_polling", - "requirements": ["tplink-omada-client==1.3.2"] + "requirements": ["tplink-omada-client==1.3.11"] } diff --git a/homeassistant/components/tplink_omada/switch.py b/homeassistant/components/tplink_omada/switch.py index 830f75b6a93..f8a124b94fc 100644 --- a/homeassistant/components/tplink_omada/switch.py +++ b/homeassistant/components/tplink_omada/switch.py @@ -3,9 +3,9 @@ from __future__ import annotations from typing import Any +from tplink_omada_client import SwitchPortOverrides from tplink_omada_client.definitions import PoEMode from tplink_omada_client.devices import OmadaSwitch, OmadaSwitchPortDetails -from tplink_omada_client.omadasiteclient import SwitchPortOverrides from homeassistant.components.switch import SwitchEntity from homeassistant.config_entries import ConfigEntry diff --git a/homeassistant/components/tplink_omada/update.py b/homeassistant/components/tplink_omada/update.py index a5f54071c4f..014302cec65 100644 --- a/homeassistant/components/tplink_omada/update.py +++ b/homeassistant/components/tplink_omada/update.py @@ -4,9 +4,9 @@ from __future__ import annotations from datetime import timedelta from typing import Any, NamedTuple +from tplink_omada_client import OmadaSiteClient from tplink_omada_client.devices import OmadaFirmwareUpdate, OmadaListDevice from tplink_omada_client.exceptions import OmadaClientException, RequestFailed -from tplink_omada_client.omadasiteclient import OmadaSiteClient from homeassistant.components.update import ( UpdateDeviceClass, diff --git a/requirements_all.txt b/requirements_all.txt index c6464f14fa4..51b72de7d8a 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2734,7 +2734,7 @@ total-connect-client==2023.2 tp-connected==0.0.4 # homeassistant.components.tplink_omada -tplink-omada-client==1.3.2 +tplink-omada-client==1.3.11 # homeassistant.components.transmission transmission-rpc==7.0.3 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 1281705424a..9539ed14b54 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -2084,7 +2084,7 @@ toonapi==0.3.0 total-connect-client==2023.2 # homeassistant.components.tplink_omada -tplink-omada-client==1.3.2 +tplink-omada-client==1.3.11 # homeassistant.components.transmission transmission-rpc==7.0.3 diff --git a/tests/components/tplink_omada/test_config_flow.py b/tests/components/tplink_omada/test_config_flow.py index 1a9635d44cb..5c27c9bde6b 100644 --- a/tests/components/tplink_omada/test_config_flow.py +++ b/tests/components/tplink_omada/test_config_flow.py @@ -1,13 +1,13 @@ """Test the TP-Link Omada config flows.""" from unittest.mock import patch +from tplink_omada_client import OmadaSite from tplink_omada_client.exceptions import ( ConnectionFailed, LoginFailed, OmadaClientException, UnsupportedControllerVersion, ) -from tplink_omada_client.omadaclient import OmadaSite from homeassistant import config_entries from homeassistant.components.tplink_omada.config_flow import ( diff --git a/tests/components/tplink_omada/test_switch.py b/tests/components/tplink_omada/test_switch.py index dd8b520e0a8..786893f328d 100644 --- a/tests/components/tplink_omada/test_switch.py +++ b/tests/components/tplink_omada/test_switch.py @@ -2,9 +2,9 @@ from unittest.mock import MagicMock from syrupy.assertion import SnapshotAssertion +from tplink_omada_client import SwitchPortOverrides from tplink_omada_client.definitions import PoEMode from tplink_omada_client.devices import OmadaSwitch, OmadaSwitchPortDetails -from tplink_omada_client.omadasiteclient import SwitchPortOverrides from homeassistant.components import switch from homeassistant.const import ATTR_ENTITY_ID