diff --git a/.coveragerc b/.coveragerc index b21e4d9d7f1..d0bd99a17d0 100644 --- a/.coveragerc +++ b/.coveragerc @@ -800,7 +800,7 @@ omit = homeassistant/components/microbees/sensor.py homeassistant/components/microbees/switch.py homeassistant/components/microsoft/tts.py - homeassistant/components/mikrotik/hub.py + homeassistant/components/mikrotik/coordinator.py homeassistant/components/mill/climate.py homeassistant/components/mill/sensor.py homeassistant/components/minio/minio_helper.py diff --git a/homeassistant/components/mikrotik/__init__.py b/homeassistant/components/mikrotik/__init__.py index 76d9a57c7ef..8e5911677af 100644 --- a/homeassistant/components/mikrotik/__init__.py +++ b/homeassistant/components/mikrotik/__init__.py @@ -7,8 +7,8 @@ from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady from homeassistant.helpers import config_validation as cv, device_registry as dr from .const import ATTR_MANUFACTURER, DOMAIN +from .coordinator import MikrotikDataUpdateCoordinator, get_api from .errors import CannotConnect, LoginError -from .hub import MikrotikDataUpdateCoordinator, get_api CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False) diff --git a/homeassistant/components/mikrotik/config_flow.py b/homeassistant/components/mikrotik/config_flow.py index 8e5ff50e590..fe0d020d373 100644 --- a/homeassistant/components/mikrotik/config_flow.py +++ b/homeassistant/components/mikrotik/config_flow.py @@ -31,8 +31,8 @@ from .const import ( DEFAULT_NAME, DOMAIN, ) +from .coordinator import get_api from .errors import CannotConnect, LoginError -from .hub import get_api class MikrotikFlowHandler(ConfigFlow, domain=DOMAIN): diff --git a/homeassistant/components/mikrotik/hub.py b/homeassistant/components/mikrotik/coordinator.py similarity index 100% rename from homeassistant/components/mikrotik/hub.py rename to homeassistant/components/mikrotik/coordinator.py diff --git a/homeassistant/components/mikrotik/device_tracker.py b/homeassistant/components/mikrotik/device_tracker.py index 866eba0b8bb..073db547b4c 100644 --- a/homeassistant/components/mikrotik/device_tracker.py +++ b/homeassistant/components/mikrotik/device_tracker.py @@ -17,7 +17,7 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity import homeassistant.util.dt as dt_util from .const import DOMAIN -from .hub import Device, MikrotikDataUpdateCoordinator +from .coordinator import Device, MikrotikDataUpdateCoordinator async def async_setup_entry( diff --git a/tests/components/mikrotik/__init__.py b/tests/components/mikrotik/__init__.py index ad8521c7787..36278573ec3 100644 --- a/tests/components/mikrotik/__init__.py +++ b/tests/components/mikrotik/__init__.py @@ -210,7 +210,7 @@ async def setup_mikrotik_entry(hass: HomeAssistant, **kwargs: Any) -> None: with ( patch("librouteros.connect"), - patch.object(mikrotik.hub.MikrotikData, "command", new=mock_command), + patch.object(mikrotik.coordinator.MikrotikData, "command", new=mock_command), ): await hass.config_entries.async_setup(config_entry.entry_id) await hass.async_block_till_done() diff --git a/tests/components/mikrotik/test_device_tracker.py b/tests/components/mikrotik/test_device_tracker.py index 1eec2132a91..23f99a1005c 100644 --- a/tests/components/mikrotik/test_device_tracker.py +++ b/tests/components/mikrotik/test_device_tracker.py @@ -82,7 +82,7 @@ async def test_device_trackers( device_2 = hass.states.get("device_tracker.device_2") assert device_2 is None - with patch.object(mikrotik.hub.MikrotikData, "command", new=mock_command): + with patch.object(mikrotik.coordinator.MikrotikData, "command", new=mock_command): # test device_2 is added after connecting to wireless network WIRELESS_DATA.append(DEVICE_2_WIRELESS) @@ -150,7 +150,9 @@ async def test_arp_ping_success( ) -> None: """Test arp ping devices to confirm they are connected.""" - with patch.object(mikrotik.hub.MikrotikData, "do_arp_ping", return_value=True): + with patch.object( + mikrotik.coordinator.MikrotikData, "do_arp_ping", return_value=True + ): await setup_mikrotik_entry(hass, arp_ping=True, force_dhcp=True) # test wired device_2 show as home if arp ping returns True @@ -163,7 +165,9 @@ async def test_arp_ping_timeout( hass: HomeAssistant, mock_device_registry_devices ) -> None: """Test arp ping timeout so devices are shown away.""" - with patch.object(mikrotik.hub.MikrotikData, "do_arp_ping", return_value=False): + with patch.object( + mikrotik.coordinator.MikrotikData, "do_arp_ping", return_value=False + ): await setup_mikrotik_entry(hass, arp_ping=True, force_dhcp=True) # test wired device_2 show as not_home if arp ping times out @@ -262,7 +266,9 @@ async def test_update_failed(hass: HomeAssistant, mock_device_registry_devices) await setup_mikrotik_entry(hass) with patch.object( - mikrotik.hub.MikrotikData, "command", side_effect=mikrotik.errors.CannotConnect + mikrotik.coordinator.MikrotikData, + "command", + side_effect=mikrotik.errors.CannotConnect, ): async_fire_time_changed(hass, utcnow() + timedelta(seconds=10)) await hass.async_block_till_done(wait_background_tasks=True)