mirror of
https://github.com/home-assistant/core.git
synced 2025-07-24 21:57:51 +00:00
Remove discovered MQTT alarm_control_panel device when discovery topic is cleared (#16825)
This commit is contained in:
parent
e78f4d1b65
commit
42790d3e97
@ -18,9 +18,9 @@ from homeassistant.const import (
|
|||||||
STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN,
|
STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN,
|
||||||
CONF_NAME, CONF_CODE)
|
CONF_NAME, CONF_CODE)
|
||||||
from homeassistant.components.mqtt import (
|
from homeassistant.components.mqtt import (
|
||||||
CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
|
ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
|
||||||
CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
|
CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
|
||||||
CONF_RETAIN, MqttAvailability)
|
CONF_QOS, CONF_RETAIN, MqttAvailability, MqttDiscoveryUpdate)
|
||||||
import homeassistant.helpers.config_validation as cv
|
import homeassistant.helpers.config_validation as cv
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
@ -53,6 +53,10 @@ def async_setup_platform(hass, config, async_add_entities,
|
|||||||
if discovery_info is not None:
|
if discovery_info is not None:
|
||||||
config = PLATFORM_SCHEMA(discovery_info)
|
config = PLATFORM_SCHEMA(discovery_info)
|
||||||
|
|
||||||
|
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([MqttAlarm(
|
async_add_entities([MqttAlarm(
|
||||||
config.get(CONF_NAME),
|
config.get(CONF_NAME),
|
||||||
config.get(CONF_STATE_TOPIC),
|
config.get(CONF_STATE_TOPIC),
|
||||||
@ -65,18 +69,22 @@ def async_setup_platform(hass, config, async_add_entities,
|
|||||||
config.get(CONF_CODE),
|
config.get(CONF_CODE),
|
||||||
config.get(CONF_AVAILABILITY_TOPIC),
|
config.get(CONF_AVAILABILITY_TOPIC),
|
||||||
config.get(CONF_PAYLOAD_AVAILABLE),
|
config.get(CONF_PAYLOAD_AVAILABLE),
|
||||||
config.get(CONF_PAYLOAD_NOT_AVAILABLE))])
|
config.get(CONF_PAYLOAD_NOT_AVAILABLE),
|
||||||
|
discovery_hash,)])
|
||||||
|
|
||||||
|
|
||||||
class MqttAlarm(MqttAvailability, alarm.AlarmControlPanel):
|
class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate,
|
||||||
|
alarm.AlarmControlPanel):
|
||||||
"""Representation of a MQTT alarm status."""
|
"""Representation of a MQTT alarm status."""
|
||||||
|
|
||||||
def __init__(self, name, state_topic, command_topic, qos, retain,
|
def __init__(self, name, state_topic, command_topic, qos, retain,
|
||||||
payload_disarm, payload_arm_home, payload_arm_away, code,
|
payload_disarm, payload_arm_home, payload_arm_away, code,
|
||||||
availability_topic, payload_available, payload_not_available):
|
availability_topic, payload_available, payload_not_available,
|
||||||
|
discovery_hash):
|
||||||
"""Init the MQTT Alarm Control Panel."""
|
"""Init the MQTT Alarm Control Panel."""
|
||||||
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._state = STATE_UNKNOWN
|
self._state = STATE_UNKNOWN
|
||||||
self._name = name
|
self._name = name
|
||||||
self._state_topic = state_topic
|
self._state_topic = state_topic
|
||||||
@ -87,11 +95,13 @@ class MqttAlarm(MqttAvailability, alarm.AlarmControlPanel):
|
|||||||
self._payload_arm_home = payload_arm_home
|
self._payload_arm_home = payload_arm_home
|
||||||
self._payload_arm_away = payload_arm_away
|
self._payload_arm_away = payload_arm_away
|
||||||
self._code = code
|
self._code = code
|
||||||
|
self._discovery_hash = discovery_hash
|
||||||
|
|
||||||
@asyncio.coroutine
|
@asyncio.coroutine
|
||||||
def async_added_to_hass(self):
|
def async_added_to_hass(self):
|
||||||
"""Subscribe mqtt events."""
|
"""Subscribe mqtt events."""
|
||||||
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 message_received(topic, payload, qos):
|
def message_received(topic, payload, qos):
|
||||||
|
@ -209,3 +209,28 @@ def test_discovery_removal(hass, mqtt_mock, caplog):
|
|||||||
|
|
||||||
state = hass.states.get('switch.beer')
|
state = hass.states.get('switch.beer')
|
||||||
assert state is None
|
assert state is None
|
||||||
|
|
||||||
|
|
||||||
|
@asyncio.coroutine
|
||||||
|
def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
|
||||||
|
"""Test removal of discovered alarm_control_panel."""
|
||||||
|
yield from async_start(hass, 'homeassistant', {})
|
||||||
|
data = (
|
||||||
|
'{ "name": "Beer",'
|
||||||
|
' "status_topic": "test_topic",'
|
||||||
|
' "command_topic": "test_topic" }'
|
||||||
|
)
|
||||||
|
async_fire_mqtt_message(hass,
|
||||||
|
'homeassistant/alarm_control_panel/bla/config',
|
||||||
|
data)
|
||||||
|
yield from hass.async_block_till_done()
|
||||||
|
state = hass.states.get('alarm_control_panel.beer')
|
||||||
|
assert state is not None
|
||||||
|
assert state.name == 'Beer'
|
||||||
|
async_fire_mqtt_message(hass,
|
||||||
|
'homeassistant/alarm_control_panel/bla/config',
|
||||||
|
'')
|
||||||
|
yield from hass.async_block_till_done()
|
||||||
|
yield from hass.async_block_till_done()
|
||||||
|
state = hass.states.get('alarm_control_panel.beer')
|
||||||
|
assert state is None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user