Simplify netgear_lte service actions (home-assistant#146606)

Author: epenet

homeassistant/components/netgear_lte/__init__.py

@@ -96,7 +96,7 @@ def fire_sms_event(sms: SMS) -> None:
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
-    await async_setup_services(hass, modem)
+    async_setup_services(hass)
 
     await discovery.async_load_platform(
         hass,

homeassistant/components/netgear_lte/services.py

@@ -1,9 +1,9 @@
 """Services for the Netgear LTE integration."""
 
-from eternalegypt.eternalegypt import Modem
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.helpers import config_validation as cv
 
 from .const import (
@@ -16,6 +16,7 @@
     FAILOVER_MODES,
     LOGGER,
 )
+from .coordinator import NetgearLTEConfigEntry
 
 SERVICE_DELETE_SMS = "delete_sms"
 SERVICE_SET_OPTION = "set_option"
@@ -45,29 +46,36 @@
 DISCONNECT_LTE_SCHEMA = vol.Schema({vol.Optional(ATTR_HOST): cv.string})
 
 
-async def async_setup_services(hass: HomeAssistant, modem: Modem) -> None:
-    """Set up services for Netgear LTE integration."""
+async def _service_handler(call: ServiceCall) -> None:
+    """Apply a service."""
+    host = call.data.get(ATTR_HOST)
+
+    entry: NetgearLTEConfigEntry | None = None
+    for entry in call.hass.config_entries.async_loaded_entries(DOMAIN):
+        if entry.data.get(CONF_HOST) == host:
+            break
+
+    if not entry or not (modem := entry.runtime_data.modem).token:
+        LOGGER.error("%s: host %s unavailable", call.service, host)
+        return
 
-    async def service_handler(call: ServiceCall) -> None:
-        """Apply a service."""
-        host = call.data.get(ATTR_HOST)
-
-        if not modem.token:
-            LOGGER.error("%s: host %s unavailable", call.service, host)
-            return
-
-        if call.service == SERVICE_DELETE_SMS:
-            for sms_id in call.data[ATTR_SMS_ID]:
-                await modem.delete_sms(sms_id)
-        elif call.service == SERVICE_SET_OPTION:
-            if failover := call.data.get(ATTR_FAILOVER):
-                await modem.set_failover_mode(failover)
-            if autoconnect := call.data.get(ATTR_AUTOCONNECT):
-                await modem.set_autoconnect_mode(autoconnect)
-        elif call.service == SERVICE_CONNECT_LTE:
-            await modem.connect_lte()
-        elif call.service == SERVICE_DISCONNECT_LTE:
-            await modem.disconnect_lte()
+    if call.service == SERVICE_DELETE_SMS:
+        for sms_id in call.data[ATTR_SMS_ID]:
+            await modem.delete_sms(sms_id)
+    elif call.service == SERVICE_SET_OPTION:
+        if failover := call.data.get(ATTR_FAILOVER):
+            await modem.set_failover_mode(failover)
+        if autoconnect := call.data.get(ATTR_AUTOCONNECT):
+            await modem.set_autoconnect_mode(autoconnect)
+    elif call.service == SERVICE_CONNECT_LTE:
+        await modem.connect_lte()
+    elif call.service == SERVICE_DISCONNECT_LTE:
+        await modem.disconnect_lte()
+
+
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Set up services for Netgear LTE integration."""
 
     service_schemas = {
         SERVICE_DELETE_SMS: DELETE_SMS_SCHEMA,
@@ -77,4 +85,4 @@ async def service_handler(call: ServiceCall) -> None:
     }
 
     for service, schema in service_schemas.items():
-        hass.services.async_register(DOMAIN, service, service_handler, schema=schema)
+        hass.services.async_register(DOMAIN, service, _service_handler, schema=schema)