Disable struct attributes, they cause Cirque to fail

project-chip · Dec 10, 2021 · d480b91 · d480b91
1 parent 44290be
commit d480b91
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 258 deletions.
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
@@ -13515,7 +13515,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -13530,7 +13530,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -13920,7 +13920,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -14526,7 +14526,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -19430,4 +19430,4 @@
     }
   ],
   "log": []
-}
+}
diff --git a/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml b/src/app/tests/suites/TV_ApplicationLauncherCluster.yaml
@@ -30,12 +30,12 @@ tests:
           value: [123, 456]
 
     # TODO: Enable once attribute struct is supported
-    - label: "Read attribute application launcher app"
-      disabled: true
-      command: "readAttribute"
-      attribute: "application launcher app"
-      response:
-          value: { catalogVendorId: 123, applicationId: "applicationId" }
+    # - label: "Read attribute application launcher app"
+    #   disabled: true
+    #   command: "readAttribute"
+    #   attribute: "application launcher app"
+    #   response:
+    #       value: { catalogVendorId: 123, applicationId: "applicationId" }
 
     - label: "Launch App Command"
       command: "LaunchApp"

diff --git a/src/app/tests/suites/TV_MediaPlaybackCluster.yaml b/src/app/tests/suites/TV_MediaPlaybackCluster.yaml
@@ -42,12 +42,12 @@ tests:
           value: 0
 
     # TODO: Enable once attribute struct is supported
-    - label: "Read attribute position"
-      disabled: true
-      command: "readAttribute"
-      attribute: "position"
-      response:
-          value: { updatedAt: 0, position: 0 }
+    # - label: "Read attribute position"
+    #   disabled: true
+    #   command: "readAttribute"
+    #   attribute: "position"
+    #   response:
+    #       value: { updatedAt: 0, position: 0 }
 
     - label: "Read attribute playback speed"
       command: "readAttribute"

diff --git a/src/app/tests/suites/TV_TvChannelCluster.yaml b/src/app/tests/suites/TV_TvChannelCluster.yaml
@@ -45,33 +45,33 @@ tests:
                   },
               ]
     # TODO: Enable once attribute struct is supported
-    - label: "Read attribute channel lineup"
-      disabled: true
-      command: "readAttribute"
-      attribute: "channel lineup"
-      response:
-          value:
-              {
-                  operatorName: "operatorName",
-                  lineupName: "lineupName",
-                  postalCode: "postalCode",
-                  lineupInfoType: 0,
-              }
+    # - label: "Read attribute channel lineup"
+    #   disabled: true
+    #   command: "readAttribute"
+    #   attribute: "channel lineup"
+    #   response:
+    #       value:
+    #           {
+    #               operatorName: "operatorName",
+    #               lineupName: "lineupName",
+    #               postalCode: "postalCode",
+    #               lineupInfoType: 0,
+    #           }
 
     # TODO: Enable once attribute struct is supported
-    - label: "Read attribute current channel"
-      disabled: true
-      command: "readAttribute"
-      attribute: "current channel"
-      response:
-          value:
-              {
-                  majorNumber: 1,
-                  minorNumber: 0,
-                  name: "name",
-                  callSign: "callSign",
-                  affiliateCallSign: "affiliateCallSign",
-              }
+    # - label: "Read attribute current channel"
+    #   disabled: true
+    #   command: "readAttribute"
+    #   attribute: "current channel"
+    #   response:
+    #       value:
+    #           {
+    #               majorNumber: 1,
+    #               minorNumber: 0,
+    #               name: "name",
+    #               callSign: "callSign",
+    #               affiliateCallSign: "affiliateCallSign",
+    #           }
 
     - label: "Change Channel Command"
       command: "ChangeChannel"

diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
@@ -1895,32 +1895,7 @@
           "define": "BASIC_CLUSTER",
           "side": "server",
           "enabled": 0,
-          "commands": [
-            {
-              "name": "StartUp",
-              "code": 0,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 0
-            },
-            {
-              "name": "ShutDown",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 0
-            },
-            {
-              "name": "Leave",
-              "code": 2,
-              "mfgCode": null,
-              "source": "server",
-              "incoming": 0,
-              "outgoing": 0
-            }
-          ],
+          "commands": [],
           "attributes": [
             {
               "name": "InteractionModelVersion",
@@ -10632,7 +10607,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -10647,7 +10622,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -11067,7 +11042,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -11122,21 +11097,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "seek range start",
-              "code": 7,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -11810,7 +11770,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "included": 1,
+              "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
@@ -11820,21 +11780,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "application id",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x00",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -12016,21 +11961,6 @@
               "maxInterval": 65344,
               "reportableChange": 0
             },
-            {
-              "name": "allowed vendor list",
-              "code": 7,
-              "mfgCode": null,
-              "side": "server",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0x01",
-              "reportable": 1,
-              "minInterval": 0,
-              "maxInterval": 65344,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,

diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py