diff --git a/homeassistant/components/logbook.py b/homeassistant/components/logbook.py index e282a133f1d..9e66c8d3aca 100644 --- a/homeassistant/components/logbook.py +++ b/homeassistant/components/logbook.py @@ -265,16 +265,17 @@ def humanify(hass, events): elif event.event_type == EVENT_ALEXA_SMART_HOME: data = event.data - entity_id = data.get('entity_id') + entity_id = data['request'].get('entity_id') if entity_id: state = hass.states.get(entity_id) name = state.name if state else entity_id message = "send command {}/{} for {}".format( - data['namespace'], data['name'], name) + data['request']['namespace'], + data['request']['name'], name) else: message = "send command {}/{}".format( - data['namespace'], data['name']) + data['request']['namespace'], data['request']['name']) yield { 'when': event.time_fired, diff --git a/tests/components/test_logbook.py b/tests/components/test_logbook.py index 9ccb8f58a87..8e7c2299731 100644 --- a/tests/components/test_logbook.py +++ b/tests/components/test_logbook.py @@ -565,20 +565,20 @@ async def test_humanify_alexa_event(hass): }) results = list(logbook.humanify(hass, [ - ha.Event(EVENT_ALEXA_SMART_HOME, { + ha.Event(EVENT_ALEXA_SMART_HOME, {'request': { 'namespace': 'Alexa.Discovery', 'name': 'Discover', - }), - ha.Event(EVENT_ALEXA_SMART_HOME, { + }}), + ha.Event(EVENT_ALEXA_SMART_HOME, {'request': { 'namespace': 'Alexa.PowerController', 'name': 'TurnOn', 'entity_id': 'light.kitchen' - }), - ha.Event(EVENT_ALEXA_SMART_HOME, { + }}), + ha.Event(EVENT_ALEXA_SMART_HOME, {'request': { 'namespace': 'Alexa.PowerController', 'name': 'TurnOn', 'entity_id': 'light.non_existing' - }), + }}), ]))