Update test-cluster to fabricIndex to fabricId

project-chip · Jun 8, 2022 · 834d061 · 834d061
1 parent f51c2b2
commit 834d061
Showing 25 changed files with 119 additions and 152 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
@@ -3084,7 +3084,7 @@ server cluster TestCluster = 1295 {
   }
 
   struct TestListStructOctet {
-    fabric_idx fabricIndex = 0;
+    fabric_id fabricId = 0;
     octet_string<32> operationalCert = 1;
   }
 

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -2554,7 +2554,7 @@ server cluster TestCluster = 1295 {
   }
 
   struct TestListStructOctet {
-    fabric_idx fabricIndex = 0;
+    fabric_id fabricId = 0;
     octet_string<32> operationalCert = 1;
   }
 

diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -1897,7 +1897,7 @@ server cluster TestCluster = 1295 {
   }
 
   struct TestListStructOctet {
-    fabric_idx fabricIndex = 0;
+    fabric_id fabricId = 0;
     octet_string<32> operationalCert = 1;
   }
 

diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
@@ -1562,10 +1562,10 @@ tests:
       arguments:
           value:
               [
-                  { fabricIndex: 0, operationalCert: "Test0" },
-                  { fabricIndex: 1, operationalCert: "Test1" },
-                  { fabricIndex: 2, operationalCert: "Test2" },
-                  { fabricIndex: 3, operationalCert: "Test3" },
+                  { fabricId: 0, operationalCert: "Test0" },
+                  { fabricId: 1, operationalCert: "Test1" },
+                  { fabricId: 2, operationalCert: "Test2" },
+                  { fabricId: 3, operationalCert: "Test3" },
               ]
 
     - label: "Read attribute LIST With List of LIST_STRUCT_OCTET_STRING"
@@ -1574,10 +1574,10 @@ tests:
       response:
           value:
               [
-                  { fabricIndex: 0, operationalCert: "Test0" },
-                  { fabricIndex: 1, operationalCert: "Test1" },
-                  { fabricIndex: 2, operationalCert: "Test2" },
-                  { fabricIndex: 3, operationalCert: "Test3" },
+                  { fabricId: 0, operationalCert: "Test0" },
+                  { fabricId: 1, operationalCert: "Test1" },
+                  { fabricId: 2, operationalCert: "Test2" },
+                  { fabricId: 3, operationalCert: "Test3" },
               ]
 
     # Tests for Nullables and Optionals

diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml
@@ -18,7 +18,7 @@ limitations under the License.
   <domain name="CHIP"/>
   <struct name="TestListStructOctet">
     <cluster code="0x050F"/>
-    <item name="fabricIndex" type="fabric_idx"/>
+    <item name="fabricId" type="FABRIC_ID"/>
     <item name="operationalCert" type="OCTET_STRING" length="32"/>
   </struct>
 

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3518,7 +3518,7 @@ client cluster TestCluster = 1295 {
   }
 
   struct TestListStructOctet {
-    fabric_idx fabricIndex = 0;
+    fabric_id fabricId = 0;
     octet_string<32> operationalCert = 1;
   }
 

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPStructsObjc.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h