diff --git a/homeassistant/components/ozw/__init__.py b/homeassistant/components/ozw/__init__.py index 5706b75efb8..2fe45018182 100644 --- a/homeassistant/components/ozw/__init__.py +++ b/homeassistant/components/ozw/__init__.py @@ -332,6 +332,7 @@ async def async_handle_node_update(hass: HomeAssistant, node: OZWNode): def async_handle_scene_activated(hass: HomeAssistant, scene_value: OZWValue): """Handle a (central) scene activation message.""" node_id = scene_value.node.id + ozw_instance_id = scene_value.ozw_instance.id scene_id = scene_value.index scene_label = scene_value.label if scene_value.command_class == CommandClass.SCENE_ACTIVATION: @@ -346,7 +347,8 @@ def async_handle_scene_activated(hass: HomeAssistant, scene_value: OZWValue): scene_value_id = scene_value.value["Selected_id"] _LOGGER.debug( - "[SCENE_ACTIVATED] node_id: %s - scene_id: %s - scene_value_id: %s", + "[SCENE_ACTIVATED] ozw_instance: %s - node_id: %s - scene_id: %s - scene_value_id: %s", + ozw_instance_id, node_id, scene_id, scene_value_id, @@ -355,6 +357,7 @@ def async_handle_scene_activated(hass: HomeAssistant, scene_value: OZWValue): hass.bus.async_fire( const.EVENT_SCENE_ACTIVATED, { + const.ATTR_INSTANCE_ID: ozw_instance_id, const.ATTR_NODE_ID: node_id, const.ATTR_SCENE_ID: scene_id, const.ATTR_SCENE_LABEL: scene_label, diff --git a/tests/components/ozw/test_scenes.py b/tests/components/ozw/test_scenes.py index 2d776b7faf4..1c510d58a3c 100644 --- a/tests/components/ozw/test_scenes.py +++ b/tests/components/ozw/test_scenes.py @@ -86,3 +86,4 @@ async def test_scenes(hass, generic_data, sent_messages): assert events[1].data["scene_id"] == 1 assert events[1].data["scene_label"] == "Scene 1" assert events[1].data["scene_value_label"] == "Pressed 1 Time" + assert events[1].data["instance_id"] == 1