Skip to content
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

Jump to bottom

Fix Node removal #503

Merged
merged 4 commits into from
Jan 16, 2024
Merged

Fix Node removal #503

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8264e48
SendCommand already raises on error
marcelveldt Jan 15, 2024
ee2db96
handle both none and statuscode
marcelveldt Jan 16, 2024
b4e1831
add return
marcelveldt Jan 16, 2024
98b6bfc
typo
marcelveldt Jan 16, 2024
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
13 changes: 8 additions & 5 deletions matter_server/server/device_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,18 +587,21 @@ async def remove_node(self, node_id: int) -> None:
Clusters.OperationalCredentials.Attributes.CurrentFabricIndex,
)
fabric_index = node.attributes[attribute_path]

result: Clusters.OperationalCredentials.Commands.NOCResponse = (
await self.chip_controller.SendCommand(
result: Clusters.OperationalCredentials.Commands.NOCResponse | None = None
try:
result = await self.chip_controller.SendCommand(
nodeid=node_id,
endpoint=0,
payload=Clusters.OperationalCredentials.Commands.RemoveFabric(
fabricIndex=fabric_index,
),
)
)
except ChipStackError as err:
LOGGER.warning("Removing current fabric from device failed.", exc_info=err)
return
if (
result.statusCode
result is None
or result.statusCode
== Clusters.OperationalCredentials.Enums.NodeOperationalCertStatusEnum.kOk
):
LOGGER.info("Successfully removed Home Assistant fabric from device.")
Expand Down