Skip to content

Zwave: Apply refresh_node workaround on 1st instance only #7579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrey-git merged 2 commits into from
May 21, 2017
Merged

Zwave: Apply refresh_node workaround on 1st instance only #7579

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51e28b6
Apply refresh_node workaround on 1st instance only
andrey-git May 13, 2017
3d6bbd3
Add another test
andrey-git May 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions homeassistant/components/zwave/workaround.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
PHILIO_SLIM_SENSOR_MOTION_MTII = (PHILIO, PHILIO_SENSOR, PHILIO_SLIM_SENSOR, 0)
PHILIO_3_IN_1_SENSOR_GEN_4_MOTION_MTII = (
PHILIO, PHILIO_SENSOR, PHILIO_3_IN_1_SENSOR_GEN_4, 0)
PHILIO_PAN07_MTII = (PHILIO, PHILIO_SWITCH, PHILIO_PAN07, 0)
PHILIO_PAN07_MTI_INSTANCE = (PHILIO, PHILIO_SWITCH, PHILIO_PAN07, 1)
WENZHOU_SLIM_SENSOR_MOTION_MTII = (
WENZHOU, PHILIO_SENSOR, PHILIO_SLIM_SENSOR, 0)

Expand All @@ -39,7 +39,11 @@
PHILIO_SLIM_SENSOR_MOTION_MTII: WORKAROUND_NO_OFF_EVENT,
PHILIO_3_IN_1_SENSOR_GEN_4_MOTION_MTII: WORKAROUND_NO_OFF_EVENT,
WENZHOU_SLIM_SENSOR_MOTION_MTII: WORKAROUND_NO_OFF_EVENT,
PHILIO_PAN07_MTII: WORKAROUND_REFRESH_NODE_ON_UPDATE,
}

# List of workarounds by (manufacturer_id, product_type, product_id, instance)
DEVICE_MAPPINGS_MTI_INSTANCE = {
PHILIO_PAN07_MTI_INSTANCE: WORKAROUND_REFRESH_NODE_ON_UPDATE,
}

SOMFY_ZRTSI_CONTROLLER_MT = (SOMFY, SOMFY_ZRTSI)
Expand Down Expand Up @@ -91,6 +95,12 @@ def get_device_mapping(value):
(manufacturer_id, product_type, product_id, value.index))
if result:
return result

result = DEVICE_MAPPINGS_MTI_INSTANCE.get(
(manufacturer_id, product_type, product_id, value.instance))
if result:
return result

return DEVICE_MAPPINGS_MT.get((manufacturer_id, product_type))

return None
4 changes: 2 additions & 2 deletions tests/components/switch/test_zwave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from homeassistant.components.switch import zwave

from tests.mock.zwave import (
MockNode, MockValue, MockEntityValues, value_changed)
MockNode, MockValue, MockEntityValues, value_changed)


def test_get_device_detects_switch(mock_openzwave):
Expand Down Expand Up @@ -61,7 +61,7 @@ def test_switch_refresh_on_update(mock_counter, mock_openzwave):
mock_counter.return_value = 10
node = MockNode(manufacturer_id='013c', product_type='0001',
product_id='0005')
value = MockValue(data=False, node=node)
value = MockValue(data=False, node=node, instance=1)
values = MockEntityValues(primary=value)
device = zwave.get_device(node=node, values=values, node_config={})

Expand Down
8 changes: 8 additions & 0 deletions tests/components/zwave/test_workaround.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,11 @@ def test_get_device_mapping_mtii():
product_id='0002')
value = MockValue(data=0, node=node, index=0)
assert workaround.get_device_mapping(value) == 'trigger_no_off_event'


def test_get_device_mapping_mti_instance():
"""Test that device mapping mti_instance is returned."""
node = MockNode(manufacturer_id='013c', product_type='0001',
product_id='0005')
value = MockValue(data=0, node=node, instance=1)
assert workaround.get_device_mapping(value) == 'refresh_node_on_update'