[chip-tool] Add AnyCommands aliases

project-chip · May 23, 2023 · 3beed99 · 3beed99
1 parent 1efbaf6
commit 3beed99
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 3 deletions.
diff --git a/examples/chip-tool/py_matter_chip_tool_adapter/matter_chip_tool_adapter/encoder.py b/examples/chip-tool/py_matter_chip_tool_adapter/matter_chip_tool_adapter/encoder.py
@@ -16,7 +16,80 @@
 import json
 import re
 
+_ANY_COMMANDS_LIST = [
+    'ReadById',
+    'WriteById',
+    'SubscribeById',
+    'ReadEventById',
+    'SubscribeEventById',
+    'ReadAll',
+    'SubscribeAll',
+]
+
 _ALIASES = {
+    'AnyCommands': {
+        'alias': 'any',
+        'commands': {
+            'CommandById': {
+                'alias': 'command-by-id',
+                'arguments': {
+                    'ClusterId': 'cluster-id',
+                    'CommandId': 'command-id',
+                },
+            },
+            'ReadById': {
+                'alias': 'read-by-id',
+                'arguments': {
+                    'ClusterId': 'cluster-ids',
+                    'AttributeId': 'attribute-ids',
+                },
+            },
+            'WriteById': {
+                'alias': 'write-by-id',
+                'arguments': {
+                    'ClusterId': 'cluster-ids',
+                    'AttributeId': 'attribute-ids',
+                },
+            },
+            'SubscribeById': {
+                'alias': 'subscribe-by-id',
+                'arguments': {
+                    'ClusterId': 'cluster-ids',
+                    'AttributeId': 'attribute-ids',
+                },
+            },
+            'ReadEventById': {
+                'alias': 'read-event-by-id',
+                'arguments': {
+                    'ClusterId': 'cluster-id',
+                    'EventId': 'event-id',
+                },
+            },
+            'SubscribeEventById': {
+                'alias': 'subscribe-event-by-id',
+                'arguments': {
+                    'ClusterId': 'cluster-id',
+                    'EventId': 'event-id',
+                },
+            },
+            'ReadAll': {
+                'alias': 'read-all',
+                'arguments': {
+                    'ClusterId': 'cluster-ids',
+                    'AttributeId': 'attribute-ids',
+                    'EventId': 'event-ids',
+                },
+            },
+            'SubscribeAll': {
+                'alias': 'subscribe-all',
+                'arguments': {
+                    'ClusterId': 'cluster-ids',
+                    'AttributeId': 'attribute-ids',
+                    'EventId': 'event-ids',
+                },
+            },
+        }
+    },
     'CommissionerCommands': {
         'alias': 'pairing',
         'commands': {
@@ -199,7 +272,7 @@ def __maybe_add_endpoint(self, rv, request):
         endpoint_argument_name = 'endpoint-id-ignored-for-group-commands'
         endpoint_argument_value = request.endpoint
 
-        if (request.is_attribute and not request.command == "writeAttribute") or request.is_event:
+        if (request.is_attribute and not request.command == "writeAttribute") or request.is_event or request.command in _ANY_COMMANDS_LIST:
             endpoint_argument_name = 'endpoint-ids'
 
         if rv:

diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py
@@ -24,6 +24,18 @@
 from .pics_checker import PICSChecker
 from .yaml_loader import YamlLoader
 
+ANY_COMMANDS_CLUSTER_NAME = 'AnyCommands'
+ANY_COMMANDS_LIST = [
+    'CommandById',
+    'ReadById',
+    'WriteById',
+    'SubscribeById',
+    'ReadEventById',
+    'SubscribeEventById',
+    'ReadAll',
+    'SubscribeAll',
+]
+
 
 class UnknownPathQualifierError(TestStepError):
     """Raise when an attribute/command/event name is not found in the definitions."""
@@ -235,7 +247,7 @@ def __init__(self, test: dict, config: dict, definitions: SpecDefinitions, pics_
 
     def _update_mappings(self, test: dict, definitions: SpecDefinitions):
         cluster_name = self.cluster
-        if definitions is None or not definitions.has_cluster_by_name(cluster_name):
+        if definitions is None or not definitions.has_cluster_by_name(cluster_name) or cluster_name == ANY_COMMANDS_CLUSTER_NAME or self.command in ANY_COMMANDS_LIST:
             self.argument_mapping = None
             self.response_mapping = None
             self.response_mapping_name = None
@@ -746,7 +758,7 @@ def _response_values_validation(self, expected_response, received_response, resu
                 break
 
             received_value = received_response.get('value')
-            if not self.is_attribute and not self.is_event:
+            if not self.is_attribute and not self.is_event and not (self.command in ANY_COMMANDS_LIST):
                 expected_name = value.get('name')
                 if expected_name not in received_value:
                     result.error(check_type, error_name_does_not_exist.format(