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

UniFi - Fix disabled entities being enabled after a restart (#35819)

Browse source 
* Async remove call removed too much, resulting in disabled entities coming back after a restart

* Calling super().async_remove is no longer needed, changed to self.async_remove

* Yes, they should be sets...
This commit is contained in:
Robert Svensson 2020-05-19 23:57:41 +02:00 • committed by Franck Nijhof
parent d81a19b5a2
commit 57bcb4743d
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3
4 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
homeassistant/components/unifi/device_tracker.py
View file

@ -244,17 +244,17 @@ class UniFiClientTracker(UniFiClient, ScannerEntity):
async def options_updated(self) -> None:
"""Config entry options are updated, remove entity if option is disabled."""
if not self.controller.option_track_clients:
await self.async_remove()
await self.remove_item({self.client.mac})
elif self.is_wired:
if not self.controller.option_track_wired_clients:
await self.async_remove()
await self.remove_item({self.client.mac})
elif (
self.controller.option_ssid_filter
and self.client.essid not in self.controller.option_ssid_filter
):
await self.async_remove()
await self.remove_item({self.client.mac})
class UniFiDeviceTracker(UniFiBase, ScannerEntity):
@ -383,4 +383,4 @@ class UniFiDeviceTracker(UniFiBase, ScannerEntity):
async def options_updated(self) -> None:
"""Config entry options are updated, remove entity if option is disabled."""
if not self.controller.option_track_devices:
await self.async_remove()
await self.remove_item({self.device.mac})

2
homeassistant/components/unifi/sensor.py
View file

@ -73,7 +73,7 @@ class UniFiBandwidthSensor(UniFiClient):
async def options_updated(self) -> None:
"""Config entry options are updated, remove entity if option is disabled."""
if not self.controller.option_allow_bandwidth_sensors:
await self.async_remove()
await self.remove_item({self.client.mac})
class UniFiRxBandwidthSensor(UniFiBandwidthSensor):

4
homeassistant/components/unifi/switch.py
View file

@ -239,7 +239,7 @@ class UniFiPOEClientSwitch(UniFiClient, SwitchEntity, RestoreEntity):
async def options_updated(self) -> None:
"""Config entry options are updated, remove entity if option is disabled."""
if not self.controller.option_poe_clients:
await self.async_remove()
await self.remove_item({self.client.mac})
class UniFiBlockClientSwitch(UniFiClient, SwitchEntity):
@ -287,4 +287,4 @@ class UniFiBlockClientSwitch(UniFiClient, SwitchEntity):
async def options_updated(self) -> None:
"""Config entry options are updated, remove entity if option is disabled."""
if self.client.mac not in self.controller.option_block_clients:
await self.async_remove()
await self.remove_item({self.client.mac})

38
homeassistant/components/unifi/unifi_entity_base.py
View file

@ -43,18 +43,33 @@ class UniFiBase(Entity):
self._item.remove_callback(self.async_update_callback)
self.controller.entities[self.DOMAIN][self.TYPE].remove(self._item.mac)
async def async_remove(self):
"""Clean up when removing entity.
@callback
def async_update_callback(self) -> None:
"""Update the entity's state."""
LOGGER.debug(
"Updating %s entity %s (%s)", self.TYPE, self.entity_id, self._item.mac
)
self.async_write_ha_state()
async def options_updated(self) -> None:
"""Config entry options are updated, remove entity if option is disabled."""
raise NotImplementedError
async def remove_item(self, mac_addresses: set) -> None:
"""Remove entity if MAC is part of set.
Remove entity if no entry in entity registry exist.
Remove entity registry entry if no entry in device registry exist.
Remove device registry entry if there is only one linked entity (this entity).
Remove entity registry entry if there are more than one entity linked to the device registry entry.
"""
if self._item.mac not in mac_addresses:
return
entity_registry = await self.hass.helpers.entity_registry.async_get_registry()
entity_entry = entity_registry.async_get(self.entity_id)
if not entity_entry:
await super().async_remove()
await self.async_remove()
return
device_registry = await self.hass.helpers.device_registry.async_get_registry()
@ -69,23 +84,6 @@ class UniFiBase(Entity):
entity_registry.async_remove(self.entity_id)
@callback
def async_update_callback(self) -> None:
"""Update the entity's state."""
LOGGER.debug(
"Updating %s entity %s (%s)", self.TYPE, self.entity_id, self._item.mac
)
self.async_write_ha_state()
async def options_updated(self) -> None:
"""Config entry options are updated, remove entity if option is disabled."""
raise NotImplementedError
async def remove_item(self, mac_addresses: set) -> None:
"""Remove entity if MAC is part of set."""
if self._item.mac in mac_addresses:
await self.async_remove()
@property
def should_poll(self) -> bool:
"""No polling needed."""