evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add unique id to DHCP step in Config Flow for Overkiz (#62847)

Browse source
This commit is contained in:
Mick Vleeshouwer 2021-12-27 13:28:18 -08:00 • committed by GitHub
parent 1cfeb404b6
commit b9ce82f79c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
homeassistant/components/overkiz/config_flow.py
View file

@ -19,7 +19,6 @@ from homeassistant import config_entries
from homeassistant.components import dhcp
from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
from homeassistant.data_entry_flow import FlowResult
from homeassistant.helpers import device_registry as dr
from .const import CONF_HUB, DEFAULT_HUB, DOMAIN
@ -94,17 +93,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
_LOGGER.debug("DHCP discovery detected gateway %s", obfuscate_id(gateway_id))
if self._gateway_already_configured(gateway_id):
_LOGGER.debug("Gateway %s is already configured", obfuscate_id(gateway_id))
return self.async_abort(reason="already_configured")
await self.async_set_unique_id(gateway_id)
self._abort_if_unique_id_configured()
return await self.async_step_user()
def _gateway_already_configured(self, gateway_id: str) -> bool:
"""See if we already have a gateway matching the id."""
device_registry = dr.async_get(self.hass)
return bool(
device_registry.async_get_device(
identifiers={(DOMAIN, gateway_id)}, connections=set()
)
)

12
tests/components/overkiz/test_config_flow.py
View file

@ -16,7 +16,7 @@ from homeassistant.components import dhcp
from homeassistant.components.overkiz.const import DOMAIN
from homeassistant.core import HomeAssistant
from tests.common import MockConfigEntry, mock_device_registry
from tests.common import MockConfigEntry
TEST_EMAIL = "test@testdomain.com"
TEST_EMAIL2 = "test@testdomain.nl"
@ -120,7 +120,7 @@ async def test_allow_multiple_unique_entries(hass: HomeAssistant) -> None:
"""Test config flow allows Config Flow unique entries."""
MockConfigEntry(
domain=DOMAIN,
unique_id="test2@testdomain.com",
unique_id=TEST_GATEWAY_ID2,
data={"username": "test2@testdomain.com", "password": TEST_PASSWORD},
).add_to_hass(hass)
@ -166,17 +166,11 @@ async def test_dhcp_flow_already_configured(hass: HomeAssistant) -> None:
"""Test that DHCP doesn't setup already configured gateways."""
config_entry = MockConfigEntry(
domain=DOMAIN,
unique_id=TEST_EMAIL,
unique_id=TEST_GATEWAY_ID,
data={"username": TEST_EMAIL, "password": TEST_PASSWORD, "hub": TEST_HUB},
)
config_entry.add_to_hass(hass)
device_registry = mock_device_registry(hass)
device_registry.async_get_or_create(
config_entry_id=config_entry.entry_id,
identifiers={(DOMAIN, "1234-5678-9123")},
)
result = await hass.config_entries.flow.async_init(
DOMAIN,
data=dhcp.DhcpServiceInfo(