From 6d2e7db12315df9090b20469f049fabae9059332 Mon Sep 17 00:00:00 2001
From: emontnemery <erik@montnemery.com>
Date: Tue, 1 Jan 2019 11:12:40 +0100
Subject: [PATCH] Update device registry of MQTT climate
---
homeassistant/components/mqtt/climate.py | 17 ++++-----
tests/components/mqtt/test_climate.py | 47 ++++++++++++++++++++++++
2 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/homeassistant/components/mqtt/climate.py b/homeassistant/components/mqtt/climate.py
index b317d11d10b..9db96fdff94 100644
--- a/homeassistant/components/mqtt/climate.py
+++ b/homeassistant/components/mqtt/climate.py
@@ -163,7 +163,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
discovery_hash = discovery_payload[ATTR_DISCOVERY_HASH]
config = PLATFORM_SCHEMA(discovery_payload)
await _async_setup_entity(hass, config, async_add_entities,
- discovery_hash)
+ config_entry, discovery_hash)
except Exception:
if discovery_hash:
clear_discovery_hash(hass, discovery_hash)
@@ -175,21 +175,17 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
async def _async_setup_entity(hass, config, async_add_entities,
- discovery_hash=None):
+ config_entry=None, discovery_hash=None):
"""Set up the MQTT climate devices."""
- async_add_entities([
- MqttClimate(
- hass,
- config,
- discovery_hash,
- )])
+ async_add_entities([MqttClimate(hass, config, config_entry,
+ discovery_hash,)])
class MqttClimate(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
MqttEntityDeviceInfo, ClimateDevice):
"""Representation of an MQTT climate device."""
- def __init__(self, hass, config, discovery_hash):
+ def __init__(self, hass, config, config_entry, discovery_hash):
"""Initialize the climate device."""
self._config = config
self._unique_id = config.get(CONF_UNIQUE_ID)
@@ -216,7 +212,7 @@ class MqttClimate(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):
"""Handle being added to home assistant."""
@@ -230,6 +226,7 @@ class MqttClimate(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
self._setup_from_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()
diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py
index ac5e1b07f27..4803f915636 100644
--- a/tests/components/mqtt/test_climate.py
+++ b/tests/components/mqtt/test_climate.py
@@ -921,6 +921,53 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
assert device.sw_version == '0.1-beta'
+async def test_entity_device_info_update(hass, mqtt_mock):
+ """Test device registry update."""
+ entry = MockConfigEntry(domain=mqtt.DOMAIN)
+ entry.add_to_hass(hass)
+ await async_start(hass, 'homeassistant', {}, entry)
+ registry = await hass.helpers.device_registry.async_get_registry()
+
+ config = {
+ 'platform': 'mqtt',
+ 'name': 'Test 1',
+ 'state_topic': 'test-topic',
+ 'command_topic': 'test-command-topic',
+ 'device': {
+ 'identifiers': ['helloworld'],
+ 'connections': [
+ ["mac", "02:5b:26:a8:dc:12"],
+ ],
+ 'manufacturer': 'Whatever',
+ 'name': 'Beer',
+ 'model': 'Glass',
+ 'sw_version': '0.1-beta',
+ },
+ 'unique_id': 'veryunique'
+ }
+
+ data = json.dumps(config)
+ async_fire_mqtt_message(hass, 'homeassistant/climate/bla/config',
+ data)
+ await hass.async_block_till_done()
+ await hass.async_block_till_done()
+
+ device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+ assert device is not None
+ assert device.name == 'Beer'
+
+ config['device']['name'] = 'Milk'
+ data = json.dumps(config)
+ async_fire_mqtt_message(hass, 'homeassistant/climate/bla/config',
+ data)
+ await hass.async_block_till_done()
+ await hass.async_block_till_done()
+
+ device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+ assert device is not None
+ assert device.name == 'Milk'
+
+
async def test_entity_id_update(hass, mqtt_mock):
"""Test MQTT subscriptions are managed when entity_id is updated."""
registry = mock_registry(hass, {})
--
GitLab