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

Fix statuses for ZHA attribute reporting configuration event (#108532)

Browse source 
Co-authored-by: TheJulianJES <TheJulianJES@users.noreply.github.com>
This commit is contained in:
David F. Mulcahey 2024-01-28 13:28:06 -05:00 • committed by GitHub
parent 8abb4e5f52
commit c3222ef733
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
homeassistant/components/zha/core/cluster_handlers/__init__.py
View file

@ -262,7 +262,7 @@ class ClusterHandler(LogMixin):
"id": attr,
"name": attr_name,
"change": config[2],
"success": False,
"status": None,
}
to_configure = [*self.REPORT_CONFIG]
@ -274,10 +274,7 @@ class ClusterHandler(LogMixin):
reports = {rec["attr"]: rec["config"] for rec in chunk}
try:
res = await self.cluster.configure_reporting_multiple(reports, **kwargs)
self._configure_reporting_status(reports, res[0])
# if we get a response, then it's a success
for attr_stat in event_data.values():
attr_stat["success"] = True
self._configure_reporting_status(reports, res[0], event_data)
except (zigpy.exceptions.ZigbeeException, asyncio.TimeoutError) as ex:
self.debug(
"failed to set reporting on '%s' cluster for: %s",
@ -304,7 +301,10 @@ class ClusterHandler(LogMixin):
)
def _configure_reporting_status(
self, attrs: dict[str, tuple[int, int, float | int]], res: list | tuple
self,
attrs: dict[str, tuple[int, int, float | int]],
res: list | tuple,
event_data: dict[str, dict[str, Any]],
) -> None:
"""Parse configure reporting result."""
if isinstance(res, (Exception, ConfigureReportingResponseRecord)):
@ -315,6 +315,8 @@ class ClusterHandler(LogMixin):
self.name,
res,
)
for attr in attrs:
event_data[attr]["status"] = Status.FAILURE.name
return
if res[0].status == Status.SUCCESS and len(res) == 1:
self.debug(
@ -323,24 +325,38 @@ class ClusterHandler(LogMixin):
self.name,
res,
)
# 2.5.8.1.3 Status Field
# The status field specifies the status of the Configure Reporting operation attempted on this attribute, as detailed in 2.5.7.3.
# Note that attribute status records are not included for successfully configured attributes, in order to save bandwidth.
# In the case of successful configuration of all attributes, only a single attribute status record SHALL be included in the command,
# with the status field set to SUCCESS and the direction and attribute identifier fields omitted.
for attr in attrs:
event_data[attr]["status"] = Status.SUCCESS.name
return
for record in res:
event_data[self.cluster.find_attribute(record.attrid).name][
"status"
] = record.status.name
failed = [
self.cluster.find_attribute(record.attrid).name
for record in res
if record.status != Status.SUCCESS
]
self.debug(
"Successfully configured reporting for '%s' on '%s' cluster",
set(attrs) - set(failed),
self.name,
)
self.debug(
"Failed to configure reporting for '%s' on '%s' cluster: %s",
failed,
self.name,
res,
)
success = set(attrs) - set(failed)
self.debug(
"Successfully configured reporting for '%s' on '%s' cluster",
set(attrs) - set(failed),
self.name,
)
for attr in success:
event_data[attr]["status"] = Status.SUCCESS.name
async def async_configure(self) -> None:
"""Set cluster binding and attribute reporting."""