Address PR comments

Author: tehampson

src/controller/python/chip/ChipDeviceCtrl.py

@@ -1164,7 +1164,7 @@ async def ReadEvent(self, nodeid: int, events: typing.List[typing.Union[
         typing.Tuple[int, typing.Type[ClusterObjects.Cluster], int],
         # Concrete path
         typing.Tuple[int, typing.Type[ClusterObjects.ClusterEvent], int]
-    ]], eventNumberFilter: typing.Optional[int] = None, reportInterval: typing.Tuple[int, int] = None, keepSubscriptions: bool = False):
+    ]], eventNumberFilter: typing.Optional[int] = None, fabricFiltered: bool = True, reportInterval: typing.Tuple[int, int] = None, keepSubscriptions: bool = False):
         '''
         Read a list of events from a target node, this is a wrapper of DeviceController.Read()
 
@@ -1188,7 +1188,7 @@ async def ReadEvent(self, nodeid: int, events: typing.List[typing.Union[
         reportInterval: A tuple of two int-s for (MinIntervalFloor, MaxIntervalCeiling). Used by establishing subscriptions.
             When not provided, a read request will be sent.
         '''
-        res = await self.Read(nodeid=nodeid, events=events, eventNumberFilter=eventNumberFilter, reportInterval=reportInterval, keepSubscriptions=keepSubscriptions)
+        res = await self.Read(nodeid=nodeid, events=events, eventNumberFilter=eventNumberFilter, fabricFiltered=fabricFiltered, reportInterval=reportInterval, keepSubscriptions=keepSubscriptions)
         if isinstance(res, ClusterAttribute.SubscriptionTransaction):
             return res
         else:

src/controller/python/chip/yaml/runner.py

@@ -299,8 +299,11 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext):
         self._node_id = test_step.node_id
         self._cluster_object = None
         self._request_object = None
-        self._fabric_filtered = True
         self._event_number_filter = test_step.event_number
+        self._fabric_filtered = False
+
+        if test_step.fabric_filtered is not None:
+            self._fabric_filtered = test_step.fabric_filtered
 
         self._request_object = context.data_model_lookup.get_event(self._cluster,
                                                                    self._event_name)
@@ -316,7 +319,8 @@ def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult:
         try:
             urgent = 0
             request = [(self._endpoint, self._request_object, urgent)]
-            resp = asyncio.run(dev_ctrl.ReadEvent(self._node_id, events=request, eventNumberFilter=self._event_number_filter))
+            resp = asyncio.run(dev_ctrl.ReadEvent(self._node_id, events=request, eventNumberFilter=self._event_number_filter,
+                                                  fabricFiltered=self._fabric_filtered))
         except chip.interaction_model.InteractionModelError as error:
             return _ActionResult(status=_ActionStatus.ERROR, response=error)
 
@@ -480,12 +484,12 @@ def __init__(self, test_step, cluster: str, context: _ExecutionContext):
         self._context = context
         if test_step.min_interval is None:
             raise UnexpectedParsingError(
-                f'SubscribeAttribute action does not have min_interval {self.label}')
+                f'SubscribeEvent action does not have min_interval {self.label}')
         self._min_interval = test_step.min_interval
 
         if test_step.max_interval is None:
             raise UnexpectedParsingError(
-                f'SubscribeAttribute action does not have max_interval {self.label}')
+                f'SubscribeEvent action does not have max_interval {self.label}')
         self._max_interval = test_step.max_interval
 
     def run_action(self, dev_ctrl: ChipDeviceController) -> _ActionResult: