Update device registry of MQTT sensor (#20440)

This commit is contained in:
emontnemery 2019-01-26 19:48:18 +01:00 committed by Paulus Schoutsen
parent 09cbcb74bc
commit 85ccd71d39
2 changed files with 53 additions and 5 deletions

View file

@ -69,7 +69,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
try:
discovery_hash = discovery_payload[ATTR_DISCOVERY_HASH]
config = PLATFORM_SCHEMA(discovery_payload)
await _async_setup_entity(config, async_add_entities,
await _async_setup_entity(config, async_add_entities, config_entry,
discovery_hash)
except Exception:
if discovery_hash:
@ -82,16 +82,16 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
async def _async_setup_entity(config: ConfigType, async_add_entities,
discovery_hash=None):
config_entry=None, discovery_hash=None):
"""Set up MQTT sensor."""
async_add_entities([MqttSensor(config, discovery_hash)])
async_add_entities([MqttSensor(config, config_entry, discovery_hash)])
class MqttSensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
MqttEntityDeviceInfo, Entity):
"""Representation of a sensor that can be updated using MQTT."""
def __init__(self, config, discovery_hash):
def __init__(self, config, config_entry, discovery_hash):
"""Initialize the sensor."""
self._config = config
self._unique_id = config.get(CONF_UNIQUE_ID)
@ -110,7 +110,7 @@ class MqttSensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
MqttAvailability.__init__(self, config)
MqttDiscoveryUpdate.__init__(self, discovery_hash,
self.discovery_update)
MqttEntityDeviceInfo.__init__(self, device_config)
MqttEntityDeviceInfo.__init__(self, device_config, config_entry)
async def async_added_to_hass(self):
"""Subscribe to MQTT events."""
@ -123,6 +123,7 @@ class MqttSensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
self._config = config
await self.attributes_discovery_update(config)
await self.availability_discovery_update(config)
await self.device_info_discovery_update(config)
await self._subscribe_topics()
self.async_schedule_update_ha_state()