jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include border agent id in response to WS otbr/info (#98394)

Browse Source 
* Include border agent id in response to WS otbr/info

* Assert border agent ID is not None
This commit is contained in:
Erik Montnemery 2023-08-15 09:17:47 +02:00 committed by GitHub
parent 6c7f50b5b2
commit 71b92265af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/otbr/websocket_api.py
View File

@ -47,17 +47,22 @@ async def websocket_info(
data: OTBRData = hass.data[DOMAIN] data: OTBRData = hass.data[DOMAIN]
try: try:
border_agent_id = await data.get_border_agent_id()
dataset = await data.get_active_dataset() dataset = await data.get_active_dataset()
dataset_tlvs = await data.get_active_dataset_tlvs() dataset_tlvs = await data.get_active_dataset_tlvs()
except HomeAssistantError as exc: except HomeAssistantError as exc:
connection.send_error(msg["id"], "get_dataset_failed", str(exc)) connection.send_error(msg["id"], "get_dataset_failed", str(exc))
return return
# The border agent ID is checked when the OTBR config entry is setup,
# we can assert it's not None
assert border_agent_id is not None
connection.send_result( connection.send_result(
msg["id"], msg["id"],
{ {
"url": data.url, "url": data.url,
"active_dataset_tlvs": dataset_tlvs.hex() if dataset_tlvs else None, "active_dataset_tlvs": dataset_tlvs.hex() if dataset_tlvs else None,
"border_agent_id": border_agent_id.hex(),
"channel": dataset.channel if dataset else None, "channel": dataset.channel if dataset else None,
}, },
) )

11
tests/components/otbr/test_websocket_api.py
View File

@ -8,7 +8,7 @@ from homeassistant.components import otbr, thread
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.setup import async_setup_component from homeassistant.setup import async_setup_component
from . import BASE_URL, DATASET_CH15, DATASET_CH16 from . import BASE_URL, DATASET_CH15, DATASET_CH16, TEST_BORDER_AGENT_ID
from tests.test_util.aiohttp import AiohttpClientMocker from tests.test_util.aiohttp import AiohttpClientMocker
from tests.typing import WebSocketGenerator from tests.typing import WebSocketGenerator
@ -31,7 +31,11 @@ async def test_get_info(
with patch( with patch(
"python_otbr_api.OTBR.get_active_dataset", "python_otbr_api.OTBR.get_active_dataset",
return_value=python_otbr_api.ActiveDataSet(channel=16), return_value=python_otbr_api.ActiveDataSet(channel=16),
), patch("python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=DATASET_CH16): ), patch(
"python_otbr_api.OTBR.get_active_dataset_tlvs", return_value=DATASET_CH16
), patch(
"python_otbr_api.OTBR.get_border_agent_id", return_value=TEST_BORDER_AGENT_ID
):
await websocket_client.send_json_auto_id({"type": "otbr/info"}) await websocket_client.send_json_auto_id({"type": "otbr/info"})
msg = await websocket_client.receive_json() msg = await websocket_client.receive_json()
@ -40,6 +44,7 @@ async def test_get_info(
"url": BASE_URL, "url": BASE_URL,
"active_dataset_tlvs": DATASET_CH16.hex().lower(), "active_dataset_tlvs": DATASET_CH16.hex().lower(),
"channel": 16, "channel": 16,
"border_agent_id": TEST_BORDER_AGENT_ID.hex(),
} }
@ -68,6 +73,8 @@ async def test_get_info_fetch_fails(
with patch( with patch(
"python_otbr_api.OTBR.get_active_dataset", "python_otbr_api.OTBR.get_active_dataset",
side_effect=python_otbr_api.OTBRError, side_effect=python_otbr_api.OTBRError,
), patch(
"python_otbr_api.OTBR.get_border_agent_id", return_value=TEST_BORDER_AGENT_ID
): ):
await websocket_client.send_json_auto_id({"type": "otbr/info"}) await websocket_client.send_json_auto_id({"type": "otbr/info"})
msg = await websocket_client.receive_json() msg = await websocket_client.receive_json()