jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-18 02:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update config entry id in entity registry (#15531)

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-07-19 08:37:13 +02:00 committed by GitHub
parent 2a76a0852f
commit 8b04d48ffd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/helpers/entity_registry.py
View File

@ -109,6 +109,12 @@ class EntityRegistry:
"""Get entity. Create if it doesn't exist.""" """Get entity. Create if it doesn't exist."""
entity_id = self.async_get_entity_id(domain, platform, unique_id) entity_id = self.async_get_entity_id(domain, platform, unique_id)
if entity_id: if entity_id:
entry = self.entities[entity_id]
if entry.config_entry_id == config_entry_id:
return entry
self._async_update_entity(
entity_id, config_entry_id=config_entry_id)
return self.entities[entity_id] return self.entities[entity_id]
entity_id = self.async_generate_entity_id( entity_id = self.async_generate_entity_id(
@ -129,6 +135,12 @@ class EntityRegistry:
@callback @callback
def async_update_entity(self, entity_id, *, name=_UNDEF): def async_update_entity(self, entity_id, *, name=_UNDEF):
"""Update properties of an entity.""" """Update properties of an entity."""
return self._async_update_entity(entity_id, name=name)
@callback
def _async_update_entity(self, entity_id, *, name=_UNDEF,
config_entry_id=_UNDEF):
"""Private facing update properties method."""
old = self.entities[entity_id] old = self.entities[entity_id]
changes = {} changes = {}
@ -136,6 +148,10 @@ class EntityRegistry:
if name is not _UNDEF and name != old.name: if name is not _UNDEF and name != old.name:
changes['name'] = name changes['name'] = name
if (config_entry_id is not _UNDEF and
config_entry_id != old.config_entry_id):
changes['config_entry_id'] = config_entry_id
if not changes: if not changes:
return old return old

13
tests/helpers/test_entity_registry.py
View File

@ -107,7 +107,8 @@ def test_loading_saving_data(hass, registry):
# Ensure same order # Ensure same order
assert list(registry.entities) == list(registry2.entities) assert list(registry.entities) == list(registry2.entities)
new_entry1 = registry.async_get_or_create('light', 'hue', '1234') new_entry1 = registry.async_get_or_create('light', 'hue', '1234')
new_entry2 = registry.async_get_or_create('light', 'hue', '5678') new_entry2 = registry.async_get_or_create('light', 'hue', '5678',
config_entry_id='mock-id')
assert orig_entry1 == new_entry1 assert orig_entry1 == new_entry1
assert orig_entry2 == new_entry2 assert orig_entry2 == new_entry2
@ -191,3 +192,13 @@ def test_async_get_entity_id(registry):
assert registry.async_get_entity_id( assert registry.async_get_entity_id(
'light', 'hue', '1234') == 'light.hue_1234' 'light', 'hue', '1234') == 'light.hue_1234'
assert registry.async_get_entity_id('light', 'hue', '123') is None assert registry.async_get_entity_id('light', 'hue', '123') is None
async def test_updating_config_entry_id(registry):
"""Test that we update config entry id in registry."""
entry = registry.async_get_or_create(
'light', 'hue', '5678', config_entry_id='mock-id-1')
entry2 = registry.async_get_or_create(
'light', 'hue', '5678', config_entry_id='mock-id-2')
assert entry.entity_id == entry2.entity_id
assert entry2.config_entry_id == 'mock-id-2'