Reconfigure MQTT cover component if discovery info is changed (#18175)

* Reconfigure MQTT cover component if discovery info is changed

* Do not pass hass to MqttCover constructor
This commit is contained in:
emontnemery authored and Paulus Schoutsen committed 2018-11-27 11:22:26 +01:00
1 parent 4f2e7fc912
commit 6170065a2c
2 files changed
+334 -247

No files matched your search

+216 -152
View File
@@ -734,25 +734,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_percentage_in_range_defaults(self):
"""Test find percentage in range with default range."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=100, position_closed=0,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=100, tilt_closed_position=0,
tilt_min=0, tilt_max=100, tilt_optimistic=False,
tilt_invert=False,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 100, 'position_closed': 0,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 100, 'tilt_closed_position': 0,
'tilt_min': 0, 'tilt_max': 100, 'tilt_optimistic': False,
'tilt_invert_state': False,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 44 == mqtt_cover.find_percentage_in_range(44)
assert 44 == mqtt_cover.find_percentage_in_range(44, 'cover')
@@ -760,25 +764,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_percentage_in_range_altered(self):
"""Test find percentage in range with altered range."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=180, position_closed=80,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=180, tilt_closed_position=80,
tilt_min=80, tilt_max=180, tilt_optimistic=False,
tilt_invert=False,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 180, 'position_closed': 80,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 180, 'tilt_closed_position': 80,
'tilt_min': 80, 'tilt_max': 180, 'tilt_optimistic': False,
'tilt_invert_state': False,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 40 == mqtt_cover.find_percentage_in_range(120)
assert 40 == mqtt_cover.find_percentage_in_range(120, 'cover')
@@ -786,25 +794,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_percentage_in_range_defaults_inverted(self):
"""Test find percentage in range with default range but inverted."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=0, position_closed=100,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=100, tilt_closed_position=0,
tilt_min=0, tilt_max=100, tilt_optimistic=False,
tilt_invert=True,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 0, 'position_closed': 100,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 100, 'tilt_closed_position': 0,
'tilt_min': 0, 'tilt_max': 100, 'tilt_optimistic': False,
'tilt_invert_state': True,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 56 == mqtt_cover.find_percentage_in_range(44)
assert 56 == mqtt_cover.find_percentage_in_range(44, 'cover')
@@ -812,25 +824,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_percentage_in_range_altered_inverted(self):
"""Test find percentage in range with altered range and inverted."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=80, position_closed=180,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=180, tilt_closed_position=80,
tilt_min=80, tilt_max=180, tilt_optimistic=False,
tilt_invert=True,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 80, 'position_closed': 180,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 180, 'tilt_closed_position': 80,
'tilt_min': 80, 'tilt_max': 180, 'tilt_optimistic': False,
'tilt_invert_state': True,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 60 == mqtt_cover.find_percentage_in_range(120)
assert 60 == mqtt_cover.find_percentage_in_range(120, 'cover')
@@ -838,25 +854,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_in_range_defaults(self):
"""Test find in range with default range."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=100, position_closed=0,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=100, tilt_closed_position=0,
tilt_min=0, tilt_max=100, tilt_optimistic=False,
tilt_invert=False,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 100, 'position_closed': 0,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 100, 'tilt_closed_position': 0,
'tilt_min': 0, 'tilt_max': 100, 'tilt_optimistic': False,
'tilt_invert_state': False,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 44 == mqtt_cover.find_in_range_from_percent(44)
assert 44 == mqtt_cover.find_in_range_from_percent(44, 'cover')
@@ -864,25 +884,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_in_range_altered(self):
"""Test find in range with altered range."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=180, position_closed=80,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=180, tilt_closed_position=80,
tilt_min=80, tilt_max=180, tilt_optimistic=False,
tilt_invert=False,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 180, 'position_closed': 80,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 180, 'tilt_closed_position': 80,
'tilt_min': 80, 'tilt_max': 180, 'tilt_optimistic': False,
'tilt_invert_state': False,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 120 == mqtt_cover.find_in_range_from_percent(40)
assert 120 == mqtt_cover.find_in_range_from_percent(40, 'cover')
@@ -890,25 +914,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_in_range_defaults_inverted(self):
"""Test find in range with default range but inverted."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=0, position_closed=100,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=100, tilt_closed_position=0,
tilt_min=0, tilt_max=100, tilt_optimistic=False,
tilt_invert=True,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 0, 'position_closed': 100,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 100, 'tilt_closed_position': 0,
'tilt_min': 0, 'tilt_max': 100, 'tilt_optimistic': False,
'tilt_invert_state': True,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 44 == mqtt_cover.find_in_range_from_percent(56)
assert 44 == mqtt_cover.find_in_range_from_percent(56, 'cover')
@@ -916,25 +944,29 @@ class TestCoverMQTT(unittest.TestCase):
def test_find_in_range_altered_inverted(self):
"""Test find in range with altered range and inverted."""
mqtt_cover = MqttCover(
name='cover.test',
state_topic='state-topic',
get_position_topic=None,
command_topic='command-topic',
availability_topic=None,
tilt_command_topic='tilt-command-topic',
tilt_status_topic='tilt-status-topic',
qos=0,
retain=False,
state_open='OPEN', state_closed='CLOSE',
position_open=80, position_closed=180,
payload_open='OPEN', payload_close='CLOSE', payload_stop='STOP',
payload_available=None, payload_not_available=None,
optimistic=False, value_template=None,
tilt_open_position=180, tilt_closed_position=80,
tilt_min=80, tilt_max=180, tilt_optimistic=False,
tilt_invert=True,
set_position_topic=None, set_position_template=None,
unique_id=None, device_config=None, discovery_hash=None)
{
'name': 'cover.test',
'state_topic': 'state-topic',
'get_position_topic': None,
'command_topic': 'command-topic',
'availability_topic': None,
'tilt_command_topic': 'tilt-command-topic',
'tilt_status_topic': 'tilt-status-topic',
'qos': 0,
'retain': False,
'state_open': 'OPEN', 'state_closed': 'CLOSE',
'position_open': 80, 'position_closed': 180,
'payload_open': 'OPEN', 'payload_close': 'CLOSE',
'payload_stop': 'STOP',
'payload_available': None, 'payload_not_available': None,
'optimistic': False, 'value_template': None,
'tilt_open_position': 180, 'tilt_closed_position': 80,
'tilt_min': 80, 'tilt_max': 180, 'tilt_optimistic': False,
'tilt_invert_state': True,
'set_position_topic': None, 'set_position_template': None,
'unique_id': None, 'device_config': None,
},
None)
assert 120 == mqtt_cover.find_in_range_from_percent(60)
assert 120 == mqtt_cover.find_in_range_from_percent(60, 'cover')
@@ -1032,6 +1064,38 @@ async def test_discovery_removal_cover(hass, mqtt_mock, caplog):
assert state is None
async def test_discovery_update_cover(hass, mqtt_mock, caplog):
"""Test removal of discovered cover."""
entry = MockConfigEntry(domain=mqtt.DOMAIN)
await async_start(hass, 'homeassistant', {}, entry)
data1 = (
'{ "name": "Beer",'
' "command_topic": "test_topic" }'
)
data2 = (
'{ "name": "Milk",'
' "command_topic": "test_topic" }'
)
async_fire_mqtt_message(hass, 'homeassistant/cover/bla/config',
data1)
await hass.async_block_till_done()
state = hass.states.get('cover.beer')
assert state is not None
assert state.name == 'Beer'
async_fire_mqtt_message(hass, 'homeassistant/cover/bla/config',
data2)
await hass.async_block_till_done()
await hass.async_block_till_done()
state = hass.states.get('cover.beer')
assert state is not None
assert state.name == 'Milk'
state = hass.states.get('cover.milk')
assert state is None
async def test_unique_id(hass):
"""Test unique_id option only creates one cover per id."""
await async_mock_mqtt_component(hass)