evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak OZW Websocket Instance/Network Responses (#39107)

Browse source
This commit is contained in:
Charles Garwood 2020-08-21 12:48:56 -04:00 • committed by GitHub
parent 91ba8c0ef0
commit 52d949ec90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/ozw/websocket_api.py
View file

@ -36,7 +36,7 @@ def websocket_get_instances(hass, connection, msg):
instances = []
for instance in manager.collections["instance"]:
instances.append(dict(instance.get_status().data, id=instance.id))
instances.append(dict(instance.get_status().data, ozw_instance=instance.id))
connection.send_result(
msg[ID], instances,
@ -53,12 +53,9 @@ def websocket_network_status(hass, connection, msg):
"""Get Z-Wave network status."""
manager = hass.data[DOMAIN][MANAGER]
status = manager.get_instance(msg[OZW_INSTANCE]).get_status().data
connection.send_result(
msg[ID],
{
"state": manager.get_instance(msg[OZW_INSTANCE]).get_status().status,
OZW_INSTANCE: msg[OZW_INSTANCE],
},
msg[ID], dict(status, ozw_instance=msg[OZW_INSTANCE]),
)

4
tests/components/ozw/test_websocket_api.py
View file

@ -17,7 +17,7 @@ async def test_websocket_api(hass, generic_data, hass_ws_client):
msg = await client.receive_json()
assert len(msg["result"]) == 1
result = msg["result"][0]
assert result["id"] == 1
assert result[OZW_INSTANCE] == 1
assert result["Status"] == "driverAllNodesQueried"
assert result["OpenZWave_Version"] == "1.6.1008"
@ -26,7 +26,7 @@ async def test_websocket_api(hass, generic_data, hass_ws_client):
msg = await client.receive_json()
result = msg["result"]
assert result["state"] == "driverAllNodesQueried"
assert result["Status"] == "driverAllNodesQueried"
assert result[OZW_INSTANCE] == 1
# Test node status