Fix for [CERT-TEST-FAILURE]-TC-FAN-1.1 (#28830)

* Added cluster revision to XML so it defaults in zaptool * Updated cluster revision for Fan COntrol to 4, as per XML * Regenned the code * Updated TC_FAN_1_1 to make the cluster revision check an automated step and to also look for the correct value. Also regenned the tests.
project-chip · Nov 23, 2023 · b316845 · b316845
1 parent f92f127
commit b316845
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 57 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -7064,7 +7064,7 @@ endpoint 1 {
     ram      attribute windSetting default = 0x00;
     ram      attribute airflowDirection default = 0;
     ram      attribute featureMap default = 0x3F;
-    ram      attribute clusterRevision default = 2;
+    ram      attribute clusterRevision default = 4;
   }
 
   server cluster ThermostatUserInterfaceConfiguration {

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -16,51 +16,51 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data with some extensions"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
     {
-      "id": 1,
+      "id": 4,
       "name": "MA-rootdevice",
       "deviceTypeRef": {
-        "id": 3,
+        "id": 56,
         "code": 17,
         "profileId": 259,
         "label": "MA-powersource",
         "name": "MA-powersource"
       },
       "deviceTypes": [
         {
-          "id": 3,
+          "id": 56,
           "code": 17,
           "profileId": 259,
           "label": "MA-powersource",
           "name": "MA-powersource"
         },
         {
-          "id": 2,
+          "id": 55,
           "code": 22,
           "profileId": 259,
           "label": "MA-rootdevice",
           "name": "MA-rootdevice"
         }
       ],
       "deviceTypeRefs": [
-        3,
-        2
+        56,
+        55
       ],
       "deviceVersions": [
         1,
@@ -10512,34 +10512,34 @@
       ]
     },
     {
-      "id": 2,
+      "id": 7,
       "name": "MA-onofflight",
       "deviceTypeRef": {
-        "id": 8,
+        "id": 61,
         "code": 256,
         "profileId": 259,
         "label": "MA-onofflight",
         "name": "MA-onofflight"
       },
       "deviceTypes": [
         {
-          "id": 8,
+          "id": 61,
           "code": 256,
           "profileId": 259,
           "label": "MA-onofflight",
           "name": "MA-onofflight"
         },
         {
-          "id": 3,
+          "id": 56,
           "code": 17,
           "profileId": 259,
           "label": "MA-powersource",
           "name": "MA-powersource"
         }
       ],
       "deviceTypeRefs": [
-        8,
-        3
+        61,
+        56
       ],
       "deviceVersions": [
         1,
@@ -16867,7 +16867,7 @@
               "side": "server",
               "type": "AirQualityEnum",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
@@ -21528,7 +21528,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -30613,34 +30613,34 @@
       ]
     },
     {
-      "id": 3,
+      "id": 5,
       "name": "MA-onofflight",
       "deviceTypeRef": {
-        "id": 8,
+        "id": 61,
         "code": 256,
         "profileId": 259,
         "label": "MA-onofflight",
         "name": "MA-onofflight"
       },
       "deviceTypes": [
         {
-          "id": 8,
+          "id": 61,
           "code": 256,
           "profileId": 259,
           "label": "MA-onofflight",
           "name": "MA-onofflight"
         },
         {
-          "id": 3,
+          "id": 56,
           "code": 17,
           "profileId": 259,
           "label": "MA-powersource",
           "name": "MA-powersource"
         }
       ],
       "deviceTypeRefs": [
-        8,
-        3
+        61,
+        56
       ],
       "deviceVersions": [
         1,
@@ -34897,26 +34897,26 @@
       ]
     },
     {
-      "id": 4,
+      "id": 6,
       "name": "Anonymous Endpoint Type",
       "deviceTypeRef": {
-        "id": 53,
+        "id": 106,
         "code": 61442,
         "profileId": 259,
         "label": "MA-secondary-network-commissioning",
         "name": "MA-secondary-network-commissioning"
       },
       "deviceTypes": [
         {
-          "id": 53,
+          "id": 106,
           "code": 61442,
           "profileId": 259,
           "label": "MA-secondary-network-commissioning",
           "name": "MA-secondary-network-commissioning"
         }
       ],
       "deviceTypeRefs": [
-        53
+        106
       ],
       "deviceVersions": [
         1

diff --git a/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FAN_1_1.yaml
@@ -31,24 +31,13 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    #Issue : https://github.com/project-chip/connectedhomeip/issues/27320
     - label: "Step 2a: Read the global attribute: ClusterRevision"
-      verification: |
-          ./chip-tool fancontrol read cluster-revision 1 1
-
-          On TH(chip-tool), Verify the ClusterRevision attribute value as 3:
-
-          [1685097285.665923][29977:29979] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0202 Attribute 0x0000_FFFD DataVersion: 2714837972
-          [1685097285.666069][29977:29979] CHIP:TOO:   ClusterRevision: 2
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 4
+          constraints:
+              type: int16u
 
     - label: "Step 2b: Read the global attribute: FeatureMap"
       command: "readAttribute"

diff --git a/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml
@@ -83,6 +83,8 @@ limitations under the License.
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
 
+    <globalAttribute side="either" code="0xFFFD" value="4"/>
+
     <attribute side="server" code="0x0000" define="FAN_MODE" type="FanModeEnum" min="0" max="6" writable="true" default="0" optional="false">FanMode</attribute>
     <attribute side="server" code="0x0001" define="FAN_MODE_SEQUENCE" type="FanModeSequenceEnum" min="0" max="5" writable="true" default="2" optional="false">FanModeSequence</attribute>
     <attribute side="server" code="0x0002" define="PERCENT_SETTING" type="Percent" min="0" max="100" writable="true" default="0" isNullable="true" optional="false">PercentSetting</attribute>

diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h