Skip to content

Set fabric label on interview #1007

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

Merged
marcelveldt merged 1 commit into from
Dec 20, 2024
Merged

Set fabric label on interview #1007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 39 additions & 9 deletions matter_server/server/device_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,15 +321,6 @@ async def commission_with_code(
LOGGER.info("Commissioned Node ID: %s vs %s", commissioned_node_id, node_id)
if commissioned_node_id != node_id:
raise RuntimeError("Returned Node ID must match requested Node ID")

if self._default_fabric_label:
await self._chip_device_controller.send_command(
node_id,
0,
Clusters.OperationalCredentials.Commands.UpdateFabricLabel(
self._default_fabric_label
),
)
except ChipStackError as err:
raise NodeCommissionFailed(
f"Commission with code failed for node {node_id}."
Expand All @@ -348,6 +339,12 @@ async def commission_with_code(
await self._interview_node(node_id)
except (NodeNotResolving, NodeInterviewFailed) as err:
if retries <= 0:
try:
await self._chip_device_controller.unpair_device(node_id)
except ChipStackError as err_unpair:
LOGGER.warning(
"Removing current fabric from device failed: %s", err_unpair
)
raise err
retries -= 1
LOGGER.warning("Unable to interview Node %s: %s", node_id, err)
Expand Down Expand Up @@ -580,6 +577,39 @@ async def _interview_node(self, node_id: int) -> None:
except ChipStackError as err:
raise NodeInterviewFailed(f"Failed to interview node {node_id}") from err

# Set label if specified and needed
if self._default_fabric_label:
cluster = read_response.attributes[0][Clusters.OperationalCredentials]
fabrics: list[
Clusters.OperationalCredentials.Structs.FabricDescriptorStruct
] = cluster[Clusters.OperationalCredentials.Attributes.Fabrics]
fabric_index = cluster[
Clusters.OperationalCredentials.Attributes.CurrentFabricIndex
]

local_fabric = next(
(fabric for fabric in fabrics if fabric.fabricIndex == fabric_index),
None,
)
if local_fabric and local_fabric.label != self._default_fabric_label:
try:
LOGGER.debug(
"Setting fabric label for node %s to '%s'",
node_id,
self._default_fabric_label,
)
await self._chip_device_controller.send_command(
node_id,
0,
Clusters.OperationalCredentials.Commands.UpdateFabricLabel(
self._default_fabric_label
),
)
except ChipStackError as err:
LOGGER.warning(
"Failed to set fabric label for node %s: %s", node_id, err
)

is_new_node = node_id not in self._nodes
existing_info = self._nodes.get(node_id)
node = MatterNodeData(
Expand Down
Loading