jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove discovered MQTT climate device when discovery topic is cleared (#16856)

Browse Source
This commit is contained in:
emontnemery 2018-09-25 17:15:39 +02:00 committed by Paulus Schoutsen
parent bc8d323bdd
commit 0dbfd77402
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
homeassistant/components/climate/mqtt.py
View File

@ -21,8 +21,9 @@ from homeassistant.components.climate import (
from homeassistant.const import ( from homeassistant.const import (
STATE_ON, STATE_OFF, ATTR_TEMPERATURE, CONF_NAME, CONF_VALUE_TEMPLATE) STATE_ON, STATE_OFF, ATTR_TEMPERATURE, CONF_NAME, CONF_VALUE_TEMPLATE)
from homeassistant.components.mqtt import ( from homeassistant.components.mqtt import (
CONF_AVAILABILITY_TOPIC, CONF_QOS, CONF_RETAIN, CONF_PAYLOAD_AVAILABLE, ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_QOS, CONF_RETAIN,
CONF_PAYLOAD_NOT_AVAILABLE, MQTT_BASE_PLATFORM_SCHEMA, MqttAvailability) CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
MQTT_BASE_PLATFORM_SCHEMA, MqttAvailability, MqttDiscoveryUpdate)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.components.fan import (SPEED_LOW, SPEED_MEDIUM, from homeassistant.components.fan import (SPEED_LOW, SPEED_MEDIUM,
SPEED_HIGH) SPEED_HIGH)
@ -153,6 +154,10 @@ def async_setup_platform(hass, config, async_add_entities,
value_templates[key] = config.get(key) value_templates[key] = config.get(key)
value_templates[key].hass = hass value_templates[key].hass = hass
discovery_hash = None
if discovery_info is not None and ATTR_DISCOVERY_HASH in discovery_info:
discovery_hash = discovery_info[ATTR_DISCOVERY_HASH]
async_add_entities([ async_add_entities([
MqttClimate( MqttClimate(
hass, hass,
@ -194,11 +199,12 @@ def async_setup_platform(hass, config, async_add_entities,
config.get(CONF_PAYLOAD_AVAILABLE), config.get(CONF_PAYLOAD_AVAILABLE),
config.get(CONF_PAYLOAD_NOT_AVAILABLE), config.get(CONF_PAYLOAD_NOT_AVAILABLE),
config.get(CONF_MIN_TEMP), config.get(CONF_MIN_TEMP),
config.get(CONF_MAX_TEMP)) config.get(CONF_MAX_TEMP),
]) discovery_hash,
)])
class MqttClimate(MqttAvailability, ClimateDevice): class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
"""Representation of an MQTT climate device.""" """Representation of an MQTT climate device."""
def __init__(self, hass, name, topic, value_templates, qos, retain, def __init__(self, hass, name, topic, value_templates, qos, retain,
@ -207,10 +213,11 @@ class MqttClimate(MqttAvailability, ClimateDevice):
current_swing_mode, current_operation, aux, send_if_off, current_swing_mode, current_operation, aux, send_if_off,
payload_on, payload_off, availability_topic, payload_on, payload_off, availability_topic,
payload_available, payload_not_available, payload_available, payload_not_available,
min_temp, max_temp): min_temp, max_temp, discovery_hash):
"""Initialize the climate device.""" """Initialize the climate device."""
super().__init__(availability_topic, qos, payload_available, MqttAvailability.__init__(self, availability_topic, qos,
payload_not_available) payload_available, payload_not_available)
MqttDiscoveryUpdate.__init__(self, discovery_hash)
self.hass = hass self.hass = hass
self._name = name self._name = name
self._topic = topic self._topic = topic
@ -235,11 +242,13 @@ class MqttClimate(MqttAvailability, ClimateDevice):
self._payload_off = payload_off self._payload_off = payload_off
self._min_temp = min_temp self._min_temp = min_temp
self._max_temp = max_temp self._max_temp = max_temp
self._discovery_hash = discovery_hash
@asyncio.coroutine @asyncio.coroutine
def async_added_to_hass(self): def async_added_to_hass(self):
"""Handle being added to home assistant.""" """Handle being added to home assistant."""
yield from super().async_added_to_hass() yield from MqttAvailability.async_added_to_hass(self)
yield from MqttDiscoveryUpdate.async_added_to_hass(self)
@callback @callback
def handle_current_temp_received(topic, payload, qos): def handle_current_temp_received(topic, payload, qos):

24
tests/components/climate/test_mqtt.py
View File

@ -12,8 +12,10 @@ from homeassistant.components.climate import (
SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
SUPPORT_FAN_MODE, SUPPORT_SWING_MODE, SUPPORT_HOLD_MODE, SUPPORT_FAN_MODE, SUPPORT_SWING_MODE, SUPPORT_HOLD_MODE,
SUPPORT_AWAY_MODE, SUPPORT_AUX_HEAT, DEFAULT_MIN_TEMP, DEFAULT_MAX_TEMP) SUPPORT_AWAY_MODE, SUPPORT_AUX_HEAT, DEFAULT_MIN_TEMP, DEFAULT_MAX_TEMP)
from homeassistant.components.mqtt.discovery import async_start
from tests.common import (get_test_home_assistant, mock_mqtt_component, from tests.common import (get_test_home_assistant, mock_mqtt_component,
fire_mqtt_message, mock_component) async_fire_mqtt_message, fire_mqtt_message,
mock_component)
ENTITY_CLIMATE = 'climate.test' ENTITY_CLIMATE = 'climate.test'
@ -649,3 +651,23 @@ class TestMQTTClimate(unittest.TestCase):
self.assertIsInstance(max_temp, float) self.assertIsInstance(max_temp, float)
self.assertEqual(60, max_temp) self.assertEqual(60, max_temp)
async def test_discovery_removal_climate(hass, mqtt_mock, caplog):
"""Test removal of discovered climate."""
await async_start(hass, 'homeassistant', {})
data = (
'{ "name": "Beer" }'
)
async_fire_mqtt_message(hass, 'homeassistant/climate/bla/config',
data)
await hass.async_block_till_done()
state = hass.states.get('climate.beer')
assert state is not None
assert state.name == 'Beer'
async_fire_mqtt_message(hass, 'homeassistant/climate/bla/config',
'')
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('climate.beer')
assert state is None