diff.patch

diff --git a/custom_components/meraki_ha/__init__.py b/custom_components/meraki_ha/__init__.py

index b6349708..96560283 100644

--- a/custom_components/meraki_ha/__init__.py

+++ b/custom_components/meraki_ha/__init__.py

@@ -6,6 +6,13 @@ import logging

 import secrets

 import string

 

+from homeassistant.components.frontend import add_extra_js_url

+from homeassistant.components.http import StaticPathConfig

+from homeassistant.config_entries import ConfigEntry

+from homeassistant.core import HomeAssistant

+from homeassistant.helpers import config_validation as cv

+from homeassistant.helpers.typing import ConfigType

+

 from custom_components.meraki_ha.const.config import (

     CONF_MERAKI_API_KEY,

     CONF_MERAKI_ORG_ID,

@@ -13,12 +20,6 @@ from custom_components.meraki_ha.const.config import (

 from custom_components.meraki_ha.const.integration import DOMAIN

 from custom_components.meraki_ha.const.platform import PLATFORMS

 from custom_components.meraki_ha.const.webhooks import WEBHOOK_ID_FORMAT

-from homeassistant.components.frontend import add_extra_js_url

-from homeassistant.components.http import StaticPathConfig

-from homeassistant.config_entries import ConfigEntry

-from homeassistant.core import HomeAssistant

-from homeassistant.helpers import config_validation as cv

-from homeassistant.helpers.typing import ConfigType

 

 from .api.websocket import async_setup_websocket_api

 from .coordinators import (

diff --git a/custom_components/meraki_ha/binary_sensor/device/appliance_port.py b/custom_components/meraki_ha/binary_sensor/device/appliance_port.py

index 3e587cff..d5dc05c0 100644

--- a/custom_components/meraki_ha/binary_sensor/device/appliance_port.py

+++ b/custom_components/meraki_ha/binary_sensor/device/appliance_port.py

@@ -4,7 +4,6 @@ from __future__ import annotations

 

 from typing import TYPE_CHECKING, Any, cast

 

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.components.binary_sensor import (

     BinarySensorDeviceClass,

     BinarySensorEntity,

@@ -13,6 +12,8 @@ from homeassistant.core import callback

 from homeassistant.helpers.device_registry import DeviceInfo

 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ...core.models import MerakiAppliancePort

 from ...core.models.device import MerakiDevice

 from ...core.utils.naming_utils import format_device_name

diff --git a/custom_components/meraki_ha/core/api/client.py b/custom_components/meraki_ha/core/api/client.py

index c5113257..f382ad8d 100644

--- a/custom_components/meraki_ha/core/api/client.py

+++ b/custom_components/meraki_ha/core/api/client.py

@@ -17,7 +17,6 @@ from typing import Any, cast

 import braintrust

 import meraki

 from dotenv import load_dotenv

-

 from homeassistant.core import HomeAssistant

 

 from ...core.errors import (

diff --git a/custom_components/meraki_ha/core/coordinator_helpers/update_processor.py b/custom_components/meraki_ha/core/coordinator_helpers/update_processor.py

index 3caa39a4..db2b622e 100644

--- a/custom_components/meraki_ha/core/coordinator_helpers/update_processor.py

+++ b/custom_components/meraki_ha/core/coordinator_helpers/update_processor.py

@@ -6,17 +6,18 @@ import asyncio

 import logging

 from typing import TYPE_CHECKING, Any, cast

 

-from custom_components.meraki_ha.const.config import (

-    CONF_IGNORED_NETWORKS,

-    DEFAULT_IGNORED_NETWORKS,

-)

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.config_entries import ConfigEntry

 from homeassistant.core import HomeAssistant

 from homeassistant.helpers import device_registry as dr

 from homeassistant.helpers import entity_registry as er

 from homeassistant.helpers.update_coordinator import UpdateFailed

 

+from custom_components.meraki_ha.const.config import (

+    CONF_IGNORED_NETWORKS,

+    DEFAULT_IGNORED_NETWORKS,

+)

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ..helpers.device_registry import (

     async_ensure_network_devices_exist,

 )

diff --git a/custom_components/meraki_ha/core/entities/meraki_network_entity.py b/custom_components/meraki_ha/core/entities/meraki_network_entity.py

index 1358035b..26e4c1a9 100644

--- a/custom_components/meraki_ha/core/entities/meraki_network_entity.py

+++ b/custom_components/meraki_ha/core/entities/meraki_network_entity.py

@@ -3,6 +3,7 @@

 from __future__ import annotations

 

 import logging

+from typing import Any

 

 from homeassistant.config_entries import ConfigEntry

 from homeassistant.helpers.device_registry import DeviceInfo

@@ -10,8 +11,6 @@ from homeassistant.helpers.device_registry import DeviceInfo

 from custom_components.meraki_ha.const.integration import DOMAIN

 

 from ...coordinators import MerakiMainCoordinator

-from typing import Any

-

 from ...core.models.network import MerakiNetwork

 from ...core.utils.naming_utils import standardize_device_name

 from ...helpers.device_info_helpers import resolve_device_info

diff --git a/custom_components/meraki_ha/core/fetch_strategies/wireless.py b/custom_components/meraki_ha/core/fetch_strategies/wireless.py

index 7887907f..eff8733e 100644

--- a/custom_components/meraki_ha/core/fetch_strategies/wireless.py

+++ b/custom_components/meraki_ha/core/fetch_strategies/wireless.py

@@ -25,6 +25,10 @@ class WirelessFetchStrategy(BaseFetchStrategy):

         tasks.update(

             self.client.wireless.get_network_detail_tasks(network_id, product_types)

         )

+        if "wireless" in product_types or "appliance" in product_types:

+            tasks[f"group_policies_{network_id}"] = self.client.run_with_semaphore(

+                self.client.networks.get_group_policies(network_id)

+            )

 

     def build_device_tasks(

         self,

diff --git a/custom_components/meraki_ha/core/parsers/wireless.py b/custom_components/meraki_ha/core/parsers/wireless.py

index b8a71f1a..47b32f33 100644

--- a/custom_components/meraki_ha/core/parsers/wireless.py

+++ b/custom_components/meraki_ha/core/parsers/wireless.py

@@ -55,6 +55,19 @@ def _update_rf_profiles(

     processed_data["rf_profiles"].update(rf_profiles)

 

 

+def _update_group_policies(

+    processed_data: dict[str, Any], new_data: dict[str, Any]

+) -> None:

+    """Update group policies in processed data."""

+    group_policies = new_data.get("group_policies")

+    if not isinstance(group_policies, dict):

+        return

+

+    if "group_policies" not in processed_data:

+        processed_data["group_policies"] = {}

+    processed_data["group_policies"].update(group_policies)

+

+

 def update_processed_wireless_data(

     processed_data: dict[str, Any], new_data: dict[str, Any]

 ) -> None:

@@ -62,6 +75,7 @@ def update_processed_wireless_data(

     _update_ssids(processed_data, new_data)

     _update_wireless_settings(processed_data, new_data)

     _update_rf_profiles(processed_data, new_data)

+    _update_group_policies(processed_data, new_data)

 

 

 def parse_wireless_data(

@@ -86,6 +100,7 @@ def parse_wireless_data(

     ssids: list[dict[str, Any]] = []

     wireless_settings: dict[str, list[dict[str, Any]]] = {}

     rf_profiles: dict[str, list[dict[str, Any]]] = {}

+    group_policies: dict[str, list[dict[str, Any]]] = {}

     client_counts = _calculate_client_counts(clients)

 

     for network in networks:

@@ -104,10 +119,15 @@ def parse_wireless_data(

             network_id, detail_data, previous_data

         )

 

+        group_policies[network_id] = _process_network_group_policies(

+            network_id, detail_data, previous_data

+        )

+

     return {

         "ssids": ssids,

         "wireless_settings": wireless_settings,

         "rf_profiles": rf_profiles,

+        "group_policies": group_policies,

     }

 

 

@@ -216,11 +236,38 @@ def _process_network_rf_profiles(

 ) -> list[dict[str, Any]]:

     """Process RF Profiles for a single network."""

     network_rf_profiles_key = f"rf_profiles_{network_id}"

-    network_rf_profiles = detail_data.get(network_rf_profiles_key)

+    detail_data.get(network_rf_profiles_key)

+

+

+def _fallback_network_group_policies(

+    network_id: str,

+    network_group_policies_key: str,

+    previous_data: dict[str, Any],

+) -> list[dict[str, Any]]:

+    """Get fallback Group Policies from previous data."""

+    if not previous_data:

+        return []

+

+    if "group_policies" in previous_data:

+        return previous_data["group_policies"].get(network_id, [])

+    if network_group_policies_key in previous_data:

+        return previous_data.get(network_group_policies_key, [])

+

+    return []

+

+

+def _process_network_group_policies(

+    network_id: str,

+    detail_data: dict[str, Any],

+    previous_data: dict[str, Any],

+) -> list[dict[str, Any]]:

+    """Process Group Policies for a single network."""

+    network_group_policies_key = f"group_policies_{network_id}"

+    network_group_policies = detail_data.get(network_group_policies_key)

 

-    if isinstance(network_rf_profiles, list):

-        return network_rf_profiles

+    if isinstance(network_group_policies, list):

+        return network_group_policies

 

-    return _fallback_network_rf_profiles(

-        network_id, network_rf_profiles_key, previous_data

+    return _fallback_network_group_policies(

+        network_id, network_group_policies_key, previous_data

     )

diff --git a/custom_components/meraki_ha/discovery/providers/uplink.py b/custom_components/meraki_ha/discovery/providers/uplink.py

index d18181b9..0c6f5f8c 100644

--- a/custom_components/meraki_ha/discovery/providers/uplink.py

+++ b/custom_components/meraki_ha/discovery/providers/uplink.py

@@ -5,8 +5,6 @@ from __future__ import annotations

 import logging

 from typing import TYPE_CHECKING, Any, Literal, cast

 

-from custom_components.meraki_ha.const.config import CONF_ENABLE_PORT_SENSORS

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.components.sensor import (

     SensorDeviceClass,

     SensorEntityDescription,

@@ -16,6 +14,9 @@ from homeassistant.const import PERCENTAGE, UnitOfTime

 from homeassistant.helpers import device_registry as dr

 from homeassistant.helpers import entity_registry as er

 

+from custom_components.meraki_ha.const.config import CONF_ENABLE_PORT_SENSORS

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ...sensor.device.appliance_uplink import MerakiApplianceUplinkSensor

 from ...sensor.uplink_performance import MerakiUplinkPerformanceSensor

 

diff --git a/custom_components/meraki_ha/helpers/device_info_helpers.py b/custom_components/meraki_ha/helpers/device_info_helpers.py

index 2d93472b..643293ef 100644

--- a/custom_components/meraki_ha/helpers/device_info_helpers.py

+++ b/custom_components/meraki_ha/helpers/device_info_helpers.py

@@ -4,10 +4,11 @@ import logging

 from dataclasses import asdict, is_dataclass

 from typing import Any

 

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.config_entries import ConfigEntry

 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ..core.models.device import MerakiDevice

 from ..core.models.network import MerakiNetwork

 from ..core.utils.naming_utils import standardize_device_name

diff --git a/custom_components/meraki_ha/meraki_select/meraki_content_filtering.py b/custom_components/meraki_ha/meraki_select/meraki_content_filtering.py

index 8be228f2..8fa70c04 100644

--- a/custom_components/meraki_ha/meraki_select/meraki_content_filtering.py

+++ b/custom_components/meraki_ha/meraki_select/meraki_content_filtering.py

@@ -17,7 +17,7 @@ from ..helpers.device_info_helpers import resolve_device_info

 

 _LOGGER = logging.getLogger(__name__)

 

-# Profiles mapped to generic, lowercase category names. 

+# Profiles mapped to generic, lowercase category names.

 # We will dynamically resolve these to actual API IDs at runtime.

 CONTENT_FILTERING_PROFILE_TARGETS: dict[str, list[str]] = {

     "None": [],

@@ -52,6 +52,7 @@ CONTENT_FILTERING_PROFILE_TARGETS: dict[str, list[str]] = {

     ],

 }

 

+

 class MerakiContentFilteringSelect(MerakiEntity[MerakiMainCoordinator], SelectEntity):

     """Representation of a Meraki Content Filtering select entity."""

 

@@ -93,17 +94,21 @@ class MerakiContentFilteringSelect(MerakiEntity[MerakiMainCoordinator], SelectEn

     @property

     def current_option(self) -> str | None:

         """Return the current selected option based on quantity of blocked categories."""

-        if not self.coordinator.data or not self.coordinator.data.get("content_filtering"):

+        if not self.coordinator.data or not self.coordinator.data.get(

+            "content_filtering"

+        ):

             return None

 

-        content_filtering = self.coordinator.data["content_filtering"].get(self._network_id)

+        content_filtering = self.coordinator.data["content_filtering"].get(

+            self._network_id

+        )

         if not content_filtering or not isinstance(content_filtering, dict):

             return None

 

         blocked_categories = ensure_list_of_strings(

             content_filtering.get("blockedUrlCategories", []), key_to_extract="id"

         )

-        

+

         # Use a robust heuristic to map current state without needing synchronous API calls

         count = len(blocked_categories)

         if count == 0:

@@ -125,23 +130,31 @@ class MerakiContentFilteringSelect(MerakiEntity[MerakiMainCoordinator], SelectEn

 

         try:

             appliance = self._meraki_client.appliance

-            

+

             # If not 'None', dynamically fetch the master list of valid categories for this specific MX

             if target_names:

-                resp = await appliance.get_network_appliance_content_filtering_categories(

-                    network_id=self._network_id

+                resp = (

+                    await appliance.get_network_appliance_content_filtering_categories(

+                        network_id=self._network_id

+                    )

                 )

-                

+

                 # Handle both list and dict response formats from the Meraki library

-                valid_categories = resp if isinstance(resp, list) else resp.get("categories", [])

-                name_to_id = {cat["name"].lower(): cat["id"] for cat in valid_categories}

-                

+                valid_categories = (

+                    resp if isinstance(resp, list) else resp.get("categories", [])

+                )

+                name_to_id = {

+                    cat["name"].lower(): cat["id"] for cat in valid_categories

+                }

+

                 # Match our target names against the live, valid API names (with fuzzy matching for spacing)

                 for target in target_names:

                     for valid_name, valid_id in name_to_id.items():

-                        if target == valid_name or target.replace(" ", "") == valid_name.replace(" ", ""):

+                        if target == valid_name or target.replace(

+                            " ", ""

+                        ) == valid_name.replace(" ", ""):

                             resolved_ids.add(valid_id)

-            

+

             final_blocked_ids = list(resolved_ids)

 

             # Send the validated payload

@@ -150,7 +163,7 @@ class MerakiContentFilteringSelect(MerakiEntity[MerakiMainCoordinator], SelectEn

                 blockedUrlCategories=final_blocked_ids,

             )

             await self.coordinator.async_request_refresh()

-            

+

         except Exception as e:

             _LOGGER.error(

                 "Failed to set content filtering profile to '%s' for network %s: %s",

diff --git a/custom_components/meraki_ha/sensor/device/appliance_port.py b/custom_components/meraki_ha/sensor/device/appliance_port.py

index a59a485f..0c1dffed 100644

--- a/custom_components/meraki_ha/sensor/device/appliance_port.py

+++ b/custom_components/meraki_ha/sensor/device/appliance_port.py

@@ -5,13 +5,14 @@ from __future__ import annotations

 import logging

 from typing import Any, cast

 

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.components.sensor import SensorEntity

 from homeassistant.const import EntityCategory

 from homeassistant.core import callback

 from homeassistant.helpers.device_registry import DeviceInfo

 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ...coordinators import MerakiMainCoordinator

 from ...core.models import MerakiAppliancePort

 from ...core.models.device import MerakiDevice

diff --git a/custom_components/meraki_ha/sensor/device/poe_usage.py b/custom_components/meraki_ha/sensor/device/poe_usage.py

index 92e0a863..cb871fb7 100644

--- a/custom_components/meraki_ha/sensor/device/poe_usage.py

+++ b/custom_components/meraki_ha/sensor/device/poe_usage.py

@@ -5,13 +5,14 @@ from __future__ import annotations

 import logging

 from typing import TYPE_CHECKING, Any, cast

 

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.components.sensor import SensorEntity, SensorStateClass

 from homeassistant.const import UnitOfPower

 from homeassistant.core import callback

 from homeassistant.helpers.device_registry import DeviceInfo

 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ...coordinators import MerakiMainCoordinator

 from ...core.utils.naming_utils import format_device_name

 

diff --git a/custom_components/meraki_ha/sensor/device/rtsp_url.py b/custom_components/meraki_ha/sensor/device/rtsp_url.py

index a702b2b4..845916ee 100644

--- a/custom_components/meraki_ha/sensor/device/rtsp_url.py

+++ b/custom_components/meraki_ha/sensor/device/rtsp_url.py

@@ -5,13 +5,14 @@ from __future__ import annotations

 import logging

 from typing import cast

 

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.components.sensor import SensorEntity

 from homeassistant.config_entries import ConfigEntry

 from homeassistant.const import EntityCategory

 from homeassistant.helpers.device_registry import DeviceInfo

 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ...coordinators import MerakiMainCoordinator

 from ...core.models.device import MerakiDevice

 from ...core.utils.naming_utils import format_device_name

diff --git a/custom_components/meraki_ha/sensor/network/base.py b/custom_components/meraki_ha/sensor/network/base.py

index ffef5eac..29b6ae1b 100644

--- a/custom_components/meraki_ha/sensor/network/base.py

+++ b/custom_components/meraki_ha/sensor/network/base.py

@@ -3,12 +3,13 @@

 import logging

 from typing import Any

 

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.components.sensor import SensorEntity

 from homeassistant.config_entries import ConfigEntry

 from homeassistant.core import callback

 from homeassistant.helpers.device_registry import DeviceInfo

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ...coordinators import MerakiSwitchCoordinator

 from ...entity import MerakiEntity

 

diff --git a/custom_components/meraki_ha/services/__init__.py b/custom_components/meraki_ha/services/__init__.py

index d258226b..e6c84a2b 100644

--- a/custom_components/meraki_ha/services/__init__.py

+++ b/custom_components/meraki_ha/services/__init__.py

@@ -6,12 +6,12 @@ import logging

 from typing import TYPE_CHECKING

 

 import voluptuous as vol

-

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.core import HomeAssistant, ServiceCall

 from homeassistant.exceptions import HomeAssistantError

 from homeassistant.helpers import config_validation as cv

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 if TYPE_CHECKING:

     from .ipsk_manager import IPSKManager

 

@@ -40,6 +40,7 @@ GUEST_ACCESS_SCHEMA = vol.Schema(

         vol.Required("duration"): cv.positive_int,

         vol.Optional("guest_name", default="Guest"): cv.string,

         vol.Optional("passphrase"): cv.string,

+        vol.Optional("group_policy"): cv.string,

     }

 )

 

@@ -81,6 +82,7 @@ async def async_setup_services(hass: HomeAssistant) -> None:

         duration = call.data["duration"]

         guest_name = call.data["guest_name"]

         passphrase = call.data.get("passphrase")

+        group_policy = call.data.get("group_policy")

 

         ipsk_manager: IPSKManager | None = hass.data[DOMAIN].get("ipsk_manager")

         if not ipsk_manager:

@@ -90,6 +92,12 @@ async def async_setup_services(hass: HomeAssistant) -> None:

         if not config_entry_id:

             raise HomeAssistantError(f"Network ID {network_id} not found")

 

+        # Handle automatic group policy creation

+        if group_policy == "CREATE":

+            group_policy = await ipsk_manager.get_or_create_guest_policy(

+                config_entry_id, network_id

+            )

+

         # Map frontend parameters to the underlying IPSK manager method

         await ipsk_manager.create_guest_key(

             config_entry_id=config_entry_id,

@@ -98,6 +106,7 @@ async def async_setup_services(hass: HomeAssistant) -> None:

             duration_minutes=duration,

             name=guest_name,

             passphrase=passphrase,

+            group_policy_id=group_policy,

         )

 

     # Register both service entry points

diff --git a/custom_components/meraki_ha/services/ipsk_manager.py b/custom_components/meraki_ha/services/ipsk_manager.py

index ea2e8670..4e6baf98 100644

--- a/custom_components/meraki_ha/services/ipsk_manager.py

+++ b/custom_components/meraki_ha/services/ipsk_manager.py

@@ -70,6 +70,60 @@ class IPSKManager:

         """Save current keys to storage."""

         await self.store.async_save({"keys": self.active_keys})

 

+    async def get_or_create_guest_policy(

+        self, config_entry_id: str, network_id: str

+    ) -> str | None:

+        """Find or create a 'Home Assistant Guest' Group Policy for the network."""

+        client = self._get_client(config_entry_id)

+        if not client:

+            _LOGGER.error("Cannot create guest policy: Client unavailable")

+            return None

+

+        policy_name = "Home Assistant Guest"

+

+        try:

+            # Check if it already exists

+            policies = await client.networks.get_group_policies(network_id)

+            for policy in policies:

+                if policy.get("name") == policy_name:

+                    return str(policy["groupPolicyId"])

+

+            # Create it if it doesn't exist

+            _LOGGER.info(

+                "Creating new group policy '%s' for network %s", policy_name, network_id

+            )

+

+            # Use raw post because python library might lack the endpoint or have

+            # strict kwargs

+            metadata = {

+                "tags": ["networks", "configure", "groupPolicies"],

+                "operation": "createNetworkGroupPolicy",

+            }

+            resource = f"/networks/{network_id}/groupPolicies"

+            payload = {

+                "name": policy_name,

+                "scheduling": {"enabled": False},

+                "bandwidth": {"settings": "network default"},

+            }

+

+            if client.dashboard is None:

+                return None

+

+            response = await client.run_sync(

+                client.dashboard.networks._session.post,

+                metadata,

+                resource,

+                payload,

+            )

+

+            if response and "groupPolicyId" in response:

+                return str(response["groupPolicyId"])

+

+        except Exception as err:

+            _LOGGER.error("Failed to get or create guest policy: %s", err)

+

+        return None

+

     async def create_guest_key(

         self,

         config_entry_id: str,

diff --git a/custom_components/meraki_ha/switch/camera_settings.py b/custom_components/meraki_ha/switch/camera_settings.py

index f39cfae9..8bc37154 100644

--- a/custom_components/meraki_ha/switch/camera_settings.py

+++ b/custom_components/meraki_ha/switch/camera_settings.py

@@ -4,10 +4,11 @@ import dataclasses

 import logging

 from typing import Any, cast

 

-from custom_components.meraki_ha.coordinators import MerakiSwitchCoordinator

 from homeassistant.components.switch import SwitchEntity

 from homeassistant.helpers.device_registry import DeviceInfo

 

+from custom_components.meraki_ha.coordinators import MerakiSwitchCoordinator

+

 from ..core.api import MerakiApiClientProtocol

 from ..core.models.device import MerakiDevice

 from ..core.utils.naming_utils import standardize_device_name

diff --git a/custom_components/meraki_ha/switch/meraki_ssid_device_switch.py b/custom_components/meraki_ha/switch/meraki_ssid_device_switch.py

index 5eaf6d7f..0cee626e 100644

--- a/custom_components/meraki_ha/switch/meraki_ssid_device_switch.py

+++ b/custom_components/meraki_ha/switch/meraki_ssid_device_switch.py

@@ -3,12 +3,13 @@

 import logging

 from typing import Any

 

-from custom_components.meraki_ha.const.integration import DOMAIN

 from homeassistant.components.switch import SwitchEntity

 from homeassistant.config_entries import ConfigEntry

 from homeassistant.core import callback

 from homeassistant.helpers.device_registry import DeviceInfo

 

+from custom_components.meraki_ha.const.integration import DOMAIN

+

 from ..coordinators import MerakiSwitchCoordinator

 from ..core.api import MerakiApiClientProtocol

 from ..core.utils.icon_utils import get_device_type_icon

diff --git a/frontend/src/meraki-guest-access-card-editor.ts b/frontend/src/meraki-guest-access-card-editor.ts

index d8c1edd5..21f1e447 100644

--- a/frontend/src/meraki-guest-access-card-editor.ts

+++ b/frontend/src/meraki-guest-access-card-editor.ts

@@ -2,7 +2,7 @@ import { LitElement, html, css, PropertyValues } from 'lit';

 import { customElement, property, state } from 'lit/decorators.js';

 import { HomeAssistant } from './types/ha';

 import { renderWarning, renderLoading, sharedStyles } from './shared-ui';

-import { MerakiDataProvider } from './utils/meraki-data';

+import { MerakiDataProvider, GroupPolicy } from './utils/meraki-data';

 import './meraki-content-filter-card';

 import './meraki-wifi-qr-card';

 import './meraki-network-vitals-card';

@@ -28,10 +28,12 @@ export class MerakiGuestAccessCard extends LitElement {

     ssid: '',

     duration: '60',

     guestName: '',

+    groupPolicy: 'NONE',

   };

 

   @state() private _networks: Network[] = [];

   @state() private _ssids: SSID[] = [];

+  @state() private _groupPolicies: GroupPolicy[] = [];

   @state() private _creating: boolean = false;

   @state() private _error: string | null = null;

   @state() private _success: string | null = null;

@@ -68,11 +70,11 @@ export class MerakiGuestAccessCard extends LitElement {

     if (!this.hass) return;

     this._isLoading = true;

 

-    const { networks, ssids, entryId } = await MerakiDataProvider.fetchConfig(

-      this.hass

-    );

+    const { networks, ssids, groupPolicies, entryId } =

+      await MerakiDataProvider.fetchConfig(this.hass);

     this._networks = networks;

     this._ssids = ssids;

+    this._groupPolicies = groupPolicies || [];

     this._configEntryId = this._config?.config_entry_id || entryId;

 

     if (networks.length > 0 && !this._formData.network) {

@@ -90,7 +92,7 @@ export class MerakiGuestAccessCard extends LitElement {

 

     // Clear SSID if network changes

     if (this._formData.network !== oldNetwork) {

-      this._formData = { ...this._formData, ssid: '' };

+      this._formData = { ...this._formData, ssid: '', groupPolicy: 'NONE' };

     }

   }

 

@@ -99,6 +101,7 @@ export class MerakiGuestAccessCard extends LitElement {

     if (schema.name === 'ssid') return 'SSID';

     if (schema.name === 'duration') return 'Duration';

     if (schema.name === 'guestName') return 'Guest Name';

+    if (schema.name === 'groupPolicy') return 'Group Policy';

     return schema.name;

   };

 

@@ -136,6 +139,10 @@ export class MerakiGuestAccessCard extends LitElement {

       this._formData.network,

       'number'

     );

+    const groupPolicyOptions = MerakiDataProvider.getGroupPolicyOptions(

+      this._groupPolicies,

+      this._formData.network

+    );

 

     const schema = [

       {

@@ -146,6 +153,12 @@ export class MerakiGuestAccessCard extends LitElement {

         name: 'ssid',

         selector: { select: { options: ssidOptions, mode: 'dropdown' } },

       },

+      {

+        name: 'groupPolicy',

+        selector: {

+          select: { options: groupPolicyOptions, mode: 'dropdown' },

+        },

+      },

       {

         name: 'duration',

         selector: {

@@ -229,6 +242,13 @@ export class MerakiGuestAccessCard extends LitElement {

         payload.guest_name = this._formData.guestName;

       }

 

+      if (

+        this._formData.groupPolicy &&

+        this._formData.groupPolicy !== 'NONE'

+      ) {

+        payload.group_policy = this._formData.groupPolicy;

+      }

+

       await this.hass.callService(

         'meraki_ha',

         'generate_guest_access',

diff --git a/frontend/src/meraki-guest-access-card.ts b/frontend/src/meraki-guest-access-card.ts

index 3c2531c2..a25327b2 100644

--- a/frontend/src/meraki-guest-access-card.ts

+++ b/frontend/src/meraki-guest-access-card.ts

@@ -2,7 +2,7 @@ import { LitElement, html, css, PropertyValues } from 'lit';

 import { customElement, property, state } from 'lit/decorators.js';

 import { HomeAssistant } from './types/ha';

 import { renderWarning, renderLoading, sharedStyles } from './shared-ui';

-import { MerakiDataProvider } from './utils/meraki-data';

+import { MerakiDataProvider, GroupPolicy } from './utils/meraki-data';

 import './meraki-content-filter-card';

 import './meraki-wifi-qr-card';

 import './meraki-network-vitals-card';

@@ -27,10 +27,12 @@ export class MerakiGuestAccessCard extends LitElement {

     passphrase: '',

     duration: '60',

     guestName: '',

+    groupPolicy: 'NONE',

   };

 

   @state() private _networks: Network[] = [];

   @state() private _ssids: SSID[] = [];

+  @state() private _groupPolicies: GroupPolicy[] = [];

   @state() private _creating: boolean = false;

   @state() private _error: string | null = null;

   @state() private _success: string | null = null;

@@ -67,11 +69,11 @@ export class MerakiGuestAccessCard extends LitElement {

     if (!this.hass) return;

     this._isLoading = true;

 

-    const { networks, ssids, entryId } = await MerakiDataProvider.fetchConfig(

-      this.hass

-    );

+    const { networks, ssids, groupPolicies, entryId } =

+      await MerakiDataProvider.fetchConfig(this.hass);

     this._networks = networks;

     this._ssids = ssids;

+    this._groupPolicies = groupPolicies || [];

     this._configEntryId = this._config?.config_entry_id || entryId;

 

     let initNetwork = this._formData.network;

@@ -166,6 +168,7 @@ export class MerakiGuestAccessCard extends LitElement {

     if (updatedData.network !== oldNetwork) {

       updatedData.ssid = '';

       updatedData.passphrase = '';

+      updatedData.groupPolicy = 'NONE';

 

       const availableSsids = this._ssids.filter(

         (s) => s.networkId === updatedData.network

@@ -193,6 +196,7 @@ export class MerakiGuestAccessCard extends LitElement {

       return 'Passphrase / PSK (Auto-discovered)';

     if (schema.name === 'duration') return 'Duration';

     if (schema.name === 'guestName') return 'Guest Name';

+    if (schema.name === 'groupPolicy') return 'Group Policy';

     return schema.name;

   };

 

@@ -230,6 +234,10 @@ export class MerakiGuestAccessCard extends LitElement {

       this._formData.network,

       'number'

     );

+    const groupPolicyOptions = MerakiDataProvider.getGroupPolicyOptions(

+      this._groupPolicies,

+      this._formData.network

+    );

 

     const schema = [

       {

@@ -240,6 +248,12 @@ export class MerakiGuestAccessCard extends LitElement {

         name: 'ssid',

         selector: { select: { options: ssidOptions, mode: 'dropdown' } },

       },

+      {

+        name: 'groupPolicy',

+        selector: {

+          select: { options: groupPolicyOptions, mode: 'dropdown' },

+        },

+      },

       { name: 'passphrase', selector: { text: {} } },

       {

         name: 'duration',

diff --git a/frontend/src/utils/meraki-data.ts b/frontend/src/utils/meraki-data.ts

index a07c3594..64578a76 100644

--- a/frontend/src/utils/meraki-data.ts

+++ b/frontend/src/utils/meraki-data.ts

@@ -4,9 +4,15 @@ import { Network, SSID } from '../types/meraki';

 import { WsCommand } from '../types/websocket';

 import { safeCallWS } from './api';

 

+export interface GroupPolicy {

+  networkId: string;

+  groupPolicyId: string;

+  name: string;

+}

+

 export class MerakiDataProvider {

   /**

-   * Fetches wireless networks and SSIDs directly from the integration's backend cache.

+   * Fetches wireless networks, SSIDs, and group policies directly from the integration's backend cache.

    */

   static async fetchConfig(hass: HomeAssistant) {

     try {

@@ -15,22 +21,42 @@ export class MerakiDataProvider {

         domain: 'meraki_ha',

       });

 

-      const entryId = configEntries.length > 0 ? configEntries[0].entry_id : null;

-      if (!entryId) return { networks: [], ssids: [], entryId: null };

+      const entryId =

+        configEntries.length > 0 ? configEntries[0].entry_id : null;

+      if (!entryId)

+        return { networks: [], ssids: [], groupPolicies: [], entryId: null };

 

       const data = await safeCallWS<any>(hass, {

         type: WsCommand.GET_CONFIG,

         config_entry_id: entryId,

       });

 

-      const networks: Network[] = (Array.isArray(data.networks) ? data.networks : [])

-        .filter((n: any) => n.productTypes?.includes('wireless'));

+      const networks: Network[] = (

+        Array.isArray(data.networks) ? data.networks : []

+      ).filter((n: any) => n.productTypes?.includes('wireless'));

       const ssids: SSID[] = Array.isArray(data.ssids) ? data.ssids : [];

 

-      return { networks, ssids, entryId };

+      const groupPolicies: GroupPolicy[] = [];

+      if (data.group_policies && typeof data.group_policies === 'object') {

+        for (const [networkId, policies] of Object.entries(

+          data.group_policies

+        )) {

+          if (Array.isArray(policies)) {

+            policies.forEach((p: any) => {

+              groupPolicies.push({

+                networkId,

+                groupPolicyId: String(p.groupPolicyId),

+                name: p.name,

+              });

+            });

+          }

+        }

+      }

+

+      return { networks, ssids, groupPolicies, entryId };

     } catch (err) {

       console.error('Failed to fetch Meraki data via WS:', err);

-      return { networks: [], ssids: [], entryId: null };

+      return { networks: [], ssids: [], groupPolicies: [], entryId: null };

     }

   }

 

@@ -38,19 +64,48 @@ export class MerakiDataProvider {

    * Formats networks for an ha-form dropdown.

    */

   static getNetworkOptions(networks: Network[], includeAllOption = false) {

-    const options = networks.map(n => ({ value: n.id, label: n.name }));

-    return includeAllOption ? [{ value: "", label: "All Networks" }, ...options] : options;

+    const options = networks.map((n) => ({ value: n.id, label: n.name }));

+    return includeAllOption

+      ? [{ value: '', label: 'All Networks' }, ...options]

+      : options;

   }

 

   /**

-   * Formats SSIDs for an ha-form dropdown. 

+   * Formats SSIDs for an ha-form dropdown.

    * @param valueType Determines if the dropdown returns the SSID's string name (for QR codes) or integer number (for Guest API calls).

    */

-  static getSsidOptions(ssids: SSID[], networkId?: string, valueType: 'name' | 'number' = 'name') {

-    const filtered = networkId ? ssids.filter(s => s.networkId === networkId) : ssids;

-    return filtered.map(s => ({

+  static getSsidOptions(

+    ssids: SSID[],

+    networkId?: string,

+    valueType: 'name' | 'number' = 'name'

+  ) {

+    const filtered = networkId

+      ? ssids.filter((s) => s.networkId === networkId)

+      : ssids;

+    return filtered.map((s) => ({

       value: valueType === 'number' ? String(s.number) : s.name,

-      label: `${s.name} (SSID ${s.number})`

+      label: `${s.name} (SSID ${s.number})`,

+    }));

+  }

+

+  /**

+   * Formats Group Policies for an ha-form dropdown.

+   */

+  static getGroupPolicyOptions(

+    groupPolicies: GroupPolicy[],

+    networkId?: string

+  ) {

+    const filtered = networkId

+      ? groupPolicies.filter((p) => p.networkId === networkId)

+      : groupPolicies;

+    const options = filtered.map((p) => ({

+      value: p.groupPolicyId,

+      label: p.name,

     }));

+    return [

+      { value: 'CREATE', label: "Create 'Home Assistant Guest' Policy" },

+      { value: 'NONE', label: 'None (Network Default)' },

+      ...options,

+    ];

   }

 }

diff --git a/scripts/reset_integration.py b/scripts/reset_integration.py

index 0f9ddb5d..e289af90 100644

--- a/scripts/reset_integration.py

+++ b/scripts/reset_integration.py

@@ -215,17 +215,17 @@ async def _start_config_flow(session: aiohttp.ClientSession) -> dict[str, Any] |

 def _build_form_payload(step_id: str, current_step: dict[str, Any]) -> dict[str, Any]:

     """Build the payload dynamically based on the step_id and schema requirements."""

     payload: dict[str, Any] = {}

-    

+

     # 1. Fill explicitly based on known step progression

     if step_id == "user":

         payload["api_key"] = MERAKI_API_KEY

     elif step_id in ("select_org", "organization"):

         payload["organization_id"] = MERAKI_ORG_ID

-        

+

     # 2. Inspect the schema to dynamically catch fields and fill defaults

     for field in current_step.get("data_schema", []):

         field_name = field["name"]

-        

+

         # Don't overwrite if we already set it above

         if field_name not in payload:

             # Catch-all in case the step_id is named something unexpected

@@ -239,7 +239,7 @@ def _build_form_payload(step_id: str, current_step: dict[str, Any]) -> dict[str,

                 logger.warning(

                     f"Required field '{field_name}' has no default value."

                 )

-                

+

     return payload

 

 

diff --git a/tests/__init__.py b/tests/__init__.py

index 897d7c8b..714a9196 100644

--- a/tests/__init__.py

+++ b/tests/__init__.py

@@ -17,13 +17,15 @@ from typing import Any

 from homeassistant.core import HomeAssistant

 from pytest_homeassistant_custom_component.common import MockConfigEntry

 

+from custom_components.meraki_ha.const.config import (

+    CONF_MERAKI_API_KEY,

+    CONF_MERAKI_ORG_ID,

+)

 from custom_components.meraki_ha.const.integration import DOMAIN

 

 from .const import MERAKI_TEST_API_KEY, MERAKI_TEST_ORG_ID

 

 

-from custom_components.meraki_ha.const.config import CONF_MERAKI_API_KEY, CONF_MERAKI_ORG_ID

-

 async def async_get_config_entry(

     hass: HomeAssistant, data: dict[str, Any] | None = None

 ) -> MockConfigEntry:

diff --git a/tests/meraki_select/test_content_filtering_select.py b/tests/meraki_select/test_content_filtering_select.py

index 10164f26..6e1a80d6 100644

--- a/tests/meraki_select/test_content_filtering_select.py

+++ b/tests/meraki_select/test_content_filtering_select.py

@@ -7,8 +7,11 @@ from homeassistant.core import HomeAssistant

 from homeassistant.setup import async_setup_component

 from pytest_homeassistant_custom_component.common import MockConfigEntry

 

+from custom_components.meraki_ha.const.config import (

+    CONF_MERAKI_API_KEY,

+    CONF_MERAKI_ORG_ID,

+)

 from custom_components.meraki_ha.const.integration import DOMAIN

-from custom_components.meraki_ha.const.config import CONF_MERAKI_API_KEY, CONF_MERAKI_ORG_ID

 from tests.const import MOCK_NETWORK

 

 

@@ -35,13 +38,25 @@ def mock_meraki_client() -> MagicMock:

     client.appliance.get_network_appliance_content_filtering_categories = AsyncMock(

         return_value={

             "categories": [

-                {"id": "meraki:contentFiltering/category/1", "name": "Adult and Pornography"},

+                {

+                    "id": "meraki:contentFiltering/category/1",

+                    "name": "Adult and Pornography",

+                },

                 {"id": "meraki:contentFiltering/category/2", "name": "Nudity"},

                 {"id": "meraki:contentFiltering/category/8", "name": "Malware Sites"},

-                {"id": "meraki:contentFiltering/category/9", "name": "Phishing and Other Frauds"},

+                {

+                    "id": "meraki:contentFiltering/category/9",

+                    "name": "Phishing and Other Frauds",

+                },

                 {"id": "meraki:contentFiltering/category/11", "name": "Bot Nets"},

-                {"id": "meraki:contentFiltering/category/12", "name": "Spyware and Adware"},

-                {"id": "meraki:contentFiltering/category/15", "name": "Proxy Avoidance and Anonymizers"},

+                {

+                    "id": "meraki:contentFiltering/category/12",

+                    "name": "Spyware and Adware",

+                },

+                {

+                    "id": "meraki:contentFiltering/category/15",

+                    "name": "Proxy Avoidance and Anonymizers",

+                },

             ]

         }

     )

diff --git a/tests/sensor/test_network_health.py b/tests/sensor/test_network_health.py

index 1240b683..01f91a23 100644

--- a/tests/sensor/test_network_health.py

+++ b/tests/sensor/test_network_health.py

@@ -2,9 +2,10 @@

 

 from unittest.mock import MagicMock

 

-from custom_components.meraki_ha.sensor.network_health import MerakiNetworkHealthSensor

 from homeassistant.core import HomeAssistant

 

+from custom_components.meraki_ha.sensor.network_health import MerakiNetworkHealthSensor

+

 

 class MockDevice:

     """Mock Meraki device for testing."""

diff --git a/tests/sensor/test_setup_mt_sensors.py b/tests/sensor/test_setup_mt_sensors.py

index a43b7cca..3f3d3527 100644

--- a/tests/sensor/test_setup_mt_sensors.py

+++ b/tests/sensor/test_setup_mt_sensors.py

@@ -5,15 +5,15 @@ from typing import Any, cast

 from unittest.mock import MagicMock

 

 import pytest

-

-from custom_components.meraki_ha.discovery.entities import MerakiSignalStrengthSensor

-from custom_components.meraki_ha.discovery.service import DeviceDiscoveryService

-from custom_components.meraki_ha.types import MerakiDevice

 from homeassistant.components.binary_sensor import BinarySensorEntity

 from homeassistant.components.sensor import SensorEntity

 from homeassistant.helpers.entity import Entity

 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 

+from custom_components.meraki_ha.discovery.entities import MerakiSignalStrengthSensor

+from custom_components.meraki_ha.discovery.service import DeviceDiscoveryService

+from custom_components.meraki_ha.types import MerakiDevice

+

 MT_DEVICES_DATA: list[dict[str, Any]] = [

     {

         "serial": "mt10-1",

diff --git a/tests/test_migration.py b/tests/test_migration.py

index de8e4165..f7f4d53b 100644

--- a/tests/test_migration.py

+++ b/tests/test_migration.py

@@ -1,8 +1,11 @@

 """Test migration for Meraki."""

+

 from homeassistant.core import HomeAssistant

-from custom_components.meraki_ha import async_migrate_entry

 from pytest_homeassistant_custom_component.common import MockConfigEntry

 

+from custom_components.meraki_ha import async_migrate_entry

+

+

 async def test_migration_v1_to_v2(hass: HomeAssistant):

     """Test migrating a config entry from version 1 to 2."""

     entry = MockConfigEntry(

diff --git a/tests/test_services_ipsk.py b/tests/test_services_ipsk.py

index a05ff501..23fd199f 100644

--- a/tests/test_services_ipsk.py

+++ b/tests/test_services_ipsk.py

@@ -3,10 +3,10 @@

 from unittest.mock import AsyncMock, MagicMock

 

 import pytest

+from homeassistant.exceptions import HomeAssistantError

 

 from custom_components.meraki_ha.const.integration import DOMAIN

 from custom_components.meraki_ha.services import async_setup_services

-from homeassistant.exceptions import HomeAssistantError

 

 

 @pytest.fixture(autouse=True)

diff --git a/tests/test_webhook_fault_tolerance.py b/tests/test_webhook_fault_tolerance.py

index 934c804c..6a5dbecd 100644

--- a/tests/test_webhook_fault_tolerance.py

+++ b/tests/test_webhook_fault_tolerance.py

@@ -3,9 +3,9 @@

 from unittest.mock import AsyncMock, patch

 

 import pytest

+from homeassistant.core import HomeAssistant

 

 from custom_components.meraki_ha.webhook import async_register_webhook

-from homeassistant.core import HomeAssistant

 

 

 @pytest.fixture

�