Add configflow for the SPC integration

homeassistant/components/spc/__init__.py

@@ -1,81 +1,115 @@
 """Support for Vanderbilt (formerly Siemens) SPC alarm systems."""
 
+from __future__ import annotations
+
 import logging
+from typing import cast
 
+from aiohttp import ClientError
 from pyspcwebgw import SpcWebGateway
 from pyspcwebgw.area import Area
 from pyspcwebgw.zone import Zone
 import voluptuous as vol
 
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client, discovery
-import homeassistant.helpers.config_validation as cv
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import aiohttp_client, device_registry as dr
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 
-_LOGGER = logging.getLogger(__name__)
-
-CONF_WS_URL = "ws_url"
-CONF_API_URL = "api_url"
-
-DOMAIN = "spc"
-DATA_API = "spc_api"
+from .const import (
+    CONF_API_URL,
+    CONF_WS_URL,
+    DATA_SCHEMA,
+    DOMAIN,
+    SIGNAL_UPDATE_ALARM,
+    SIGNAL_UPDATE_SENSOR,
+)
 
-SIGNAL_UPDATE_ALARM = "spc_update_alarm_{}"
-SIGNAL_UPDATE_SENSOR = "spc_update_sensor_{}"
+_LOGGER = logging.getLogger(__name__)
 
 CONFIG_SCHEMA = vol.Schema(
     {
-        DOMAIN: vol.Schema(
-            {
-                vol.Required(CONF_WS_URL): cv.string,
-                vol.Required(CONF_API_URL): cv.string,
-            }
-        )
+        DOMAIN: DATA_SCHEMA,
     },
     extra=vol.ALLOW_EXTRA,
 )
 
+PLATFORMS = (Platform.ALARM_CONTROL_PANEL, Platform.BINARY_SENSOR)
+
+
+class SPCConfigEntry(ConfigEntry):
+    """Handle SPC config entry."""
+
+    runtime_data: SpcWebGateway
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the SPC component."""
+    if DOMAIN in config:
+        hass.async_create_task(
+            hass.config_entries.flow.async_init(
+                DOMAIN, context={"source": SOURCE_IMPORT}, data=config[DOMAIN]
+            )
+        )
 
-    async def async_update_callback(spc_object):
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up SPC from a config entry."""
+
+    async def async_update_callback(spc_object: Area | Zone) -> None:
+        """Process updates from SPC system."""
         if isinstance(spc_object, Area):
             async_dispatcher_send(hass, SIGNAL_UPDATE_ALARM.format(spc_object.id))
         elif isinstance(spc_object, Zone):
             async_dispatcher_send(hass, SIGNAL_UPDATE_SENSOR.format(spc_object.id))
+        else:
+            _LOGGER.warning("Received invalid update object type: %s", type(spc_object))
 
     session = aiohttp_client.async_get_clientsession(hass)
+    entry = cast(SPCConfigEntry, entry)
+
+    try:
+        spc = SpcWebGateway(
+            loop=hass.loop,
+            session=session,
+            api_url=entry.data[CONF_API_URL],
+            ws_url=entry.data[CONF_WS_URL],
+            async_callback=async_update_callback,
+        )
 
-    spc = SpcWebGateway(
-        loop=hass.loop,
-        session=session,
-        api_url=config[DOMAIN].get(CONF_API_URL),
-        ws_url=config[DOMAIN].get(CONF_WS_URL),
-        async_callback=async_update_callback,
+        if not await spc.async_load_parameters():
+            raise ConfigEntryNotReady("Cannot connect to SPC controller")
+    except (ClientError, ConnectionError, TimeoutError) as err:
+        raise ConfigEntryNotReady("Cannot connect to SPC controller") from err
+
+    entry.runtime_data = spc
+
+    device_registry = dr.async_get(hass)
+    device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        identifiers={(DOMAIN, spc.info["sn"])},
+        manufacturer="Vanderbilt",
+        name=spc.info["sn"],
+        model=spc.info["type"],
+        sw_version=spc.info["version"],
+        configuration_url=f"http://{spc.ethernet['ip_address']}/",
     )
 
-    hass.data[DATA_API] = spc
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
-    if not await spc.async_load_parameters():
-        _LOGGER.error("Failed to load area/zone information from SPC")
-        return False
+    spc.start()
 
-    # add sensor devices for each zone (typically motion/fire/door sensors)
-    hass.async_create_task(
-        discovery.async_load_platform(hass, Platform.BINARY_SENSOR, DOMAIN, {}, config)
-    )
+    return True
 
-    # create a separate alarm panel for each area
-    hass.async_create_task(
-        discovery.async_load_platform(
-            hass, Platform.ALARM_CONTROL_PANEL, DOMAIN, {}, config
-        )
-    )
 
-    # start listening for incoming events over websocket
-    spc.start()
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    entry = cast(SPCConfigEntry, entry)
+    entry.runtime_data.stop()
 
-    return True
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/spc/alarm_control_panel.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import cast
+
 from pyspcwebgw import SpcWebGateway
 from pyspcwebgw.area import Area
 from pyspcwebgw.const import AreaMode
@@ -14,14 +16,12 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DATA_API, SIGNAL_UPDATE_ALARM
+from . import SIGNAL_UPDATE_ALARM, ConfigEntry, SPCConfigEntry
 
 
 def _get_alarm_state(area: Area) -> AlarmControlPanelState | None:
     """Get the alarm state."""
-
     if area.verified_alarm:
         return AlarmControlPanelState.TRIGGERED
 
@@ -34,16 +34,12 @@ def _get_alarm_state(area: Area) -> AlarmControlPanelState | None:
     return mode_to_state.get(area.mode)
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
-    """Set up the SPC alarm control panel platform."""
-    if discovery_info is None:
-        return
-    api: SpcWebGateway = hass.data[DATA_API]
+    """Set up the SPC alarm control panel from a config entry."""
+    entry = cast(SPCConfigEntry, entry)
+    api = entry.runtime_data
     async_add_entities([SpcAlarm(area=area, api=api) for area in api.areas.values()])
 
 
@@ -63,6 +59,7 @@ def __init__(self, area: Area, api: SpcWebGateway) -> None:
         self._area = area
         self._api = api
         self._attr_name = area.name
+        self._attr_unique_id = area.id
 
     async def async_added_to_hass(self) -> None:
         """Call for adding new entities."""

homeassistant/components/spc/binary_sensor.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from pyspcwebgw import SpcWebGateway
+from typing import cast
+
 from pyspcwebgw.const import ZoneInput, ZoneType
 from pyspcwebgw.zone import Zone
 
@@ -13,9 +14,8 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
-from . import DATA_API, SIGNAL_UPDATE_SENSOR
+from . import SIGNAL_UPDATE_SENSOR, ConfigEntry, SPCConfigEntry
 
 
 def _get_device_class(zone_type: ZoneType) -> BinarySensorDeviceClass | None:
@@ -27,22 +27,16 @@ def _get_device_class(zone_type: ZoneType) -> BinarySensorDeviceClass | None:
     }.get(zone_type)
 
 
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
-    """Set up the SPC binary sensor."""
-    if discovery_info is None:
-        return
-    api: SpcWebGateway = hass.data[DATA_API]
+    """Set up the SPC binary sensors from a config entry."""
+    entry = cast(SPCConfigEntry, entry)
+    api = entry.runtime_data
     async_add_entities(
-        [
-            SpcBinarySensor(zone)
-            for zone in api.zones.values()
-            if _get_device_class(zone.type)
-        ]
+        SpcBinarySensor(zone)
+        for zone in api.zones.values()
+        if _get_device_class(zone.type)
     )
 
 
@@ -56,6 +50,7 @@ def __init__(self, zone: Zone) -> None:
         self._zone = zone
         self._attr_name = zone.name
         self._attr_device_class = _get_device_class(zone.type)
+        self._attr_unique_id = zone.id
 
     async def async_added_to_hass(self) -> None:
         """Call for adding new entities."""

homeassistant/components/spc/config_flow.py

@@ -0,0 +1,103 @@
+"""Config flow for SPC integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from aiohttp import ClientError
+from pyspcwebgw import SpcWebGateway
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client
+
+from . import CONF_API_URL, CONF_WS_URL, DATA_SCHEMA, DOMAIN
+
+
+async def validate_connection(
+    hass: HomeAssistant, api_url: str, ws_url: str
+) -> tuple[str | None, dict[str, Any] | None]:
+    """Test if we can connect to the SPC controller.
+
+    Returns a tuple of (error, device_info).
+    """
+    session = aiohttp_client.async_get_clientsession(hass)
+
+    try:
+        spc = SpcWebGateway(
+            loop=hass.loop,
+            session=session,
+            api_url=api_url,
+            ws_url=ws_url,
+            async_callback=None,  # No callback needed for validation
+        )
+        if not await spc.async_load_parameters():
+            return "cannot_connect", None
+        return None, spc.info  # noqa: TRY300
+    except (ClientError, TimeoutError, Exception):  # pylint: disable=broad-except
+        return "cannot_connect", None
+
+
+class SpcConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for SPC."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            self._async_abort_entries_match(
+                {
+                    CONF_API_URL: user_input[CONF_API_URL],
+                    CONF_WS_URL: user_input[CONF_WS_URL],
+                }
+            )
+
+            error, device_info = await validate_connection(
+                self.hass,
+                user_input[CONF_API_URL],
+                user_input[CONF_WS_URL],
+            )
+            if error is None and device_info is not None:
+                return self.async_create_entry(
+                    title=f"{device_info['type']} - {device_info['sn']}",
+                    data=user_input,
+                )
+
+            if error:
+                errors["base"] = error
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=DATA_SCHEMA,
+            errors=errors,
+        )
+
+    async def async_step_import(
+        self, import_config: dict[str, Any]
+    ) -> ConfigFlowResult:
+        """Import a config entry from configuration.yaml."""
+        self._async_abort_entries_match(
+            {
+                CONF_API_URL: import_config[CONF_API_URL],
+                CONF_WS_URL: import_config[CONF_WS_URL],
+            }
+        )
+
+        error, device_info = await validate_connection(
+            self.hass,
+            import_config[CONF_API_URL],
+            import_config[CONF_WS_URL],
+        )
+
+        if error is None and device_info is not None:
+            return self.async_create_entry(
+                title=f"{device_info['type']} - {device_info['sn']}",
+                data=import_config,
+            )
+
+        return self.async_abort(reason=error or "cannot_connect")

homeassistant/components/spc/const.py

@@ -0,0 +1,25 @@
+"""Constants for the SPC integration."""
+
+from typing import Final
+
+import voluptuous as vol
+
+from homeassistant.helpers import config_validation as cv
+
+DOMAIN: Final = "spc"
+
+# Configuration
+CONF_API_URL: Final = "api_url"
+CONF_WS_URL: Final = "ws_url"
+
+# Data
+DATA_API: Final = "spc_api"
+SIGNAL_UPDATE_ALARM: Final = "spc_update_alarm_{}"
+SIGNAL_UPDATE_SENSOR: Final = "spc_update_sensor_{}"
+
+DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_API_URL): cv.string,
+        vol.Required(CONF_WS_URL): cv.string,
+    }
+)

homeassistant/components/spc/manifest.json

@@ -2,6 +2,7 @@
   "domain": "spc",
   "name": "Vanderbilt SPC",
   "codeowners": [],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/spc",
   "iot_class": "local_push",
   "loggers": ["pyspcwebgw"],

homeassistant/components/spc/strings.json

@@ -0,0 +1,23 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "description": "Set up SPC integration",
+        "data": {
+          "api_url": "API URL",
+          "ws_url": "Websocket URL"
+        },
+        "data_description": {
+          "api_url": "SPC Web Gateway API URL e.g. https://192.168.1.200:8088",
+          "ws_url": "SPC Web Gateway WebSocket URL e.g. wss://192.168.1.200:8088/ws/spc"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "Failed to connect, please check the URL"
+    },
+    "abort": {
+      "already_configured": "Device is already configured"
+    }
+  }
+}

homeassistant/generated/integrations.json

@@ -5961,7 +5961,7 @@
     "spc": {
       "name": "Vanderbilt SPC",
       "integration_type": "hub",
-      "config_flow": false,
+      "config_flow": true,
       "iot_class": "local_push"
     },
     "speedtestdotnet": {

tests/components/spc/conftest.py

@@ -1,26 +1,127 @@
 """Tests for Vanderbilt SPC component."""
 
 from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from dataclasses import dataclass
+from typing import Any
+from unittest.mock import AsyncMock, PropertyMock, patch
 
 import pyspcwebgw
+from pyspcwebgw.const import AreaMode, ZoneInput, ZoneType
 import pytest
 
+from homeassistant.components.alarm_control_panel import AlarmControlPanelState
+from homeassistant.components.spc.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+TEST_CONFIG = {"api_url": "http://localhost/", "ws_url": "ws://localhost/"}
+
+
+@dataclass
+class ZoneData:
+    """Test zone data."""
+
+    id: str
+    name: str
+    type: ZoneType
+    device_class: str | None = None
+
+
+ZONE_DEFINITIONS = [
+    ZoneData("1", "Entrance", ZoneType.ENTRY_EXIT),
+    ZoneData("2", "Living Room", ZoneType.ALARM),
+    ZoneData("3", "Smoke Sensor", ZoneType.FIRE),
+    ZoneData("4", "Power Supply", ZoneType.TECHNICAL),
+]
+
+ALARM_MODE_MAPPING = [
+    ("alarm_disarm", AreaMode.UNSET, AlarmControlPanelState.DISARMED),
+    ("alarm_arm_home", AreaMode.PART_SET_A, AlarmControlPanelState.ARMED_HOME),
+    ("alarm_arm_night", AreaMode.PART_SET_B, AlarmControlPanelState.ARMED_NIGHT),
+    ("alarm_arm_away", AreaMode.FULL_SET, AlarmControlPanelState.ARMED_AWAY),
+]
+
 
 @pytest.fixture
 def mock_client() -> Generator[AsyncMock]:
     """Mock the SPC client."""
-
-    with patch(
-        "homeassistant.components.spc.SpcWebGateway", autospec=True
-    ) as mock_client:
+    with (
+        patch(
+            "homeassistant.components.spc.SpcWebGateway", autospec=True
+        ) as mock_client,
+        patch(
+            "homeassistant.components.spc.config_flow.SpcWebGateway", new=mock_client
+        ),
+    ):
         client = mock_client.return_value
-        client.async_load_parameters.return_value = True
+        # Remove the default return value for async_load_parameters
+        client.async_load_parameters = AsyncMock()
+        client.change_mode = AsyncMock()
+        client.start = AsyncMock()
+        client.stop = AsyncMock()
+
+        # Create mock area
         mock_area = AsyncMock(spec=pyspcwebgw.area.Area)
         mock_area.id = "1"
-        mock_area.mode = pyspcwebgw.const.AreaMode.FULL_SET
+        mock_area.mode = AreaMode.FULL_SET
         mock_area.last_changed_by = "Sven"
         mock_area.name = "House"
         mock_area.verified_alarm = False
+
+        # Create mock zones using ZoneData
+        mock_zones = {}
+        for zone_data in ZONE_DEFINITIONS:
+            zone = AsyncMock(spec=pyspcwebgw.zone.Zone)
+            zone.id = zone_data.id
+            zone.name = zone_data.name
+            type(zone).type = PropertyMock(return_value=zone_data.type)
+            type(zone).input = PropertyMock(return_value=ZoneInput.CLOSED)
+            mock_zones[zone.id] = zone
+
+        client.zones = mock_zones
         client.areas = {"1": mock_area}
+        client.info = {"sn": "111111", "type": "SPC4000", "version": "3.14.1"}
+        client.ethernet = {"ip_address": "127.0.0.1"}
+
+        # Save callback for testing state updates
+        mock_client.callback = None
+
+        def _get_instance(*args, **kwargs):
+            client.async_callback = kwargs.get("async_callback")
+            return client
+
+        mock_client.side_effect = _get_instance
+
         yield mock_client
+
+
+@pytest.fixture
+async def mock_config(hass: HomeAssistant, mock_client: AsyncMock) -> dict[str, Any]:
+    """Mock config setup."""
+    config = {"spc": TEST_CONFIG}
+
+    # Setup component and create entry
+    assert await async_setup_component(hass, DOMAIN, config)
+    await hass.async_block_till_done()
+
+    return config
+
+
+@pytest.fixture
+def mock_area(mock_client: AsyncMock) -> pyspcwebgw.area.Area:
+    """Return the mock area."""
+    return mock_client.return_value.areas["1"]
+
+
+@pytest.fixture
+def mock_zone(mock_client: AsyncMock) -> pyspcwebgw.zone.Zone:
+    """Return first mock zone."""
+    return mock_client.return_value.zones["1"]
+
+
+@pytest.fixture(params=ALARM_MODE_MAPPING)
+def alarm_mode(
+    request: pytest.FixtureRequest,
+) -> tuple[str, AreaMode, AlarmControlPanelState]:
+    """Parametrize alarm modes."""
+    return request.param

tests/components/spc/test_alarm_control_panel.py

@@ -1,34 +1,61 @@
 """Tests for Vanderbilt SPC component."""
 
-from unittest.mock import AsyncMock
+from unittest.mock import PropertyMock
 
-from pyspcwebgw.const import AreaMode
+import pytest
 
 from homeassistant.components.alarm_control_panel import AlarmControlPanelState
+from homeassistant.components.spc.const import SIGNAL_UPDATE_ALARM
 from homeassistant.core import HomeAssistant
-from homeassistant.setup import async_setup_component
+from homeassistant.helpers import dispatcher
 
+from .conftest import ALARM_MODE_MAPPING
 
-async def test_update_alarm_device(hass: HomeAssistant, mock_client: AsyncMock) -> None:
+
+@pytest.mark.parametrize(("user", "mode", "expected_state"), ALARM_MODE_MAPPING)
+async def test_update_alarm_device(
+    hass: HomeAssistant, mock_config, mock_area, user, mode, expected_state
+) -> None:
     """Test that alarm panel state changes on incoming websocket data."""
+    entity_id = "alarm_control_panel.house"
 
-    config = {"spc": {"api_url": "http://localhost/", "ws_url": "ws://localhost/"}}
-    assert await async_setup_component(hass, "spc", config) is True
+    mock_area.mode = mode
+    mock_area.last_changed_by = user
 
+    dispatcher.async_dispatcher_send(hass, SIGNAL_UPDATE_ALARM.format(mock_area.id))
     await hass.async_block_till_done()
 
+    state = hass.states.get(entity_id)
+    assert state is not None
+    assert state.state == expected_state
+    assert state.attributes["changed_by"] == user
+
+
+async def test_alarm_modes(
+    hass: HomeAssistant, mock_config, mock_area, mock_client, alarm_mode
+) -> None:
+    """Test all alarm modes."""
+    service, mode, expected_state = alarm_mode
     entity_id = "alarm_control_panel.house"
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY
-    assert hass.states.get(entity_id).attributes["changed_by"] == "Sven"
+    await hass.services.async_call(
+        "alarm_control_panel",
+        service,
+        {"entity_id": entity_id},
+        blocking=True,
+    )
+
+    mock_client.return_value.change_mode.assert_called_once_with(
+        area=mock_area, new_mode=mode
+    )
 
-    mock_area = mock_client.return_value.areas["1"]
 
-    mock_area.mode = AreaMode.UNSET
-    mock_area.last_changed_by = "Anna"
+async def test_alarm_triggered(hass: HomeAssistant, mock_config, mock_area) -> None:
+    """Test alarm triggered state."""
+    entity_id = "alarm_control_panel.house"
 
-    await mock_client.call_args_list[0][1]["async_callback"](mock_area)
+    type(mock_area).verified_alarm = PropertyMock(return_value=True)
+    dispatcher.async_dispatcher_send(hass, SIGNAL_UPDATE_ALARM.format(mock_area.id))
     await hass.async_block_till_done()
 
-    assert hass.states.get(entity_id).state == AlarmControlPanelState.DISARMED
-    assert hass.states.get(entity_id).attributes["changed_by"] == "Anna"
+    assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED

tests/components/spc/test_binary_sensor.py

@@ -0,0 +1,54 @@
+"""Tests for Vanderbilt SPC binary sensors."""
+
+from typing import Final
+from unittest.mock import PropertyMock
+
+from pyspcwebgw.const import ZoneInput, ZoneType
+import pytest
+
+from homeassistant.components.binary_sensor import BinarySensorDeviceClass
+from homeassistant.components.spc.const import SIGNAL_UPDATE_SENSOR
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import dispatcher
+
+from .conftest import ZONE_DEFINITIONS
+
+ZoneMapping = tuple[str, str, ZoneType, BinarySensorDeviceClass]
+
+ZONE_ID_TO_CONFIG: Final[dict[str, tuple[str, ZoneType, BinarySensorDeviceClass]]] = {
+    "1": ("entrance", ZoneType.ENTRY_EXIT, BinarySensorDeviceClass.OPENING),
+    "2": ("living_room", ZoneType.ALARM, BinarySensorDeviceClass.MOTION),
+    "3": ("smoke_sensor", ZoneType.FIRE, BinarySensorDeviceClass.SMOKE),
+    "4": ("power_supply", ZoneType.TECHNICAL, BinarySensorDeviceClass.POWER),
+}
+
+
+@pytest.mark.parametrize("zone_data", ZONE_DEFINITIONS)
+async def test_binary_sensor_setup(
+    hass: HomeAssistant, mock_config, mock_client, zone_data
+) -> None:
+    """Test binary sensor setup."""
+    entity_id = f"binary_sensor.{zone_data.name.lower().replace(' ', '_')}"
+    state = hass.states.get(entity_id)
+    assert state is not None
+    assert state.name == zone_data.name
+    assert state.state == "off"
+
+
+async def test_binary_sensor_update(
+    hass: HomeAssistant, mock_config, mock_zone
+) -> None:
+    """Test binary sensor updates."""
+    entity_id = "binary_sensor.entrance"
+
+    # Test open state
+    type(mock_zone).input = PropertyMock(return_value=ZoneInput.OPEN)
+    dispatcher.async_dispatcher_send(hass, SIGNAL_UPDATE_SENSOR.format(mock_zone.id))
+    await hass.async_block_till_done()
+    assert hass.states.get(entity_id).state == "on"
+
+    # Test closed state
+    type(mock_zone).input = PropertyMock(return_value=ZoneInput.CLOSED)
+    dispatcher.async_dispatcher_send(hass, SIGNAL_UPDATE_SENSOR.format(mock_zone.id))
+    await hass.async_block_till_done()
+    assert hass.states.get(entity_id).state == "off"

tests/components/spc/test_config_flow.py

@@ -0,0 +1,192 @@
+"""Test the SPC config flow."""
+
+from unittest.mock import AsyncMock, patch
+
+from aiohttp import ClientError
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.spc.const import DOMAIN
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+from .conftest import TEST_CONFIG
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "error_key"),
+    [
+        (ClientError(), "cannot_connect"),
+        (TimeoutError(), "cannot_connect"),
+        (Exception(), "cannot_connect"),
+    ],
+)
+async def test_form_errors(
+    hass: HomeAssistant, mock_client: AsyncMock, side_effect: Exception, error_key: str
+) -> None:
+    """Test we handle errors."""
+    mock_client.return_value.async_load_parameters.side_effect = side_effect
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"], TEST_CONFIG
+    )
+
+    assert result2["type"] == FlowResultType.FORM
+    assert result2["errors"] == {"base": error_key}
+
+
+async def test_form(hass: HomeAssistant, mock_client: AsyncMock) -> None:
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "form"
+    assert result["errors"] == {}
+
+    with (
+        patch(
+            "homeassistant.components.spc.async_setup_entry",
+            return_value=True,
+        ) as mock_setup_entry,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            TEST_CONFIG,
+        )
+        await hass.async_block_till_done()
+
+    assert result2["type"] == "create_entry"
+    assert result2["title"] == "SPC4000 - 111111"
+    assert result2["data"] == TEST_CONFIG
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_form_invalid_auth(hass: HomeAssistant, mock_client: AsyncMock) -> None:
+    """Test we handle invalid auth."""
+    client = mock_client.return_value
+    client.async_load_parameters.return_value = False
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        TEST_CONFIG,
+    )
+
+    assert result2["type"] == "form"
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_form_cannot_connect(hass: HomeAssistant, mock_client: AsyncMock) -> None:
+    """Test we handle cannot connect error."""
+
+    client = mock_client.return_value
+    client.async_load_parameters.side_effect = ClientError
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        TEST_CONFIG,
+    )
+
+    assert result2["type"] == "form"
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_flow_user_already_configured(
+    hass: HomeAssistant, mock_client: AsyncMock
+) -> None:
+    """Test user initialized flow with duplicate server."""
+
+    config = {
+        "api_url": "http://example.com/api",
+        "ws_url": "ws://example.com/ws",
+    }
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data=config,
+        unique_id=config["api_url"],
+    )
+
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=config
+    )
+
+    assert result2["type"] == "abort"
+    assert result2["reason"] == "already_configured"
+
+
+async def test_flow_import(hass: HomeAssistant, mock_client: AsyncMock) -> None:
+    """Test user initialized flow."""
+    config = {
+        "api_url": "http://example.com/api",
+        "ws_url": "ws://example.com/ws",
+    }
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        data=config,
+        context={"source": config_entries.SOURCE_IMPORT},
+    )
+
+    assert result["type"] == "create_entry"
+    assert result["data"] == config
+
+
+async def test_flow_import_already_configured(
+    hass: HomeAssistant, mock_client: AsyncMock
+) -> None:
+    """Test user initialized flow with duplicate server."""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data=TEST_CONFIG,
+        unique_id=TEST_CONFIG["api_url"],
+    )
+
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        data=TEST_CONFIG,
+        context={"source": config_entries.SOURCE_IMPORT},
+    )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "already_configured"
+
+
+async def test_flow_import_cannot_connect(
+    hass: HomeAssistant, mock_client: AsyncMock
+) -> None:
+    """Test user initialized flow with duplicate server."""
+
+    client = mock_client.return_value
+    client.async_load_parameters.side_effect = ClientError
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        data=TEST_CONFIG,
+        context={"source": config_entries.SOURCE_IMPORT},
+    )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "cannot_connect"

tests/components/spc/test_init.py

@@ -1,22 +1,137 @@
 """Tests for Vanderbilt SPC component."""
 
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, patch
 
+from aiohttp import ClientError
+from pyspcwebgw.area import Area
+from pyspcwebgw.zone import Zone
+
+from homeassistant.components.spc.const import (
+    DOMAIN,
+    SIGNAL_UPDATE_ALARM,
+    SIGNAL_UPDATE_SENSOR,
+)
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
+from .conftest import TEST_CONFIG
+
+from tests.common import MockConfigEntry
+
 
 async def test_valid_device_config(hass: HomeAssistant, mock_client: AsyncMock) -> None:
     """Test valid device config."""
-    config = {"spc": {"api_url": "http://localhost/", "ws_url": "ws://localhost/"}}
+    mock_client.return_value.async_load_parameters.return_value = True
+    assert await async_setup_component(hass, DOMAIN, {"spc": TEST_CONFIG}) is True
+
 
-    assert await async_setup_component(hass, "spc", config) is True
+async def test_invalid_device_config(hass: HomeAssistant) -> None:
+    """Test invalid device config."""
+    config = {"spc": {"api_url": "http://localhost/"}}  # Missing ws_url
+    assert await async_setup_component(hass, DOMAIN, config) is False
 
 
-async def test_invalid_device_config(
+async def test_setup_entry_not_ready(
     hass: HomeAssistant, mock_client: AsyncMock
 ) -> None:
-    """Test valid device config."""
-    config = {"spc": {"api_url": "http://localhost/"}}
+    """Test that it sets up retry when exception occurs during setup."""
+    client = mock_client.return_value
+    client.async_load_parameters.side_effect = ClientError()
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data=TEST_CONFIG,
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert entry.state is ConfigEntryState.SETUP_RETRY
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_setup_entry_failed(hass: HomeAssistant, mock_client: AsyncMock) -> None:
+    """Test that it handles setup failure."""
+    client = mock_client.return_value
+    client.async_load_parameters.return_value = False
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data=TEST_CONFIG,
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert entry.state is ConfigEntryState.SETUP_RETRY
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_missing_config_items(
+    hass: HomeAssistant, mock_client: AsyncMock
+) -> None:
+    """Test missing required config items."""
+    await async_setup_component(hass, DOMAIN, {"spc": {}})
+    await hass.async_block_till_done()
+
+    entries = hass.config_entries.async_entries(DOMAIN)
+    assert len(entries) == 0
+
+
+async def test_update_callback(
+    hass: HomeAssistant, mock_client: AsyncMock, mock_area: Area, mock_zone: Zone
+) -> None:
+    """Test update callback dispatching."""
+    mock_client.return_value.async_load_parameters.return_value = True
+    with patch("homeassistant.components.spc.async_dispatcher_send") as mock_dispatch:
+        entry = MockConfigEntry(
+            domain=DOMAIN,
+            data=TEST_CONFIG,
+            entry_id="test",
+        )
+        entry.add_to_hass(hass)
+
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+        callback = mock_client.call_args[1]["async_callback"]
+        await callback(mock_area)
+        mock_dispatch.assert_called_with(hass, SIGNAL_UPDATE_ALARM.format(mock_area.id))
+
+        await callback(mock_zone)
+        mock_dispatch.assert_called_with(
+            hass, SIGNAL_UPDATE_SENSOR.format(mock_zone.id)
+        )
+
+
+async def test_setup_unload_and_reload_entry(
+    hass: HomeAssistant, mock_client: AsyncMock
+) -> None:
+    """Test entry setup and unload."""
+    mock_client.return_value.async_load_parameters.return_value = True
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data=TEST_CONFIG,
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+    assert not hass.data.get(DOMAIN)
+
 
-    assert await async_setup_component(hass, "spc", config) is False
+async def _setup_spc_entry(hass: HomeAssistant) -> None:
+    """Set up SPC entry for testing."""
+    await async_setup_component(hass, DOMAIN, {"spc": TEST_CONFIG})
+    await hass.async_block_till_done()
+    entries = hass.config_entries.async_entries(DOMAIN)
+    if entries:
+        await hass.config_entries.async_setup(entries[0].entry_id)