From 39ce4714436f155bc6e29a96ac2b95cd1a75bc01 Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 5 Oct 2026 09:46:08 +0200 Subject: [PATCH] Remove user-configurable polling interval from keenetic_ndms2 (#184257) --- .../components/keenetic_ndms2/__init__.py | 4 +--- .../components/keenetic_ndms2/config_flow.py | 17 +---------------- .../components/keenetic_ndms2/router.py | 11 +++-------- .../components/keenetic_ndms2/strings.json | 1 - tests/components/keenetic_ndms2/__init__.py | 9 +-------- 5 files changed, 6 insertions(+), 36 deletions(-) diff --git a/homeassistant/components/keenetic_ndms2/__init__.py b/homeassistant/components/keenetic_ndms2/__init__.py index 154820234b49..7432738a6608 100644 --- a/homeassistant/components/keenetic_ndms2/__init__.py +++ b/homeassistant/components/keenetic_ndms2/__init__.py @@ -2,7 +2,7 @@ import logging -from homeassistant.const import CONF_SCAN_INTERVAL, Platform +from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, entity_registry as er @@ -14,7 +14,6 @@ from .const import ( CONF_TRY_HOTSPOT, DEFAULT_CONSIDER_HOME, DEFAULT_INTERFACE, - DEFAULT_SCAN_INTERVAL, ) from .router import KeeneticConfigEntry, KeeneticRouter @@ -88,7 +87,6 @@ async def async_unload_entry( def async_add_defaults(hass: HomeAssistant, entry: KeeneticConfigEntry) -> None: """Populate default options.""" options = { - CONF_SCAN_INTERVAL: DEFAULT_SCAN_INTERVAL, CONF_CONSIDER_HOME: DEFAULT_CONSIDER_HOME, CONF_INTERFACES: [DEFAULT_INTERFACE], CONF_TRY_HOTSPOT: True, diff --git a/homeassistant/components/keenetic_ndms2/config_flow.py b/homeassistant/components/keenetic_ndms2/config_flow.py index b04ea16744c9..8b16a0fd9ef0 100644 --- a/homeassistant/components/keenetic_ndms2/config_flow.py +++ b/homeassistant/components/keenetic_ndms2/config_flow.py @@ -12,13 +12,7 @@ from homeassistant.config_entries import ( ConfigFlowResult, OptionsFlowWithReload, ) -from homeassistant.const import ( - CONF_HOST, - CONF_PASSWORD, - CONF_PORT, - CONF_SCAN_INTERVAL, - CONF_USERNAME, -) +from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME from homeassistant.core import callback from homeassistant.helpers import config_validation as cv from homeassistant.helpers.service_info.ssdp import ( @@ -36,7 +30,6 @@ from .const import ( CONF_TRY_HOTSPOT, DEFAULT_CONSIDER_HOME, DEFAULT_INTERFACE, - DEFAULT_SCAN_INTERVAL, DEFAULT_TELNET_PORT, DOMAIN, ) @@ -199,14 +192,6 @@ class KeeneticOptionsFlowHandler(OptionsFlowWithReload): options = probatio.Schema( { - # Polling interval is user-configurable, which is no longer allowed - # pylint: disable-next=home-assistant-config-flow-polling-field - probatio.Required( - CONF_SCAN_INTERVAL, - default=self.config_entry.options.get( - CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL - ), - ): int, probatio.Required( CONF_CONSIDER_HOME, default=self.config_entry.options.get( diff --git a/homeassistant/components/keenetic_ndms2/router.py b/homeassistant/components/keenetic_ndms2/router.py index a58ed7a5e8f2..6cc97b6e5e74 100644 --- a/homeassistant/components/keenetic_ndms2/router.py +++ b/homeassistant/components/keenetic_ndms2/router.py @@ -8,13 +8,7 @@ from ndms2_client import Client, ConnectionException, Device, TelnetConnection from ndms2_client.client import RouterInfo from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ( - CONF_HOST, - CONF_PASSWORD, - CONF_PORT, - CONF_SCAN_INTERVAL, - CONF_USERNAME, -) +from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.device_registry import DeviceInfo @@ -28,6 +22,7 @@ from .const import ( CONF_INCLUDE_ASSOCIATED, CONF_INTERFACES, CONF_TRY_HOTSPOT, + DEFAULT_SCAN_INTERVAL, DOMAIN, ) @@ -153,7 +148,7 @@ class KeeneticRouter: await self.request_update() self._cancel_periodic_update = async_call_later( self.hass, - self.config_entry.options[CONF_SCAN_INTERVAL], + DEFAULT_SCAN_INTERVAL, async_update_data, ) diff --git a/homeassistant/components/keenetic_ndms2/strings.json b/homeassistant/components/keenetic_ndms2/strings.json index a97c886fac9d..4838b057b83b 100644 --- a/homeassistant/components/keenetic_ndms2/strings.json +++ b/homeassistant/components/keenetic_ndms2/strings.json @@ -36,7 +36,6 @@ "include_arp": "Use ARP data (ignored if hotspot data used)", "include_associated": "Use Wi-Fi AP associations data (ignored if hotspot data used)", "interfaces": "Choose interfaces to scan", - "scan_interval": "Scan interval", "try_hotspot": "Use 'ip hotspot' data (most accurate)" } } diff --git a/tests/components/keenetic_ndms2/__init__.py b/tests/components/keenetic_ndms2/__init__.py index dc812af6d015..0dcf1842415b 100644 --- a/tests/components/keenetic_ndms2/__init__.py +++ b/tests/components/keenetic_ndms2/__init__.py @@ -1,13 +1,7 @@ """Tests for the Keenetic NDMS2 component.""" from homeassistant.components.keenetic_ndms2 import const -from homeassistant.const import ( - CONF_HOST, - CONF_PASSWORD, - CONF_PORT, - CONF_SCAN_INTERVAL, - CONF_USERNAME, -) +from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME from homeassistant.helpers.service_info.ssdp import ( ATTR_UPNP_FRIENDLY_NAME, ATTR_UPNP_UDN, @@ -32,7 +26,6 @@ MOCK_RECONFIGURE = { } MOCK_OPTIONS = { - CONF_SCAN_INTERVAL: 15, const.CONF_CONSIDER_HOME: 150, const.CONF_TRY_HOTSPOT: False, const.CONF_INCLUDE_ARP: True,